April 2014 - openSUSE Commits - openSUSE Mailing Lists

commit rubygem-activeresource-3_2 for openSUSE:Factory
by root＠hilbert.suse.de 17 Apr '14

17 Apr '14

Hello community, here is the log from the commit of package rubygem-activeresource-3_2 for openSUSE:Factory checked in at 2014-04-17 14:09:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-activeresource-3_2 (Old) and /work/SRC/openSUSE:Factory/.rubygem-activeresource-3_2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-activeresource-3_2" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-activeresource-3_2/rubygem-activeresource-3_2.changes 2013-03-20 09:54:09.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rubygem-activeresource-3_2.new/rubygem-activeresource-3_2.changes 2014-04-17 14:09:24.000000000 +0200 @@ -1,0 +2,8 @@ +Thu Apr 3 15:04:01 UTC 2014 - jmassaguerpla(a)suse.com + +- updated to version 3.2.17 + * I had to update other rails components because of security issues, + thus I am updating this one so that we have all rails components + in the same version + +------------------------------------------------------------------- Old: ---- activeresource-3.2.13.gem New: ---- activeresource-3.2.17.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-activeresource-3_2.spec ++++++ --- /var/tmp/diff_new_pack.O8SHZ5/_old 2014-04-17 14:09:25.000000000 +0200 +++ /var/tmp/diff_new_pack.O8SHZ5/_new 2014-04-17 14:09:25.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package rubygem-activeresource-3_2 # -# 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: rubygem-activeresource-3_2 -Version: 3.2.13 +Version: 3.2.17 Release: 0 %define mod_name activeresource %define mod_full_name %{mod_name}-%{version} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rubygem-activerecord-3_2 for openSUSE:Factory
by root＠hilbert.suse.de 17 Apr '14

17 Apr '14

Hello community, here is the log from the commit of package rubygem-activerecord-3_2 for openSUSE:Factory checked in at 2014-04-17 14:09:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-activerecord-3_2 (Old) and /work/SRC/openSUSE:Factory/.rubygem-activerecord-3_2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-activerecord-3_2" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-activerecord-3_2/rubygem-activerecord-3_2.changes 2013-03-21 22:13:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rubygem-activerecord-3_2.new/rubygem-activerecord-3_2.changes 2014-04-17 14:09:20.000000000 +0200 @@ -1,0 +2,8 @@ +Thu Apr 3 14:41:10 UTC 2014 - jmassaguerpla(a)suse.com + +- updated to version 3.2.17 + * I had to update other rails components because of security issues, + thus I am updating this one so that we have all rails components + in the same version + +------------------------------------------------------------------- Old: ---- activerecord-3.2.13.gem New: ---- activerecord-3.2.17.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-activerecord-3_2.spec ++++++ --- /var/tmp/diff_new_pack.pIB43y/_old 2014-04-17 14:09:21.000000000 +0200 +++ /var/tmp/diff_new_pack.pIB43y/_new 2014-04-17 14:09:21.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package rubygem-activerecord-3_2 # -# 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: rubygem-activerecord-3_2 -Version: 3.2.13 +Version: 3.2.17 Release: 0 %define mod_name activerecord %define mod_full_name %{mod_name}-%{version} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rubygem-activemodel-3_2 for openSUSE:Factory
by root＠hilbert.suse.de 17 Apr '14

17 Apr '14

Hello community, here is the log from the commit of package rubygem-activemodel-3_2 for openSUSE:Factory checked in at 2014-04-17 14:09:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-activemodel-3_2 (Old) and /work/SRC/openSUSE:Factory/.rubygem-activemodel-3_2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-activemodel-3_2" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-activemodel-3_2/rubygem-activemodel-3_2.changes 2013-03-20 09:53:55.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rubygem-activemodel-3_2.new/rubygem-activemodel-3_2.changes 2014-04-17 14:09:16.000000000 +0200 @@ -1,0 +2,8 @@ +Thu Apr 3 14:38:15 UTC 2014 - jmassaguerpla(a)suse.com + +- updated to version 3.2.17 + * I had to update other rails components because of security issues, + thus I am updating this one so that we have all rails components + in the same version + +------------------------------------------------------------------- Old: ---- activemodel-3.2.13.gem New: ---- activemodel-3.2.17.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-activemodel-3_2.spec ++++++ --- /var/tmp/diff_new_pack.yx9unO/_old 2014-04-17 14:09:17.000000000 +0200 +++ /var/tmp/diff_new_pack.yx9unO/_new 2014-04-17 14:09:17.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package rubygem-activemodel-3_2 # -# 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: rubygem-activemodel-3_2 -Version: 3.2.13 +Version: 3.2.17 Release: 0 %define mod_name activemodel %define mod_full_name %{mod_name}-%{version} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rubygem-actionmailer-3_2 for openSUSE:Factory
by root＠hilbert.suse.de 17 Apr '14

17 Apr '14

Hello community, here is the log from the commit of package rubygem-actionmailer-3_2 for openSUSE:Factory checked in at 2014-04-17 14:09:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-actionmailer-3_2 (Old) and /work/SRC/openSUSE:Factory/.rubygem-actionmailer-3_2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-actionmailer-3_2" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-actionmailer-3_2/rubygem-actionmailer-3_2.changes 2013-03-21 22:13:36.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rubygem-actionmailer-3_2.new/rubygem-actionmailer-3_2.changes 2014-04-17 14:09:12.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Apr 3 14:32:26 UTC 2014 - jmassaguerpla(a)suse.com + +- updated to version 3.2.17. Contains, among others, a patch for + CVE-2013-4389 (bnc#846239) + +------------------------------------------------------------------- Old: ---- actionmailer-3.2.13.gem New: ---- actionmailer-3.2.17.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-actionmailer-3_2.spec ++++++ --- /var/tmp/diff_new_pack.9zpwKR/_old 2014-04-17 14:09:13.000000000 +0200 +++ /var/tmp/diff_new_pack.9zpwKR/_new 2014-04-17 14:09:13.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package rubygem-actionmailer-3_2 # -# 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: rubygem-actionmailer-3_2 -Version: 3.2.13 +Version: 3.2.17 Release: 0 %define mod_name actionmailer %define mod_full_name %{mod_name}-%{version} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit retext for openSUSE:Factory
by root＠hilbert.suse.de 17 Apr '14

17 Apr '14

Hello community, here is the log from the commit of package retext for openSUSE:Factory checked in at 2014-04-17 14:09:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/retext (Old) and /work/SRC/openSUSE:Factory/.retext.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "retext" Changes: -------- --- /work/SRC/openSUSE:Factory/retext/retext.changes 2013-02-25 20:43:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.retext.new/retext.changes 2014-04-17 14:09:06.000000000 +0200 @@ -1,0 +2,19 @@ +Wed Apr 16 09:29:11 UTC 2014 - mailaender(a)opensuse.org + +- update version 4.1.2 +- added GPG file verification + +------------------------------------------------------------------- +Sat Sep 21 10:35:09 UTC 2013 - mailaender(a)opensuse.org + +- update version 4.1.1 + * Added configuration dialog + * Added current line highlighting and line numbers support + * Added support for PyQt5 and PySide libraries + * Use new signals/slots syntax + * Added option to select file encoding + * Dropped support for Python 2 and support for running + without WebKit installed +- adhere to https://en.opensuse.org/SourceUrls + +------------------------------------------------------------------- @@ -20 +38,0 @@ - Old: ---- ReText-4.0.0.tar.gz New: ---- ReText-4.1.2.tar.gz ReText-4.1.2.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ retext.spec ++++++ --- /var/tmp/diff_new_pack.89piaD/_old 2014-04-17 14:09:07.000000000 +0200 +++ /var/tmp/diff_new_pack.89piaD/_new 2014-04-17 14:09:07.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package retext # -# Copyright (c) 2010 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 @@ -15,44 +15,44 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%{!?py_ver: %global py_ver %(%{__python} -c "import sys; v=sys.version_info[:2]; print '%%d.%%d'%%v" 2>/dev/null || echo PYTHON-NOT-FOUND")} Name: retext -Version: 4.0.0 +Version: 4.1.2 Release: 0 -License: GPL-3.0+ Summary: Simple editor for Markdown and reStructuredText -Url: http://sourceforge.net/p/retext/home/ReText +License: GPL-3.0+ Group: Productivity/Editors/Other -Source: ReText-%{version}.tar.gz +Url: http://sourceforge.net/p/retext/home/ReText +Source: http://downloads.sourceforge.net/retext/ReText-%{version}.tar.gz Source1: %{name}.desktop -BuildRequires: update-desktop-files +Source2: http://downloads.sourceforge.net/retext/ReText-%{version}.tar.gz.asc +BuildRequires: python3 +BuildRequires: python3-devel BuildRequires: rsvg-view -BuildRequires: python-devel -Requires: python-qt4 -Requires: python-markdown -Requires: python-docutils -Requires: python-enchant -Requires: python-Markups +BuildRequires: update-desktop-files +BuildRequires: fdupes +Requires: python3-Markdown +Requires: python3-Markups +Requires: python3-docutils +Requires: python3-pyenchant +Requires: python3-qt4 Provides: ReText = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} >= 1140 BuildArch: noarch -%endif %description ReText is simple text editor that supports Markdown and reStructuredText markup languages. It is written in Python using PyQt libraries. %prep +%{?gpg_verify: %gpg_verify %{S:2}} %setup -q -n ReText-%{version} %build -python setup.py build +python3 setup.py build %install -python setup.py install --root=%{buildroot} --prefix=%{_prefix} +python3 setup.py install --root=%{buildroot} --prefix=%{_prefix} %{__mkdir} -pv %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/ %{__mkdir} -pv %{buildroot}%{_datadir}/%{name}/ @@ -69,22 +69,21 @@ popd %{__cp} -r %{S:1} %{buildroot}%{_datadir}/applications/ -ln -sf %{_bindir}/%{name}.py %{buildroot}%{_bindir}/%{name} - %suse_update_desktop_file %{name} +%fdupes %{buildroot}%{_prefix} %files %defattr(-,root,root) %doc changelog.md README %{_bindir}/%{name} -%{_bindir}/%{name}.py -%{_bindir}/wpgen.py -%{python_sitelib}/ReText/ -%{python_sitelib}/ReText-%{version}-py%{py_ver}.egg-info +%{_bindir}/wpgen +%{python3_sitelib}/ReText/ +%{python3_sitelib}/* %{_datadir}/icons/hicolor/*/apps/%{name}.png %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg %{_datadir}/%{name}/ +%{_datadir}/wpgen/ %{_datadir}/applications/%{name}.desktop %changelog ++++++ ReText-4.0.0.tar.gz -> ReText-4.1.2.tar.gz ++++++ ++++ 14078 lines of diff (skipped) ++++++ ReText-4.1.2.tar.gz.asc ++++++ -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABCAAGBQJTNYLmAAoJEGAmk20vHIrgzZUQAJB5oSKwUQV19486rlzWLcHE A6ljB9NFDeWyJymtPlxyt7GRFG5aDu4L4ucW9XbLr2a70nZpMTFb70G5Uzwg7xOv XCovXwiEH/EI0chTchjdIyZS6ffqjUl2iubCEAYTU6TOb8P1c5PlNCLHDgH75Lpr ofL3wo6I4Dk8KnmRYxFja0ufpBg7OpLhrNWgvs/JBI9MOBigwW5g+uGGvX0BW2er JFbYGusJc0p68Sl0/fd+78b1zqlOjXUPLBzg4LAwY3ZZf5QyV/ZXKsGub7jT9MV8 G/1MYxi7hW34/QtEVAYCvpJLbnevVQohva3BPMWS90b7Eq6V6yOcfJHvvw+bHo6w 61SDk3vf/g8tEQ39uxjP1ei93xcKaTmhRB14NeDyDCQtI9asmJCr809UfChuymUy kkdi14S4gUdC/BqVbBA9UyaZSJP73JxXKk6ST6h0f17tvfYHFL+rSZyRpDNKj9C0 ra3ySbVaKJzSnSJd3W7NPCATJyt8XjqxAUCrGL9CziJCDI/9XVVAznC7xv/D5AFe T5RMGr63j/x5lECAiWZ0qdSvBFbB7cSk0tzeuz6gwVY4xJfgDOuuWaM3X7mf2qyc ghOh2DXc3VOn2O/AM49Javv1CbsuaNBCZ+eGsZBKp3n2rLC9t648ExiLgJdV/7pm d1MjnysdqMG/KCUu2Ofb =ZpPW -----END PGP SIGNATURE----- -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit qmmp for openSUSE:Factory
by root＠hilbert.suse.de 17 Apr '14

17 Apr '14

Hello community, here is the log from the commit of package qmmp for openSUSE:Factory checked in at 2014-04-17 14:09:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qmmp (Old) and /work/SRC/openSUSE:Factory/.qmmp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qmmp" Changes: -------- --- /work/SRC/openSUSE:Factory/qmmp/qmmp.changes 2014-02-19 07:52:00.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.qmmp.new/qmmp.changes 2014-04-17 14:09:01.000000000 +0200 @@ -1,0 +2,11 @@ +Wed Apr 16 07:43:43 UTC 2014 - reddwarf(a)opensuse.org + +- Update to 0.7.6 + * added libav 10 and ffmpeg 2.2 support + * fixed url parsing + * fixed freezing on playback resume + * fixed random freezing in the mplayer plugin + * fixed reset selection of tracks when calling context menu + * fixed multimedia keys support under win32 + +------------------------------------------------------------------- Old: ---- qmmp-0.7.5.tar.bz2 New: ---- qmmp-0.7.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qmmp.spec ++++++ --- /var/tmp/diff_new_pack.ivAwSx/_old 2014-04-17 14:09:02.000000000 +0200 +++ /var/tmp/diff_new_pack.ivAwSx/_new 2014-04-17 14:09:02.000000000 +0200 @@ -23,7 +23,7 @@ %define soname 0 Name: qmmp -Version: 0.7.5 +Version: 0.7.6 Release: 0 Summary: XMMS-like audio player License: GPL-2.0+ ++++++ qmmp-0.7.5.tar.bz2 -> qmmp-0.7.6.tar.bz2 ++++++ ++++ 5258 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 python3-numpy for openSUSE:Factory
by root＠hilbert.suse.de 17 Apr '14

17 Apr '14

Hello community, here is the log from the commit of package python3-numpy for openSUSE:Factory checked in at 2014-04-17 14:08:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3-numpy (Old) and /work/SRC/openSUSE:Factory/.python3-numpy.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python3-numpy" Changes: -------- --- /work/SRC/openSUSE:Factory/python3-numpy/python3-numpy-doc.changes 2013-11-04 16:18:27.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python3-numpy.new/python3-numpy-doc.changes 2014-04-17 14:08:53.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Apr 14 05:13:17 UTC 2014 - arun(a)gmx.de + +- update to 1.8.1, bugfix release + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/python3-numpy/python3-numpy.changes 2013-12-08 19:34:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python3-numpy.new/python3-numpy.changes 2014-04-17 14:08:53.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Apr 14 05:11:10 UTC 2014 - arun(a)gmx.de + +- bugfix release 1.8.1 + +------------------------------------------------------------------- Old: ---- numpy-1.8.0.tar.gz New: ---- numpy-1.8.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-numpy-doc.spec ++++++ --- /var/tmp/diff_new_pack.jK4Wdc/_old 2014-04-17 14:08:54.000000000 +0200 +++ /var/tmp/diff_new_pack.jK4Wdc/_new 2014-04-17 14:08:54.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package python3-numpy-doc # -# 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: python3-numpy-doc -Version: 1.8.0 +Version: 1.8.1 Release: 0 Url: http://sourceforge.net/projects/numpy Summary: Documentation for python3-numpy ++++++ python3-numpy.spec ++++++ --- /var/tmp/diff_new_pack.jK4Wdc/_old 2014-04-17 14:08:54.000000000 +0200 +++ /var/tmp/diff_new_pack.jK4Wdc/_new 2014-04-17 14:08:54.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package python3-numpy # -# 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 @@ -19,7 +19,7 @@ %define with_atlas 0 Name: python3-numpy -Version: 1.8.0 +Version: 1.8.1 Release: 0 Url: http://sourceforge.net/projects/numpy Summary: NumPy array processing for numbers, strings, records and objects ++++++ numpy-1.8.0.tar.gz -> numpy-1.8.1.tar.gz ++++++ ++++ 31958 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 python-suds for openSUSE:Factory
by root＠hilbert.suse.de 17 Apr '14

17 Apr '14

Hello community, here is the log from the commit of package python-suds for openSUSE:Factory checked in at 2014-04-17 14:08:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-suds (Old) and /work/SRC/openSUSE:Factory/.python-suds.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-suds" Changes: -------- --- /work/SRC/openSUSE:Factory/python-suds/python-suds.changes 2014-01-23 15:54:50.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-suds.new/python-suds.changes 2014-04-17 14:08:48.000000000 +0200 @@ -1,0 +2,14 @@ +Mon Apr 14 08:17:43 UTC 2014 - mcihar(a)suse.cz + +- Run testsuite using pytest +- Fixed Source URL +- Included HACKING.rst in the documentation + +------------------------------------------------------------------- +Fri Apr 11 11:38:30 UTC 2014 - mcihar(a)suse.cz + +- Update to version 0.6 (forked upstream) + - supports Python 3 + - many bugfixes see https://bitbucket.org/jurko/suds/overview + +------------------------------------------------------------------- Old: ---- python-suds-0.4.tar.gz New: ---- suds-jurko-0.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-suds.spec ++++++ --- /var/tmp/diff_new_pack.XUlUb0/_old 2014-04-17 14:08:49.000000000 +0200 +++ /var/tmp/diff_new_pack.XUlUb0/_new 2014-04-17 14:08:49.000000000 +0200 @@ -17,17 +17,18 @@ Name: python-suds -Version: 0.4 +Version: 0.6 Release: 0 Summary: A lightweight SOAP python client that provides a service proxy for Web Services License: LGPL-3.0+ Group: Development/Languages/Python Url: https://fedorahosted.org/suds -Source: %{name}-%{version}.tar.gz +Source: https://pypi.python.org/packages/source/s/suds-jurko/suds-jurko-%{version}.… # PATCH-FIX-UPSTREAM speilicke(a)suse.com Patch0: suds-insecure-cache-tempdir.patch BuildRequires: fdupes BuildRequires: python-devel +BuildRequires: python-pytest BuildRequires: python-setuptools BuildRequires: python-xml BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -53,7 +54,7 @@ * Supports unicode %prep -%setup -q +%setup -q -n suds-jurko-%{version} %patch0 -p1 %build @@ -67,16 +68,11 @@ %fdupes %{buildroot} %check -#NOTE(saschpe): We can only run tests that don't need internet or server access. -# Put the installed 'suds' module and the local 'tests' module into PYTHONPATH: -export PYTHONPATH=%{buildroot}%{python_sitelib}:. -for t in builtin saxenc ; do -python tests/$t.py -done +py.test %files %defattr(-,root,root,-) -%doc README LICENSE +%doc README.rst LICENSE.txt HACKING.rst %{python_sitelib}/* %changelog ++++++ suds-insecure-cache-tempdir.patch ++++++ --- /var/tmp/diff_new_pack.XUlUb0/_old 2014-04-17 14:08:49.000000000 +0200 +++ /var/tmp/diff_new_pack.XUlUb0/_new 2014-04-17 14:08:49.000000000 +0200 @@ -1,31 +1,52 @@ -diff -ruN a/suds/cache.py b/suds/cache.py ---- a/suds/cache.py 2010-04-14 21:04:17.000000000 +0200 -+++ b/suds/cache.py 2013-11-27 14:16:34.968138726 +0100 -@@ -19,8 +19,9 @@ - """ - +--- a/suds/cache.py ++++ b/suds/cache.py +@@ -26,7 +26,8 @@ + from datetime import datetime as dt + from datetime import timedelta import os -+import shutil - import suds -from tempfile import gettempdir as tmp ++import shutil +import tempfile - from suds.transport import * - from suds.sax.parser import Parser - from suds.sax.element import Element -@@ -138,11 +139,15 @@ + try: + import cPickle as pickle + except Exception: +@@ -111,13 +112,19 @@ + The duration may be: (months|weeks|days|hours|minutes|seconds). @type duration: {unit:value} """ ++ self.auto_location = False if location is None: - location = os.path.join(tmp(), 'suds') + location = tempfile.mkdtemp() ++ self.auto_location = True self.location = location self.duration = (None, 0) self.setduration(**duration) self.checkversion() -+ + + def __del__(self): -+ if self.location.startswith("/tmp"): ++ if self.auto_location: + shutil.rmtree(self.location) - ++ def fnsuffix(self): """ + Get the file name suffix +--- a/tests/test_cache.py ++++ b/tests/test_cache.py +@@ -134,12 +134,12 @@ + + + def test_FileCache_location(tmpdir): +- defaultLocation = os.path.join(tempfile.gettempdir(), "suds") ++ defaultLocation = tempfile.gettempdir() + cache = suds.cache.FileCache() + assert os.path.isdir(cache.location) +- assert cache.location == defaultLocation +- assert suds.cache.FileCache().location == defaultLocation +- assert cache.location == defaultLocation ++ assert cache.location.startswith(defaultLocation) ++ assert suds.cache.FileCache().location.startswith(defaultLocation) ++ assert cache.location.startswith(defaultLocation) + + cacheFolder1 = tmpdir.join("flip-flop1").strpath + assert not os.path.isdir(cacheFolder1) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-happybase for openSUSE:Factory
by root＠hilbert.suse.de 17 Apr '14

17 Apr '14

Hello community, here is the log from the commit of package python-happybase for openSUSE:Factory checked in at 2014-04-17 14:08:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-happybase (Old) and /work/SRC/openSUSE:Factory/.python-happybase.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-happybase" Changes: -------- --- /work/SRC/openSUSE:Factory/python-happybase/python-happybase.changes 2013-12-11 16:21:30.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-happybase.new/python-happybase.changes 2014-04-17 14:08:41.000000000 +0200 @@ -1,0 +2,10 @@ +Tue Apr 15 21:00:40 UTC 2014 - dmueller(a)suse.com + +- update to 0.8: + * Add (and default to) '0.96' compatibility mode in :py:class:`Connection`. + * Add support for retrieving sorted columns, which is possible with the HBase + 0.96 Thrift API + * The `batch_size` argument to :py:meth:`Table.scan` is no longer propagated to + `Scan.setBatching()` at the Java side (inside the Thrift server). + +------------------------------------------------------------------- Old: ---- happybase-0.7.tar.gz New: ---- happybase-0.8.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-happybase.spec ++++++ --- /var/tmp/diff_new_pack.4RaE2F/_old 2014-04-17 14:08:41.000000000 +0200 +++ /var/tmp/diff_new_pack.4RaE2F/_new 2014-04-17 14:08:41.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-happybase # -# 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: python-happybase -Version: 0.7 +Version: 0.8 Release: 0 Summary: A developer-friendly Python library to interact with Apache HBase License: MIT Group: Development/Languages/Python Url: https://github.com/wbolster/happybase -Source: http://pypi.python.org/packages/source/h/happybase/happybase-%{version}.tar… +Source: https://pypi.python.org/packages/source/h/happybase/happybase-%{version}.ta… BuildRequires: python-Sphinx BuildRequires: python-devel BuildRequires: python-setuptools ++++++ happybase-0.7.tar.gz -> happybase-0.8.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/happybase-0.7/NEWS.rst new/happybase-0.8/NEWS.rst --- old/happybase-0.7/NEWS.rst 2013-11-06 23:16:45.000000000 +0100 +++ new/happybase-0.8/NEWS.rst 2014-02-25 21:15:11.000000000 +0100 @@ -4,6 +4,29 @@ .. py:currentmodule:: happybase +HappyBase 0.8 +------------- + +Release date: 2014-02-25 + +* Add (and default to) '0.96' compatibility mode in :py:class:`Connection`. + +* Add support for retrieving sorted columns, which is possible with the HBase + 0.96 Thrift API. This feature uses a new `sorted_columns` argument to + :py:meth:`Table.scan`. An ```OrderedDict`` implementation is required for this + feature; with Python 2.7 this is available from the standard library, but for + Python 2.6 a separate ```ordereddict``` pacakge has to be installed from PyPI. + (`issue #39 <https://github.com/wbolster/happybase/issues/39>`_) + +* The `batch_size` argument to :py:meth:`Table.scan` is no longer propagated to + `Scan.setBatching()` at the Java side (inside the Thrift server). To influence + the `Scan.setBatching()` (which may split rows into partial rows) a new + `scan_batching` argument to :py:meth:`Table.scan` has been added. See `issue + #54 <https://github.com/wbolster/happybase/issues/54>`_, `issue #56 + <https://github.com/wbolster/happybase/issues/56>`_, and the HBase docs for + `Scan.setBatching()` for more details. + + HappyBase 0.7 ------------- @@ -12,7 +35,7 @@ * Added a `wal` argument to various data manipulation methods on the :py:class:`Table` and :py:class:`Batch` classes to determine whether to write the mutation to the Write-Ahead Log (WAL). (`issue #36 - <https://github.com/wbolster/happybase/issues/36>`_). + <https://github.com/wbolster/happybase/issues/36>`_) * Pass batch_size to underlying Thrift Scan instance (`issue #38 <https://github.com/wbolster/happybase/issues/38>`_). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/happybase-0.7/PKG-INFO new/happybase-0.8/PKG-INFO --- old/happybase-0.7/PKG-INFO 2013-11-06 23:20:23.000000000 +0100 +++ new/happybase-0.8/PKG-INFO 2014-02-25 21:19:38.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: happybase -Version: 0.7 +Version: 0.8 Summary: A developer-friendly Python library to interact with Apache HBase Home-page: https://github.com/wbolster/happybase Author: Wouter Bolsterlee diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/happybase-0.7/doc/user.rst new/happybase-0.8/doc/user.rst --- old/happybase-0.7/doc/user.rst 2013-11-03 17:50:17.000000000 +0100 +++ new/happybase-0.8/doc/user.rst 2014-01-25 21:51:13.000000000 +0100 @@ -30,11 +30,11 @@ In some setups, the :py:class:`Connection` class needs some additional information about the HBase version it will be connecting to, and which Thrift transport to use. If you're still using HBase 0.90.x, you need to set the -`compat` parameter to make sure HappyBase speaks the correct wire protocol. +`compat` argument to make sure HappyBase speaks the correct wire protocol. Additionally, if you're using HBase 0.94 with a non-standard Thrift transport -mode, make sure to supply the right `transport` parameter. See the API +mode, make sure to supply the right `transport` argument. See the API documentation for the :py:class:`Connection` class for more information about -these parameters and their supported values. +these arguments and their supported values. When a :py:class:`Connection` is created, it automatically opens a socket connection to the HBase Thrift server. This behaviour can be disabled by @@ -116,7 +116,7 @@ ``myproject_XYZ``. Instead of adding this application-specific prefix each time a table name is -passed to HappyBase, the `table_prefix` parameter to :py:class:`Connection` can +passed to HappyBase, the `table_prefix` argument to :py:class:`Connection` can take care of this. HappyBase will prepend that prefix (and an underscore) to each table name handled by that :py:class:`Connection` instance. For example:: @@ -211,7 +211,7 @@ By default, HappyBase does not include timestamps in the results it returns. In your application needs access to the timestamps, simply set the -`include_timestamp` parameter to ``True``. Now, each cell in the result will be +`include_timestamp` argument to ``True``. Now, each cell in the result will be returned as a `(value, timestamp)` tuple instead of just a value:: row = table.row('row-key', columns=['cf1:col1'], include_timestamp=True) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/happybase-0.7/happybase/_version.py new/happybase-0.8/happybase/_version.py --- old/happybase-0.7/happybase/_version.py 2013-11-06 23:09:14.000000000 +0100 +++ new/happybase-0.8/happybase/_version.py 2014-02-25 21:19:18.000000000 +0100 @@ -5,4 +5,4 @@ setup.py. """ -__version__ = '0.7' +__version__ = '0.8' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/happybase-0.7/happybase/connection.py new/happybase-0.8/happybase/connection.py --- old/happybase-0.7/happybase/connection.py 2013-11-03 17:50:17.000000000 +0100 +++ new/happybase-0.8/happybase/connection.py 2014-01-25 21:52:24.000000000 +0100 @@ -17,7 +17,7 @@ logger = logging.getLogger(__name__) -COMPAT_MODES = ('0.90', '0.92', '0.94') +COMPAT_MODES = ('0.90', '0.92', '0.94', '0.96') THRIFT_TRANSPORTS = dict( buffered=TBufferedTransport, framed=TFramedTransport, @@ -26,50 +26,52 @@ DEFAULT_HOST = 'localhost' DEFAULT_PORT = 9090 DEFAULT_TRANSPORT = 'buffered' -DEFAULT_COMPAT = '0.94' +DEFAULT_COMPAT = '0.96' class Connection(object): """Connection to an HBase Thrift server. - The `host` and `port` parameters specify the host name and TCP port + The `host` and `port` arguments specify the host name and TCP port of the HBase Thrift server to connect to. If omitted or ``None``, a connection to the default port on ``localhost`` is made. If - specifed, the `timeout` parameter specifies the socket timeout in + specifed, the `timeout` argument specifies the socket timeout in milliseconds. - If `autoconnect` is `True` (the default) the connection is made directly, - otherwise :py:meth:`Connection.open` must be called explicitly before first - use. - - The optional `table_prefix` and `table_prefix_separator` arguments specify - a prefix and a separator string to be prepended to all table names, e.g. - when :py:meth:`Connection.table` is invoked. For example, if `table_prefix` - is ``myproject``, all tables tables will have names like ``myproject_XYZ``. - - The optional `compat` parameter sets the compatibility level for this - connection. Older HBase versions have slightly different Thrift interfaces, - and using the wrong protocol can lead to crashes caused by communication - errors, so make sure to use the correct one. This value can be either the - string ``0.92`` (the default) for use with HBase 0.92.x and later versions, - or ``0.90`` for use with HBase 0.90.x. - - The optional `transport` parameter specifies the Thrift transport mode to - use. Supported values for this parameter are ``buffered`` (the default) and - ``framed``. Make sure to choose the right one, since otherwise you might - see non-obvious connection errors or program hangs when making - a connection. HBase versions before 0.94 always use the buffered transport. - Starting with HBase 0.94, the Thrift server optionally uses a framed - transport, depending on the parameter passed to the ``hbase-daemon.sh start - thrift`` command. The default ``-threadpool`` mode uses the buffered - transport; the ``-hsha``, ``-nonblocking``, and ``-threadedselector`` modes - use the framed transport. + If `autoconnect` is `True` (the default) the connection is made + directly, otherwise :py:meth:`Connection.open` must be called + explicitly before first use. + + The optional `table_prefix` and `table_prefix_separator` arguments + specify a prefix and a separator string to be prepended to all table + names, e.g. when :py:meth:`Connection.table` is invoked. For + example, if `table_prefix` is ``myproject``, all tables tables will + have names like ``myproject_XYZ``. + + The optional `compat` argument sets the compatibility level for + this connection. Older HBase versions have slightly different Thrift + interfaces, and using the wrong protocol can lead to crashes caused + by communication errors, so make sure to use the correct one. This + value can be either the string ``0.90``, ``0.92``, ``0.94``, or + ``0.96`` (the default). + + The optional `transport` argument specifies the Thrift transport + mode to use. Supported values for this argument are ``buffered`` + (the default) and ``framed``. Make sure to choose the right one, + since otherwise you might see non-obvious connection errors or + program hangs when making a connection. HBase versions before 0.94 + always use the buffered transport. Starting with HBase 0.94, the + Thrift server optionally uses a framed transport, depending on the + argument passed to the ``hbase-daemon.sh start thrift`` command. + The default ``-threadpool`` mode uses the buffered transport; the + ``-hsha``, ``-nonblocking``, and ``-threadedselector`` modes use the + framed transport. .. versionadded:: 0.5 - `timeout` parameter + `timeout` argument .. versionadded:: 0.4 - `table_prefix_separator` parameter + `table_prefix_separator` argument .. versionadded:: 0.4 support for framed Thrift transports @@ -177,16 +179,17 @@ def table(self, name, use_prefix=True): """Return a table object. - Returns a :py:class:`happybase.Table` instance for the table named - `name`. This does not result in a round-trip to the server, and the - table is not checked for existence. - - The optional `use_prefix` parameter specifies whether the table prefix - (if any) is prepended to the specified `name`. Set this to `False` if - you want to use a table that resides in another ‘prefix namespace’, - e.g. a table from a ‘friendly’ application co-hosted on the same HBase - instance. See the `table_prefix` parameter to the - :py:class:`Connection` constructor for more information. + Returns a :py:class:`happybase.Table` instance for the table + named `name`. This does not result in a round-trip to the + server, and the table is not checked for existence. + + The optional `use_prefix` argument specifies whether the table + prefix (if any) is prepended to the specified `name`. Set this + to `False` if you want to use a table that resides in another + ‘prefix namespace’, e.g. a table from a ‘friendly’ application + co-hosted on the same HBase instance. See the `table_prefix` + argument to the :py:class:`Connection` constructor for more + information. :param str name: the name of the table :param bool use_prefix: whether to use the table prefix (if any) @@ -226,7 +229,7 @@ :param str name: The table name :param dict families: The name and options for each column family - The `families` parameter is a dictionary mapping column family + The `families` argument is a dictionary mapping column family names to a dictionary containing the options for this column family, e.g. @@ -283,11 +286,11 @@ """Delete the specified table. .. versionadded:: 0.5 - the `disable` parameter + `disable` argument - In HBase, a table always needs to be disabled before it can be deleted. - If the `disable` parameter is `True`, this method first disables the - table if it wasn't already and then deletes it. + In HBase, a table always needs to be disabled before it can be + deleted. If the `disable` argument is `True`, this method first + disables the table if it wasn't already and then deletes it. :param str name: The table name :param bool disable: Whether to first disable the table if needed diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/happybase-0.7/happybase/pool.py new/happybase-0.8/happybase/pool.py --- old/happybase-0.7/happybase/pool.py 2013-06-21 15:40:35.000000000 +0200 +++ new/happybase-0.8/happybase/pool.py 2014-01-25 21:51:13.000000000 +0100 @@ -40,7 +40,7 @@ .. versionadded:: 0.5 - The `size` parameter specifies how many connections this pool + The `size` argument specifies how many connections this pool manages. Additional keyword arguments are passed unmodified to the :py:class:`happybase.Connection` constructor, with the exception of the `autoconnect` argument, since maintaining connections is the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/happybase-0.7/happybase/table.py new/happybase-0.8/happybase/table.py --- old/happybase-0.7/happybase/table.py 2013-11-06 22:46:27.000000000 +0100 +++ new/happybase-0.8/happybase/table.py 2014-02-25 21:19:18.000000000 +0100 @@ -8,7 +8,7 @@ from struct import Struct from .hbase.ttypes import TScan -from .util import thrift_type_to_dict, str_increment +from .util import thrift_type_to_dict, str_increment, OrderedDict from .batch import Batch logger = logging.getLogger(__name__) @@ -24,6 +24,14 @@ return dict((cn, cellfn(cell)) for cn, cell in cell_map.iteritems()) +def make_ordered_row(sorted_columns, include_timestamp): + """Make a row dict for sorted column results from scans.""" + cellfn = include_timestamp and make_cell_timestamp or make_cell + return OrderedDict( + (column.columnName, cellfn(column.cell)) + for column in sorted_columns) + + class Table(object): """HBase table abstraction class. @@ -50,13 +58,14 @@ descriptors = self.connection.client.getColumnDescriptors(self.name) families = dict() for name, descriptor in descriptors.items(): - name = name[:-1] # drop trailing ':' + name = name.rstrip(':') families[name] = thrift_type_to_dict(descriptor) return families def _column_family_names(self): """Retrieve the column family names for this table (internal use)""" - return self.connection.client.getColumnDescriptors(self.name).keys() + names = self.connection.client.getColumnDescriptors(self.name).keys() + return [name.rstrip(':') for name in names] def regions(self): """Retrieve the regions for this table. @@ -184,10 +193,10 @@ if versions is None: versions = (2 ** 31) - 1 # Thrift type is i32 elif not isinstance(versions, int): - raise TypeError("'versions' parameter must be a number or None") + raise TypeError("'versions' argument must be a number or None") elif versions < 1: raise ValueError( - "'versions' parameter must be at least 1 (or None)") + "'versions' argument must be at least 1 (or None)") if timestamp is None: cells = self.connection.client.getVer( @@ -205,7 +214,8 @@ def scan(self, row_start=None, row_stop=None, row_prefix=None, columns=None, filter=None, timestamp=None, - include_timestamp=False, batch_size=1000, limit=None): + include_timestamp=False, batch_size=1000, scan_batching=None, + limit=None, sorted_columns=False): """Create a scanner for data in the table. This method returns an iterable that can be used for looping over the @@ -240,9 +250,28 @@ this to a low value (or even 1) if your data is large, since a low batch size results in added round-trips to the server. - **Compatibility note:** The `filter` argument is only available when - using HBase 0.92 (or up). In HBase 0.90 compatibility mode, specifying - a `filter` raises an exception. + The optional `scan_batching` is for advanced usage only; it + translates to `Scan.setBatching()` at the Java side (inside the + Thrift server). By setting this value rows may be split into + partial rows, so result rows may be incomplete, and the number + of results returned by te scanner may no longer correspond to + the number of rows matched by the scan. + + If `sorted_columns` is `True`, the columns in the rows returned + by this scanner will be retrieved in sorted order, and the data + will be stored in `OrderedDict` instances. + + **Compatibility notes:** + + * The `filter` argument is only available when using HBase 0.92 + (or up). In HBase 0.90 compatibility mode, specifying + a `filter` raises an exception. + + * The `sorted_columns` argument is only available when using + HBase 0.96 (or up). + + .. versionadded:: 0.8 + `sorted_columns` argument :param str row_start: the row key to start at (inclusive) :param str row_stop: the row key to stop at (exclusive) @@ -252,6 +281,9 @@ :param int timestamp: timestamp (optional) :param bool include_timestamp: whether timestamps are returned :param int batch_size: batch size for retrieving resuls + :param bool scan_batching: server-side scan batching (optional) + :param int limit: max number of rows to return + :param bool sorted_columns: whether to return sorted columns :return: generator yielding the rows matching the scan :rtype: iterable of `(row_key, row_data)` tuples @@ -262,6 +294,10 @@ if limit is not None and limit < 1: raise ValueError("'limit' must be >= 1") + if sorted_columns and self.connection.compat < '0.96': + raise NotImplementedError( + "'sorted_columns' is not supported in HBase >= 0.96") + if row_prefix is not None: if row_start is not None or row_stop is not None: raise TypeError( @@ -299,10 +335,25 @@ self.name, row_start, row_stop, columns, timestamp, {}) else: - # The scan's caching size is set to the batch_size, so that - # the HTable on the Java side retrieves rows from the region - # servers in the same chunk sizes that it sends out over - # Thrift. + # XXX: The "batch_size" can be slightly confusing to those + # familiar with the HBase Java API: + # + # * TScan.caching (Thrift API) translates to + # Scan.setCaching() (Java API) + # + # * TScan.batchSize (Thrift API) translates to + # Scan.setBatching (Java API) . + # + # However, we set Scan.setCaching() to what is called + # batch_size in the HappyBase API, so that the HTable on the + # Java side (inside the Thrift server) retrieves rows from + # the region servers in the same chunk sizes that it sends + # out again to Python (over Thrift). This cannot be tweaked + # (by design). + # + # The Scan.setBatching() value (Java API), which possibly + # cuts rows into multiple partial rows, can be set using the + # slightly strange name scan_batching. scan = TScan( startRow=row_start, stopRow=row_stop, @@ -310,7 +361,8 @@ columns=columns, caching=batch_size, filterString=filter, - batchSize=batch_size, + batchSize=scan_batching, + sortColumns=sorted_columns, ) scan_id = self.connection.client.scannerOpenWithScan( self.name, scan, {}) @@ -334,7 +386,14 @@ n_fetched += len(items) for n_returned, item in enumerate(items, n_returned + 1): - yield item.row, make_row(item.columns, include_timestamp) + if sorted_columns: + row = make_ordered_row(item.sortedColumns, + include_timestamp) + else: + row = make_row(item.columns, include_timestamp) + + yield item.row, row + if limit is not None and n_returned == limit: return @@ -364,7 +423,7 @@ method to manipulate data. .. versionadded:: 0.7 - `wal` parameter + `wal` argument :param str row: the row key :param dict data: the data to store @@ -384,7 +443,7 @@ method to manipulate data. .. versionadded:: 0.7 - `wal` parameter + `wal` argument :param str row: the row key :param list_or_tuple columns: list of columns (optional) @@ -420,7 +479,7 @@ :py:meth:`Batch.delete`. .. versionadded:: 0.7 - `wal` parameter + `wal` argument :param bool transaction: whether this batch should behave like a transaction (only useful when used as a diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/happybase-0.7/happybase/util.py new/happybase-0.8/happybase/util.py --- old/happybase-0.7/happybase/util.py 2013-11-06 22:46:27.000000000 +0100 +++ new/happybase-0.8/happybase/util.py 2014-01-25 21:51:13.000000000 +0100 @@ -9,6 +9,21 @@ CAPITALS = re.compile('([A-Z])') +try: + # Python 2.7 + from collections import OrderedDict +except ImportError: + try: + # External package for Python 2.6 + from ordereddict import OrderedDict + except ImportError as exc: + # Stub to throw errors at run-time (not import time) + def OrderedDict(*args, **kwargs): + raise RuntimeError( + "No OrderedDict implementation available; please " + "install the 'ordereddict' Package from PyPI.") + + def camel_case_to_pep8(name): """Convert a camel cased name to PEP8 style.""" converted = CAPITALS.sub(lambda m: '_' + m.groups()[0].lower(), name) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/happybase-0.7/happybase.egg-info/PKG-INFO new/happybase-0.8/happybase.egg-info/PKG-INFO --- old/happybase-0.7/happybase.egg-info/PKG-INFO 2013-11-06 23:20:22.000000000 +0100 +++ new/happybase-0.8/happybase.egg-info/PKG-INFO 2014-02-25 21:19:38.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: happybase -Version: 0.7 +Version: 0.8 Summary: A developer-friendly Python library to interact with Apache HBase Home-page: https://github.com/wbolster/happybase Author: Wouter Bolsterlee diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/happybase-0.7/tests/test_api.py new/happybase-0.8/tests/test_api.py --- old/happybase-0.7/tests/test_api.py 2013-11-06 22:46:27.000000000 +0100 +++ new/happybase-0.8/tests/test_api.py 2014-02-25 21:09:55.000000000 +0100 @@ -14,6 +14,7 @@ assert_in, assert_is_instance, assert_is_not_none, + assert_list_equal, assert_not_in, assert_raises, assert_true, @@ -23,7 +24,7 @@ HAPPYBASE_HOST = os.environ.get('HAPPYBASE_HOST') HAPPYBASE_PORT = os.environ.get('HAPPYBASE_PORT') -HAPPYBASE_COMPAT = os.environ.get('HAPPYBASE_COMPAT', '0.92') +HAPPYBASE_COMPAT = os.environ.get('HAPPYBASE_COMPAT', '0.96') HAPPYBASE_TRANSPORT = os.environ.get('HAPPYBASE_TRANSPORT', 'buffered') KEEP_TABLE = ('HAPPYBASE_NO_CLEANUP' in os.environ) @@ -273,7 +274,6 @@ exp = {'cf1:col1': 'v1new', 'cf1:col2': 'v2'} assert_dict_equal(exp, row(row_key, ['cf1'])) - assert_dict_equal(exp, row(row_key, ['cf1:'])) exp = {'cf1:col1': 'v1new', 'cf2:col2': 'v4'} @@ -428,6 +428,31 @@ next(scanner) +def test_scan_sorting(): + if connection.compat < '0.96': + return # not supported + + input_row = {} + for i in xrange(100): + input_row['cf1:col-%03d' % i] = '' + input_key = 'row-scan-sorted' + table.put(input_key, input_row) + + scan = table.scan(row_start=input_key, sorted_columns=True) + key, row = next(scan) + assert_equal(key, input_key) + assert_list_equal( + sorted(input_row.items()), + row.items()) + + +def test_scan_filter_and_batch_size(): + # See issue #54 and #56 + filter = "SingleColumnValueFilter ('cf1', 'qual1', =, 'binary:val1')" + for k, v in table.scan(filter=filter): + print v + + def test_delete(): row_key = 'row-test-delete' data = {'cf1:col1': 'v1', -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-Moose for openSUSE:Factory
by root＠hilbert.suse.de 17 Apr '14

17 Apr '14

Hello community, here is the log from the commit of package perl-Moose for openSUSE:Factory checked in at 2014-04-17 14:08:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Moose (Old) and /work/SRC/openSUSE:Factory/.perl-Moose.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Moose" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Moose/perl-Moose.changes 2013-06-13 18:14:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-Moose.new/perl-Moose.changes 2014-04-17 14:08:36.000000000 +0200 @@ -1,0 +2,78 @@ +Mon Apr 14 08:13:41 UTC 2014 - mcaj(a)suse.com + +updated to 2.1204 + - bump minimum prereq needed for optional test using MooseX::NonMoose (which + broke with new Module::Runtime, see 2.1203), so users can install Moose + and pass tests before updating MooseX::NonMoose. + - bump prereq on Module::Runtime to properly detect when a module fails to + load, and fix how we call these subs (Zefram, RT#92770, RT#86394, RT#92791) + - string comparisons are now possible with Moose exceptions (RT#92232) + - re-release to index pod files (Moose::Cookbook::*, Moose::Manual::* etc). + - Releasing 2.1108 as stable (last stable release was 2.1005). + - fixed distribution manifest + - minor documentation and metadata updates + - many additions to the list of conflicting modules (those that require + updates after installing Moose), reflecting recent API changes + - now failing early at build time, with a useful error message, if a + compiler is not available + - throw_error import cleaned from Moose::Object after use (doy) + - resolved new circular load issue between Moose::Util and Class::MOP (Kent + Fredric, RT#89713 and PR#42) + - legacy throw_error now takes multiple arguments, like confess does + (Karen Etheridge) + - Class::MOP::Object::_inline_throw_error is back, used by some MooseX + modules (Upasana) + - fix errors in last trial release relating to Moose::Error::Default, + Moose::Util::throw_error (Upasana) + - die if a role to consume can't be found -- this restores behaviour as in + 2.1005 (doy) + - fix test to accomodate Devel::PartialDump possibly not being installed + (Upasana) + - Moose string exceptions have been replaced by Moose::Exception objects. See + Moose::Manual::Delta for details. + - Class::MOP::load_class, Class::MOP::is_class_loaded, and + Class::MOP::load_first_existing_class are now deprecated. See + Moose::Manual::Delta for details. + - The non-arrayref forms of enum and duck_type have been deprecated. See + Moose::Manual::Delta for details. + - Many deprecated features have now been removed: + - optimize_as for type constraints + - the "default is" and "default default" features for native delegations + - setting coerce => 1 on an attribute whose type constraint has no coercion + - the public version of Moose::Meta::Method::Destructor::initialize_body + - Creating classes with Moose now always sets the appropriate entry in %INC, + even if it wasn't loaded from a file. This should make writing classes + inline easier, and will allow us to be more intelligent about figuring out + when classes are loaded in the future. See Moose::Manual::Delta for more + details. Note that this is slightly backwards-incompatible in some edge + cases. + - Moose now uses Module::Runtime instead of Class::Load to load classes. This + means that there are no more issues with the weird heuristics that + Class::Load does to determine if a class was previously loaded (inheriting + from an empty package is now possible, for instance). See + Moose::Manual::Delta for more details. This is also slightly + backwards-incompatible in some edge cases. + - add_method now accepts blessed subs (Graham Knop, PR#28) + - If a role consumed another role, we resolve method conflicts just like a + class consuming a role, but when metaclass compat tried to fix up + metaclass roles, we were putting all methods into one composite role and + allowing methods in the metaclass roles to conflict. Now we resolve them + as we should. (Jesse Luehrs, PR#27) + - Some edge cases in tests with base.pm and non-existent module files are + handled more strictly (see also perl RT#118561) (Graham Knop, PR#25) + - 2.1003 was released with some bad metadata, which caused the prereq test + to fail. + - Releasing 2.0901 as stable. + - The with_immutable() sub from Test::Moose now passes a boolean value to + the code block containing tests indicating whether or not the classes have + been made immutable. This can make for nicer test descriptions. (Dave + Rolsky) + - You can now use Specio types instead of Moose builtins or + MooseX::Types. As a bonus, Specio types inline coercion. However, this + support is still experimental (as is Specio), so use it with care. (Dave + Rolsky) + - Fixed the Num builtin type to reject NaN, Inf, numbers with whitespace, + and other questionable strings. The MooseX::Types::LaxNum distro + implements the old behavior. RT#70539 (Upasana) + +------------------------------------------------------------------- Old: ---- Moose-2.0802.tar.gz New: ---- Moose-2.1204.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Moose.spec ++++++ --- /var/tmp/diff_new_pack.LxaqDd/_old 2014-04-17 14:08:37.000000000 +0200 +++ /var/tmp/diff_new_pack.LxaqDd/_new 2014-04-17 14:08:37.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package perl-Moose # -# 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: perl-Moose -Version: 2.0802 +Version: 2.1204 Release: 0 %define cpan_name Moose Summary: A postmodern object system for Perl 5 @@ -38,6 +38,7 @@ BuildRequires: perl(Class::Load::XS) >= 0.01 BuildRequires: perl(Data::OptList) >= 0.107 BuildRequires: perl(Devel::GlobalDestruction) +BuildRequires: perl(Devel::StackTrace) => 1.30 BuildRequires: perl(Dist::CheckConflicts) >= 0.02 BuildRequires: perl(Eval::Closure) >= 0.04 BuildRequires: perl(List::MoreUtils) >= 0.28 @@ -54,6 +55,7 @@ BuildRequires: perl(Test::More) >= 0.88 BuildRequires: perl(Test::Requires) >= 0.05 BuildRequires: perl(Try::Tiny) >= 0.02 +BuildRequires: perl(parent) => 0.223 Requires: perl(Carp) >= 1.22 Requires: perl(Class::Load) >= 0.09 Requires: perl(Class::Load::XS) >= 0.01 @@ -118,6 +120,7 @@ %files -f %{name}.files %defattr(-,root,root,755) -%doc Changes Changes.Class-MOP doc examples LICENSE README.md TODO +%doc Changes Changes.Class-MOP doc LICENSE README.md TODO +#examples %changelog ++++++ Moose-2.0802.tar.gz -> Moose-2.1204.tar.gz ++++++ ++++ 68471 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 man-pages for openSUSE:Factory
by root＠hilbert.suse.de 17 Apr '14

17 Apr '14

Hello community, here is the log from the commit of package man-pages for openSUSE:Factory checked in at 2014-04-17 14:08:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/man-pages (Old) and /work/SRC/openSUSE:Factory/.man-pages.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "man-pages" Changes: -------- --- /work/SRC/openSUSE:Factory/man-pages/man-pages.changes 2014-04-13 13:15:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.man-pages.new/man-pages.changes 2014-04-17 14:08:27.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Apr 16 06:35:18 UTC 2014 - pgajdos(a)suse.com + +- package getent.1 [bnc#873645] + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ man-pages.spec ++++++ --- /var/tmp/diff_new_pack.QoMBtN/_old 2014-04-17 14:08:28.000000000 +0200 +++ /var/tmp/diff_new_pack.QoMBtN/_new 2014-04-17 14:08:28.000000000 +0200 @@ -59,7 +59,7 @@ # nfs-utils rm -f man5/exports.5 # coreutils, diffutils -rm -f man1/vdir.1 man1/touch.1 man1/rmdir.1 man1/rm.1 man1/mv.1 man1/mknod.1 man1/mkfifo.1 man1/mkdir.1 man1/ls.1 man1/ln.1 man1/install.1 man1/du.1 man1/dircolors.1 man1/dir.1 man1/diff.1 man1/df.1 man1/dd.1 man1/cp.1 man1/chown.1 man1/chmod.1 man1/chgrp.1 man1/getent.1 man3/getaddrinfo.3.orig man3/{getifaddrs.3,freeifaddrs.3} +rm -f man1/vdir.1 man1/touch.1 man1/rmdir.1 man1/rm.1 man1/mv.1 man1/mknod.1 man1/mkfifo.1 man1/mkdir.1 man1/ls.1 man1/ln.1 man1/install.1 man1/du.1 man1/dircolors.1 man1/dir.1 man1/diff.1 man1/df.1 man1/dd.1 man1/cp.1 man1/chown.1 man1/chmod.1 man1/chgrp.1 man3/getaddrinfo.3.orig man3/{getifaddrs.3,freeifaddrs.3} # glibc rm -f man3/crypt.3 man3/crypt_r.3 man1/locale.1 # time -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit cfengine for openSUSE:Factory
by root＠hilbert.suse.de 17 Apr '14

17 Apr '14

Hello community, here is the log from the commit of package cfengine for openSUSE:Factory checked in at 2014-04-17 14:07:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cfengine (Old) and /work/SRC/openSUSE:Factory/.cfengine.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cfengine" Changes: -------- --- /work/SRC/openSUSE:Factory/cfengine/cfengine.changes 2013-12-13 11:55:22.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cfengine.new/cfengine.changes 2014-04-17 14:07:59.000000000 +0200 @@ -1,0 +2,111 @@ +Fri Apr 11 07:32:08 UTC 2014 - kkaempf(a)suse.com + +- Upgrade to 3.6.0rc + Bugfix release + Full ChangeLog at https://raw.githubusercontent.com/cfengine/core/3.6.x/ChangeLog + +------------------------------------------------------------------- +Thu Apr 10 14:02:11 UTC 2014 - kkaempf(a)suse.com + +- add 0001-Simplify-and-fix-parsing-of-etc-SuSE-release-fixes-i.patch + * add 'suse' class for consistency with other vendor classes + (fixes #5417) + * distinction between "SUSE Linux Enterprise Server" (sles) and + "... Desktop" (sled) + * distinction between SUSE Linux Enterprise products (suse) and + openSUSE (opensuse) + * extract version from VERSION and PATCHLEVEL lines instead of + first line of /etc/SuSE-release + +------------------------------------------------------------------- +Fri Apr 4 19:36:47 UTC 2014 - kkaempf(a)suse.com + +- merge cfengine-server with cfengine. A policy server only + gets cfengine-masterfiles but is otherwise identical to + a client. + +------------------------------------------------------------------- +Thu Apr 3 13:10:56 UTC 2014 - kkaempf(a)suse.com + +- install cfengine.SuSEfirewall2 + +------------------------------------------------------------------- +Thu Apr 3 12:41:44 UTC 2014 - kkaempf(a)suse.com + +- install cfengine-masterfiles together with cfengine-server only. + A cfengine client will get the masterfiles from the server. + +------------------------------------------------------------------- +Wed Apr 2 13:14:34 UTC 2014 - kkaempf(a)suse.com + +- clean up /var/cfengine/inputs cache on removal. + +------------------------------------------------------------------- +Wed Mar 26 16:08:16 UTC 2014 - kkaempf(a)suse.com + +- remove '.unknown' from reported version + add drop-revision.patch + +------------------------------------------------------------------- +Wed Mar 26 08:24:00 UTC 2014 - kkaempf(a)suse.com + +- Fix all .service files, type is forking. + +------------------------------------------------------------------- +Tue Mar 18 11:30:23 UTC 2014 - kkaempf(a)suse.com + +- Update to 3.6.0b2 + - performance has been significantly improved, with a 10-20% speed + increase over 3.5 when using the default masterfiles + - agents support the legacy protocol without TLS envelope + This allows upgrading of an agent before the policy server. + - several general improvements and bug fixes too numerous to list + here. + +- remove cfengine-bootstrap.patch, included upstream + +- split masterfiles off as cfengine-masterfiles package + +------------------------------------------------------------------- +Tue Mar 18 10:20:55 UTC 2014 - aeszter(a)gwdg.de + +- fix build for RHEL + * MySQL connector: disabled + * docs go into versioned directory + +------------------------------------------------------------------- +Thu Feb 20 23:54:22 UTC 2014 - chris(a)computersalat.de + +- merge with my last (not committed changes) + * bootstrap patch +- fix changes file + * update 3.0.4b2 -> 3.4.0b2 +- fix docs install +- fix build for SLE_11 (MySQL connector: disabled) + +------------------------------------------------------------------- +Sun Feb 9 12:02:45 UTC 2014 - kkaempf(a)suse.com + +- use lmdb instead of tokyocabinet +- add primer.pdf + +------------------------------------------------------------------- +Tue Feb 4 07:10:49 UTC 2014 - kkaempf(a)suse.com + +- split off -examples sub-package + +------------------------------------------------------------------- +Mon Feb 3 18:30:23 UTC 2014 - kkaempf(a)suse.com + +- Upgrade to 3.6.0b1 + - New promise type "users" for managing local user accounts. + - TLS authentication and fully encrypted network protocol + - New attributes in 'bundle server access_rules' + - New variable type 'data' for handling of structured data + - Tagging of classes and variables with meta data + - Many new built-in variables + - Many new functions + + - Replace tokyocabinet with lmdb database + +------------------------------------------------------------------- @@ -280 +391 @@ -- update to 3.0.4b2 +- update to 3.4.0b2 @@ -318,0 +430,6 @@ +------------------------------------------------------------------- +Wed Mar 7 13:02:30 UTC 2012 - chris(a)computersalat.de + +- add bootstrap patch + * set correct "workdir" + Old: ---- cfengine-3.5.3.tar.gz libacl-headers.patch New: ---- 0001-Simplify-and-fix-parsing-of-etc-SuSE-release-fixes-i.patch cfengine.SuSEfirewall2 core-3.6rc.tar.gz drop-revision.patch primer.pdf ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cfengine.spec ++++++ --- /var/tmp/diff_new_pack.3Qbnkf/_old 2014-04-17 14:08:02.000000000 +0200 +++ /var/tmp/diff_new_pack.3Qbnkf/_new 2014-04-17 14:08:02.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package cfengine # -# 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,6 +17,7 @@ Name: cfengine +%define srcname core %define libname libpromises %define libsoname %{libname}3 @@ -24,25 +25,19 @@ # reported upstream as https://cfengine.com/dev/issues/1896 %define basedir /var/%{name} %define workdir %{basedir} +# This is the place where workdir should be +#define basedir /var/lib/%{name} +#define workdir %{basedir}/work Summary: CFEngine automates large-scale IT computing infrastructure License: GPL-3.0 Group: Productivity/Networking/System -Version: 3.5.3 +Version: 3.6rc Release: 0 Url: http://www.cfengine.org/ -Source: %{name}-%{version}.tar.gz -# there's no /usr/include/acl.h in SUSE or Fedora, kkaempf(a)suse.de -Patch1: libacl-headers.patch -# SLE 11 or RHEL5 autoconf does not support AM_SUBST_NOTMAKE, kkaempf(a)suse.de -Patch2: remove-am_subst_notmake.patch +Source: %{srcname}-%{version}.tar.gz +Source1: %{name}.SuSEfirewall2 -Source1: http://www.cfengine.org/manuals/cf3-Reference.pdf -Source2: http://www.cfengine.org/manuals/cf3-conceptguide.pdf -Source3: http://www.cfengine.org/manuals/cf3-glossary.pdf -Source4: http://www.cfengine.org/manuals/cf3-quickstart.pdf -Source5: http://www.cfengine.org/manuals/cf3-solutions.pdf -Source6: http://www.cfengine.org/manuals/cf3-tutorial.pdf # wtf? SLE_11 does not honor rpmlintrc %if 0%{?suse_version} <= 1130 BuildRequires: -post-build-checks @@ -58,13 +53,35 @@ %endif Source10: %{name}.cron Source11: %{name}-rpmlintrc + +# docs +Source101: http://www.cfengine.org/manuals/cf3-Reference.pdf +Source102: http://www.cfengine.org/manuals/cf3-conceptguide.pdf +Source103: http://www.cfengine.org/manuals/cf3-glossary.pdf +Source104: http://www.cfengine.org/manuals/cf3-quickstart.pdf +Source105: http://www.cfengine.org/manuals/cf3-solutions.pdf +Source106: http://www.cfengine.org/manuals/cf3-tutorial.pdf +Source107: http://www.verticalsysadmin.com/cfengine/primer.pdf + +# SLE 11 or RHEL5 autoconf does not support AM_SUBST_NOTMAKE, kkaempf(a)suse.de +Patch2: remove-am_subst_notmake.patch + +# drop revision from configure.ac, autotools will evaluate it as 'unkwown' +# kkaempf(a)suse.de +Patch3: drop-revision.patch + +# PATCH-FIX-UPSTREAM add 'suse' class for consistency with other vendor classes +# PATCH-FEATURE-UPSTREAM better /etc/SuSE-release parsing, upstream #5423 +Patch5: 0001-Simplify-and-fix-parsing-of-etc-SuSE-release-fixes-i.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: bison BuildRequires: db-devel BuildRequires: flex -BuildRequires: libtokyocabinet-devel BuildRequires: libtool BuildRequires: libxml2-devel +BuildRequires: lmdb-devel +BuildRequires: pam-devel # # Disable mysql for SLE_11: # @@ -73,7 +90,7 @@ # library or disable MySQL connector. See # http://bugs.mysql.com/bug.php?id=65055 for details. # -%if 0%{?suse_version} != 1110 +%if 0%{?suse_version} != 1110 && 0%{?rhel_version} == 0 BuildRequires: mysql-devel %endif BuildRequires: libacl-devel @@ -101,6 +118,8 @@ BuildRequires: fdupes %endif +Requires: %{libsoname} = %{version} + %description CFEngine is the core of a configuration management system: ensuring the availability, security and compliance of mission-critical @@ -114,8 +133,8 @@ %package -n %{libsoname} Summary: Shared library of cfengine Group: System/Libraries -Provides: %{libname}1 -Obsoletes: %{libname}1 +Provides: %{libname}1 = %{version} +Obsoletes: %{libname}1 < %{version} %if 0%{?suse_version} == 1010 Requires: glibc %endif @@ -126,7 +145,7 @@ %package -n %{libname}-devel Summary: Development package for libpromises Group: Development/Libraries/C and C++ -Provides: %{name}-devel < %{version} +Provides: %{name}-devel = %{version} Obsoletes: %{name}-devel < %{version} Requires: %{libsoname} = %{version} Requires: glibc-devel @@ -139,7 +158,7 @@ %package doc Summary: CFEngine automates large-scale IT computing infrastructure - documentation -Group: Productivity/Networking/System +Group: Documentation/Other %if 0%{?rhel_version} || 0%{?centos_version} BuildRequires: tetex BuildRequires: tetex-dvips @@ -150,26 +169,23 @@ %description doc Full documentation for cfengine -%package server -Summary: CFEngine automates large-scale IT computing infrastructure - server -Group: Productivity/Networking/System -Requires: %{name} = %{version}-%{release} - -%description server -This package contains the files of the cfengine server. +%package examples +Summary: CFEngine example promises +Group: Documentation/Other +%description examples +Lots of examples promises for CFEngine. %prep -%setup -q -n %{name}-%{version} -%if 0%{?suse_version} || 0%{?fedora_version} || 0%{?rhel_version} -%patch1 -p1 -%endif -%if 0%{?suse_version} > 0 && 0%{?suse_version} <= 1110 +%setup -q -n %{srcname}-%{version} +%if 0%{?suse_version} <= 1110 %patch2 -p1 %endif %if 0%{?rhel_version} >= 500 && 0%{?rhel_version} < 600 %patch2 -p1 %endif +%patch3 -p1 +%patch5 -p1 ##### rpmlint #### wrong-file-end-of-line-encoding @@ -177,25 +193,36 @@ ### http://www.fsf.org/about/contact/ find ./examples -type f -name "*.cf" -exec perl -p -i -e 's|\r\n|\n|,s|^# Foundation.*|# Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA|' {} \; +### install extra docs +%{__install} -d docs +cp -a $RPM_SOURCE_DIR/*pdf docs/ + %build -autoreconf -fi +autoreconf -fi -I m4 # /usr/include/sys for acl.h CC=gcc CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \ %configure \ --disable-static \ --enable-fhs \ - --with-libxml2 \ --datadir=/var \ --with-workdir=%{workdir} \ --with-postgresql \ +%if 0%{?suse_version} != 1110 && 0%{?rhel_version} == 0 && 0%{?fedora_version} != 20 + --with-mysql \ +%endif + --without-qdbm \ + --without-tokyocabinet \ + --with-lmdb \ --with-pthreads \ --with-openssl \ --with-pcre \ --with-libvirt \ --with-libacl \ --with-libxml2 \ -%if 0%{?suse_version} >= 1110 || 0%{?rhel_version} >= 600 +%if 0%{?suse_version} >= 1110 --docdir=%{_docdir}/%{name} +%else if 0%{?rhel_version} >= 600 + --docdir=%{_docdir}/%{name}-%{version} %endif # SLE 10 and RHEL5 don't recognize --docdir @@ -211,10 +238,16 @@ [ -d %{buildroot} ] && [ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot} %endif %{__make} "DESTDIR=%{buildroot}" install + +%if 0%{?suse_version} >= 1110 || 0%{?rhel_version} >= 600 +# will appear in cfengine-examples +rm -rf %{buildroot}/%{_docdir}/%{name}/examples +%endif + %{__install} -d %{buildroot}/{usr/sbin,%{workdir}/{bin,inputs,reports}} # create dirs needed for better organizing dirs and files -%{__install} -d %{buildroot}/%{basedir}/{backup,failsafe,config} +%{__install} -d %{buildroot}/%{basedir}/{backup,failsafe,config,plugins} #%%{__install} -d %{buildroot}/%%{basedir}/config/{development,production} # install cron file @@ -239,28 +272,30 @@ %{buildroot}/etc/init.d/cf-* %{buildroot}/etc/cron.d/%{name} %endif -# install docs -%{__install} -d %{buildroot}/%{_datadir}/doc/%{name} -%{__install} -m 0644 %{S:1} %{S:2} %{S:3} %{S:4} %{S:5} %{S:6} %{buildroot}/%{_datadir}/doc/%{name} - # create symlinks for sbin_PROGRAMS # because: cf-promises needs to be installed in /var/cfengine/work/bin for pre-validation of full configuration -for i in cf-agent cf-execd cf-key cf-monitord cf-promises cf-runagent cf-serverd; do +for i in cf-agent cf-execd cf-key cf-monitord cf-promises cf-runagent cf-serverd cf-upgrade; do %{__ln_s} -f ../../..%{_sbindir}/${i} %{buildroot}%{workdir}/bin/${i} done -# Install masterfiles (as %%config(noreplace) ) -%{__install} -d %{buildroot}/%{basedir}/masterfiles -%{__install} -m 0644 masterfiles/def.cf %{buildroot}/%{basedir}/masterfiles -%{__install} -m 0644 masterfiles/promises.cf %{buildroot}/%{basedir}/masterfiles -%{__install} -m 0644 masterfiles/libraries/cfengine_stdlib.cf %{buildroot}/%{basedir}/masterfiles - rm -rf %{buildroot}/%{_libdir}/%{name}/libpromises.la # will appear in %%docdir rm -rf %{buildroot}/%{_datadir}/%{name}/ChangeLog rm -rf %{buildroot}/%{_datadir}/%{name}/README +# create man pages, see https://cfengine.com/dev/issues/2989 +%{__install} -d %{buildroot}/%{_mandir}/man8 +for i in cf-agent cf-execd cf-key cf-monitord cf-promises cf-runagent cf-serverd +do + LD_LIBRARY_PATH=%{buildroot}%{_libdir}/%{name} %{buildroot}%{_sbindir}/$i -M > %{buildroot}%{_mandir}/man8/$i.8 + gzip %{buildroot}%{_mandir}/man8/$i.8 +done + +%if 0%{?suse_version} > 1010 +install -D -m 644 %{S:1} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/cfengine +%endif + %if 0%{?suse_version} > 01020 %fdupes %{buildroot}/usr/share/cfengine %endif @@ -268,55 +303,53 @@ # systemd %if 0%{?suse_version} >= 1210 +#################################################################### +# Systemd +#################################################################### + %pre -%service_add_pre cf-execd.service cf-monitord.service +%service_add_pre cf-execd.service cf-monitord.service cf-serverd.service %post -%service_add_post cf-execd.service cf-monitord.service +%service_add_post cf-execd.service cf-monitord.service cf-serverd.service %if 0%{?suse_version} > 1010 %install_info --name=%{name} --info-dir=%{_infodir} %{_infodir}/cf3-reference.info.gz %endif /sbin/ldconfig if [ $1 -lt 2 ]; then + # first install, generate key pair cf-key fi %preun -%service_del_preun cf-execd.service cf-monitord.service +%service_del_preun cf-execd.service cf-monitord.service cf-serverd.service %postun -%service_del_postun cf-execd.service cf-monitord.service +%service_del_postun cf-execd.service cf-monitord.service cf-serverd.service %if 0%{?suse_version} > 1010 %install_info_delete --name=%{name} --info-dir=%{_infodir} %{_infodir}/cf3-reference.info.gz %endif -/sbin/ldconfig - -%pre server -%service_add_pre cf-serverd.service - -%post server -if [ ${1:-0} -ne 1 ]; then - cp -a /usr/share/cfengine/CoreBase/controls /var/cfengine/inputs - cp -a /usr/share/cfengine/CoreBase/libraries /var/cfengine/inputs - cp -a /usr/share/cfengine/CoreBase/services /var/cfengine/inputs +if [ $1 -eq 0 ]; then + # clean up inputs cache dir on removal + rm -rf %{basedir}/inputs/* fi -%service_add_post cf-serverd.service - -%preun server -%service_del_preun cf-serverd.service - -%postun server -%service_del_postun cf-serverd.service +/sbin/ldconfig %else # !systemd +#################################################################### +# Non-systemd +#################################################################### + %preun %if 0%{?suse_version} %stop_on_removal cf-monitord %stop_on_removal cf-execd +%stop_on_removal cf-serverd %else /etc/init.d/cf-execd stop /etc/init.d/cf-monitord stop +/etc/init.d/cf-serverd stop %endif %post @@ -329,13 +362,13 @@ %if 0%{?suse_version} > 1010 %install_info_delete --name=%{name} --info-dir=%{_infodir} %{_infodir}/cf3-reference.info.gz %insserv_cleanup - for i in execd monitord; do + for i in execd monitord serverd; do %restart_on_update cf-${i} done %else # Update ? if [ ${1:-0} -eq 1 ]; then - for i in execd monitord; do + for i in execd monitord serverd; do /etc/init.d/cf-${i} restart done else @@ -344,25 +377,6 @@ %endif /sbin/ldconfig -%preun server -%if 0%{?suse_version} -%stop_on_removal cf-serverd -%else -/etc/init.d/cf-serverd stop -%endif - -%postun server -%if 0%{?suse_version} -%restart_on_update cf-serverd -%else - # Update ? - if [ ${1:-0} -eq 1 ]; then - /etc/init.d/cf-serverd restart - else -: - fi -%endif - %endif # !systemd %post -n %{libsoname} -p /sbin/ldconfig @@ -371,45 +385,38 @@ %files %defattr(-,root,root) -%doc LICENSE -# %doc README -%doc ChangeLog +%doc ChangeLog LICENSE README.md %{_sbindir}/cf-agent %{_sbindir}/cf-execd %{_sbindir}/cf-key %{_sbindir}/cf-monitord %{_sbindir}/cf-promises +%{_sbindir}/cf-serverd +%{_sbindir}/cf-upgrade %{_sbindir}/cf-runagent %{_sbindir}/rpmvercmp %if 0%{?suse_version} >= 1210 %_unitdir/cf-execd.service %_unitdir/cf-monitord.service +%_unitdir/cf-serverd.service %else -%exclude /etc/init.d/cf-serverd %config %attr(0755,root,root) /etc/init.d/* %{_sbindir}/rccf-execd %{_sbindir}/rccf-monitord +%{_sbindir}/rccf-serverd +%endif +%if 0%{?suse_version} > 1010 +%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/cfengine %endif -# %{_mandir}/man?/* +%{_mandir}/man8/* %dir %{basedir} -/var/%{name} -%exclude %{basedir}/backup -%exclude %{basedir}/config -#%%exclude %%{basedir}/failsafe - -%dir %{_datadir}/%{name} -%{_datadir}/%{name}/* %dir %{workdir} %{workdir}/* -%exclude %{workdir}/bin/cf-serverd %config(noreplace) /etc/cron.d/%{name} -%dir %{basedir}/masterfiles -%config(noreplace) %{basedir}/masterfiles/*.cf - %files -n %{libsoname} %defattr(-,root,root) %dir %{_libdir}/%{name} @@ -421,20 +428,10 @@ %files doc %defattr(-,root,root) -%dir %{_datadir}/doc/%{name} -%{_datadir}/doc/%{name}/* +%doc docs/*.pdf -%files server +%files examples %defattr(-,root,root) -%{basedir}/backup -%{basedir}/config -%{_sbindir}/cf-serverd -%{workdir}/bin/cf-serverd -%if 0%{?suse_version} >= 1210 -%_unitdir/cf-serverd.service -%else -/etc/init.d/cf-serverd -%{_sbindir}/rccf-serverd -%endif +%doc examples/*cf %changelog ++++++ 0001-Simplify-and-fix-parsing-of-etc-SuSE-release-fixes-i.patch ++++++ >From 2790065efcf484d5b51e2f5ab410983d9f37c74c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf(a)suse.de> Date: Fri, 11 Apr 2014 09:25:05 +0200 Subject: [PATCH] Simplify and fix parsing of /etc/SuSE-release (fixes issue #5423) This patch is a simplification of sysinfo.c:Linux_Suse_Version() to achieve the following - distinction between "SUSE Linux Enterprise Server" (sles) and "... Desktop" (sled) - distinction between SUSE Linux Enterprise products (suse) and openSUSE (opensuse) - extract version from VERSION and PATCHLEVEL lines instead of first line of /etc/SuSE-release - verified for sles version 9,10,11,12; sled versions 10,11,12, openSUSE 13.1 --- libenv/sysinfo.c | 187 ++++++++++++++++++------------------------------------- 1 file changed, 60 insertions(+), 127 deletions(-) diff --git a/libenv/sysinfo.c b/libenv/sysinfo.c index 72eb71f75d8d..6f2a05fc4cdd 100644 --- a/libenv/sysinfo.c +++ b/libenv/sysinfo.c @@ -1629,6 +1629,7 @@ static int Linux_Suse_Version(EvalContext *ctx) #define SUSE_RELEASE_FLAG "linux " char classbuf[CF_MAXVARSIZE]; + char *vendor = "suse"; Log(LOG_LEVEL_VERBOSE, "This appears to be a SUSE system."); EvalContextClassPutHard(ctx, "SUSE", "inventory,attribute_name=none,source=agent"); @@ -1648,23 +1649,26 @@ static int Linux_Suse_Version(EvalContext *ctx) return 1; } - char vbuf[CF_BUFSIZE], strversion[CF_MAXVARSIZE], strpatch[CF_MAXVARSIZE]; - strversion[0] = '\0'; - strpatch[0] = '\0'; + char vbuf[CF_BUFSIZE]; int major = -1, minor = -1; while (fgets(vbuf, sizeof(vbuf), fp) != NULL) { if (strncmp(vbuf, "VERSION", strlen("version")) == 0) { - strlcpy(strversion, vbuf, sizeof(strversion)); - sscanf(vbuf, "VERSION = %d", &major); + int res; + res = sscanf(vbuf, "VERSION = %d.%d", &major, &minor); + Log(LOG_LEVEL_VERBOSE, "VERSION sscanf returned %d.", res); + if (res < 1) + major = -1; + else if (res < 2) + minor = -1; } if (strncmp(vbuf, "PATCH", strlen("PATCH")) == 0) { - strlcpy(strpatch, vbuf, sizeof(strpatch)); - sscanf(vbuf, "PATCHLEVEL = %d", &minor); + if (sscanf(vbuf, "PATCHLEVEL = %d", &minor) != 1) + minor = -1; } } if (ferror(fp)) @@ -1678,28 +1682,38 @@ static int Linux_Suse_Version(EvalContext *ctx) fclose(fp); - /* Check if it's a SUSE Enterprise version */ + /* Check which SUSE/openSUSE product it is */ - Log(LOG_LEVEL_VERBOSE, "Looking for SUSE enterprise info in '%s'", relstring); + Log(LOG_LEVEL_VERBOSE, "Looking for SUSE product info in '%s'", relstring); - /* Convert relstring to lowercase to handle rename of SuSE to - * SUSE with SUSE 10.0. - */ - - for (int i = 0; i < strlen(relstring); i++) + if (!strncasecmp(relstring, SUSE_SLES8_ID, strlen(SUSE_SLES8_ID))) { - relstring[i] = tolower(relstring[i]); + EvalContextClassPutHard(ctx, "SLES8", "inventory,attribute_name=none,source=agent"); } - - /* Check if it's a SUSE Enterprise version (all in lowercase) */ - - if (!strncmp(relstring, SUSE_SLES8_ID, strlen(SUSE_SLES8_ID))) + else if (!strncasecmp(relstring, SUSE_SLES_ID, strlen(SUSE_SLES_ID))) { - classbuf[0] = '\0'; - strcat(classbuf, "SLES8"); - EvalContextClassPutHard(ctx, classbuf, "inventory,attribute_name=none,source=agent"); + EvalContextClassPutHard(ctx, "sles", "inventory,attribute_name=none,source=agent"); + if (major != -1) + { + snprintf(classbuf, CF_MAXVARSIZE, "SLES%d", major); + EvalContextClassPutHard(ctx, classbuf, "inventory,attribute_name=none,source=agent"); + } + } + else if (!strncasecmp(relstring, SUSE_SLED_ID, strlen(SUSE_SLED_ID))) + { + EvalContextClassPutHard(ctx, "sled", "inventory,attribute_name=none,source=agent"); + if (major != -1) + { + snprintf(classbuf, CF_MAXVARSIZE, "SLED%d", major); + EvalContextClassPutHard(ctx, classbuf, "inventory,attribute_name=none,source=agent"); + } + } + else if (!strncasecmp(relstring, "opensuse", strlen("opensuse"))) + { + vendor = "opensuse"; + EvalContextClassPutHard(ctx, vendor, "inventory,attribute_name=none,source=agent"); } - else if (strncmp(relstring, "sles", 4) == 0) + else if (strncasecmp(relstring, "sles", 4) == 0) { Item *list, *ip; @@ -1717,120 +1731,39 @@ static int Linux_Suse_Version(EvalContext *ctx) } else { - for (int version = 9; version < 13; version++) - { - snprintf(vbuf, CF_BUFSIZE, "%s %d ", SUSE_SLES_ID, version); - Log(LOG_LEVEL_DEBUG, "Checking for SUSE [%s]", vbuf); - - if (!strncmp(relstring, vbuf, strlen(vbuf))) - { - snprintf(classbuf, CF_MAXVARSIZE, "SLES%d", version); - EvalContextClassPutHard(ctx, classbuf, "inventory,attribute_name=none,source=agent"); - } - else - { - snprintf(vbuf, CF_BUFSIZE, "%s %d ", SUSE_SLED_ID, version); - Log(LOG_LEVEL_DEBUG, "Checking for SUSE [%s]", vbuf); - - if (!strncmp(relstring, vbuf, strlen(vbuf))) - { - snprintf(classbuf, CF_MAXVARSIZE, "SLED%d", version); - EvalContextClassPutHard(ctx, classbuf, "inventory,attribute_name=none,source=agent"); - } - } - } + Log(LOG_LEVEL_WARNING, "Unknown product '%s' in /etc/SuSE-release", relstring); } - /* Determine release version. We assume that the version follows - * the string "SuSE Linux" or "SUSE LINUX". - */ - - char *release = strstr(relstring, SUSE_RELEASE_FLAG); - if (release == NULL) + if (major != -1) { - release = strstr(relstring, "opensuse"); - if (release == NULL) + strncpy(classbuf, vendor, CF_MAXVARSIZE); + EvalContextClassPutHard(ctx, classbuf, "inventory,attribute_name=none,source=agent"); + snprintf(classbuf + strlen(classbuf), CF_MAXVARSIZE - strlen(classbuf), "_%d", major); + SetFlavour(ctx, classbuf); + if (minor != -1) { - release = strversion; + snprintf(classbuf + strlen(classbuf), CF_MAXVARSIZE - strlen(classbuf), "_%d", minor); + EvalContextClassPutHard(ctx, classbuf, "inventory,attribute_name=none,source=agent"); } - } - - if (release == NULL) - { - Log(LOG_LEVEL_VERBOSE, - "Could not find a numeric OS release in %s", - SUSE_REL_FILENAME); - return 2; + /* The correct spelling for SUSE is "SUSE" but CFEngine used to use "SuSE". + * Keep this for backwards compatibility until CFEngine 3.7 + */ + strncpy(classbuf, "SuSE", CF_MAXVARSIZE); + EvalContextClassPutHard(ctx, classbuf, "inventory,attribute_name=none,source=agent"); + snprintf(classbuf + strlen(classbuf), CF_MAXVARSIZE - strlen(classbuf), "_%d", major); + EvalContextClassPutHard(ctx, classbuf, "inventory,attribute_name=none,source=agent"); + if (minor != -1) + { + snprintf(classbuf + strlen(classbuf), CF_MAXVARSIZE - strlen(classbuf), "_%d", minor); + EvalContextClassPutHard(ctx, classbuf, "inventory,attribute_name=none,source=agent"); + } + Log(LOG_LEVEL_VERBOSE, "Discovered %s version %d.%d", vendor, major, minor); } else { - char strmajor[PRINTSIZE(major)], strminor[PRINTSIZE(minor)]; - if (strchr(release, '.')) - { - sscanf(release, "%*s %d.%d", &major, &minor); - sprintf(strmajor, "%d", major); - sprintf(strminor, "%d", minor); - - if (major != -1 && minor != -1) - { - strcpy(classbuf, "SUSE"); - EvalContextClassPutHard(ctx, classbuf, "inventory,attribute_name=none,source=agent"); - strcat(classbuf, "_"); - strcat(classbuf, strmajor); - SetFlavour(ctx, classbuf); - strcat(classbuf, "_"); - strcat(classbuf, strminor); - EvalContextClassPutHard(ctx, classbuf, "inventory,attribute_name=none,source=agent"); - - /* The correct spelling for SUSE is "SUSE" but CFEngine used to use "SuSE". - * Keep this for backwards compatibility until CFEngine 3.7 - */ - strcpy(classbuf, "SuSE"); - EvalContextClassPutHard(ctx, classbuf, "inventory,attribute_name=none,source=agent"); - strcat(classbuf, "_"); - strcat(classbuf, strmajor); - EvalContextClassPutHard(ctx, classbuf, "inventory,attribute_name=none,source=agent"); - strcat(classbuf, "_"); - strcat(classbuf, strminor); - EvalContextClassPutHard(ctx, classbuf, "inventory,attribute_name=none,source=agent"); - - Log(LOG_LEVEL_VERBOSE, "Discovered SUSE version %s", classbuf); - return 0; - } - } - else - { - sscanf(strversion, "VERSION = %s", strmajor); - sscanf(strpatch, "PATCHLEVEL = %s", strminor); - - if (major != -1 && minor != -1) - { - strcpy(classbuf, "SLES"); - EvalContextClassPutHard(ctx, classbuf, "inventory,attribute_name=none,source=agent"); - strcat(classbuf, "_"); - strcat(classbuf, strmajor); - EvalContextClassPutHard(ctx, classbuf, "inventory,attribute_name=none,source=agent"); - strcat(classbuf, "_"); - strcat(classbuf, strminor); - EvalContextClassPutHard(ctx, classbuf, "inventory,attribute_name=none,source=agent"); - - snprintf(classbuf, CF_MAXVARSIZE, "SUSE_%d", major); - SetFlavour(ctx, classbuf); - - /* The correct spelling for SUSE is "SUSE" but CFEngine used to use "SuSE". - * Keep this for backwards compatibility until CFEngine 3.7 - */ - snprintf(classbuf, CF_MAXVARSIZE, "SuSE_%d", major); - EvalContextClassPutHard(ctx, classbuf, "source=agent"); - - Log(LOG_LEVEL_VERBOSE, "Discovered SUSE version %s", classbuf); - return 0; - } - } + Log(LOG_LEVEL_VERBOSE, "Could not find a numeric OS release in %s", SUSE_REL_FILENAME); } - Log(LOG_LEVEL_VERBOSE, "Could not find a numeric OS release in %s", SUSE_REL_FILENAME); - return 0; } -- 1.8.4.5 ++++++ cf-execd.service ++++++ --- /var/tmp/diff_new_pack.3Qbnkf/_old 2014-04-17 14:08:02.000000000 +0200 +++ /var/tmp/diff_new_pack.3Qbnkf/_new 2014-04-17 14:08:02.000000000 +0200 @@ -3,6 +3,7 @@ After=syslog.target [Service] +Type=forking ExecStart=/usr/sbin/cf-execd [Install] ++++++ cf-monitord.service ++++++ --- /var/tmp/diff_new_pack.3Qbnkf/_old 2014-04-17 14:08:02.000000000 +0200 +++ /var/tmp/diff_new_pack.3Qbnkf/_new 2014-04-17 14:08:02.000000000 +0200 @@ -3,6 +3,7 @@ After=syslog.target [Service] +Type=forking ExecStart=/usr/sbin/cf-monitord [Install] ++++++ cf-serverd.service ++++++ --- /var/tmp/diff_new_pack.3Qbnkf/_old 2014-04-17 14:08:02.000000000 +0200 +++ /var/tmp/diff_new_pack.3Qbnkf/_new 2014-04-17 14:08:02.000000000 +0200 @@ -3,6 +3,7 @@ After=syslog.target [Service] +Type=forking ExecStart=/usr/sbin/cf-serverd [Install] ++++++ cfengine.SuSEfirewall2 ++++++ ## Name: CFEngine server ## Description: opens ports for CFEngine server in order to be used as a policy hub # space separated list of allowed ports TCP="5308" ++++++ drop-revision.patch ++++++ diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-core-3.6rc/configure.ac ./configure.ac --- ../orig-core-3.6rc/configure.ac 2014-04-10 14:27:57.000000000 +0200 +++ ./configure.ac 2014-04-11 09:30:17.105777237 +0200 @@ -25,7 +25,7 @@ dnl _AM_SET_OPTION([tar-ustar]) -AM_INIT_AUTOMAKE(cfengine, 3.6.0rc.revision) +AM_INIT_AUTOMAKE(cfengine, 3.6.0rc) AM_MAINTAINER_MODE([enable]) AC_DEFINE(BUILD_YEAR, esyscmd([date +%Y | tr -d '\n']), "Software build year") -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit booth for openSUSE:Factory
by root＠hilbert.suse.de 17 Apr '14

17 Apr '14

Hello community, here is the log from the commit of package booth for openSUSE:Factory checked in at 2014-04-17 14:07:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/booth (Old) and /work/SRC/openSUSE:Factory/.booth.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "booth" Changes: -------- --- /work/SRC/openSUSE:Factory/booth/booth.changes 2014-03-04 13:20:36.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.booth.new/booth.changes 2014-04-17 14:07:50.000000000 +0200 @@ -1,0 +2,35 @@ +Mon Apr 7 15:04:43 UTC 2014 - dmuhamedagic(a)suse.com + +- init script is not needed in this package (bnc#872063) +- upstream version: 60de8d + +------------------------------------------------------------------- +Wed Apr 2 12:18:43 UTC 2014 - dmuhamedagic(a)suse.com + +- fix building manpages + +------------------------------------------------------------------- +Wed Apr 2 10:11:34 UTC 2014 - dmuhamedagic(a)suse.com + +- fix format related warnings + +------------------------------------------------------------------- +Mon Mar 31 17:13:12 CET 2014 - philipp.marek(a)linbit.com + +- Small fine-tuning changes + +------------------------------------------------------------------- +Thu Mar 27 14:45:31 CET 2014 - philipp.marek(a)linbit.com + +- Rewrite, using Raft instead of Paxos. +- Version 0.2.0 + +------------------------------------------------------------------- +Wed Mar 5 10:31:42 CET 2014 - philipp.marek(a)linbit.com + +- Provided a script to check resource health +- Replaced "resource_monitor" functionality; now an external + script is called before the ticket is acquired/renewed. +- Version 0.1.7 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ booth.spec ++++++ --- /var/tmp/diff_new_pack.1bvFl6/_old 2014-04-17 14:07:51.000000000 +0200 +++ /var/tmp/diff_new_pack.1bvFl6/_new 2014-04-17 14:07:51.000000000 +0200 @@ -24,7 +24,6 @@ %define with_extra_warnings 0 %define with_debugging 0 %define without_fatal_warnings 1 -%define with_resource_monitor 1 %if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} %define pkg_group System Environment/Daemons %else @@ -38,23 +37,21 @@ Summary: The Booth Cluster Ticket Manager License: GPL-2.0+ Group: Productivity/Clustering/HA -Version: 0.1.6 +Version: 0.2.0 Release: 0 Source: booth.tar.bz2 Source1: %name-rpmlintrc BuildRoot: %{_tmppath}/%{name}-%{version}-build # 1.1.6-2 on SLES has latest ticket support Requires: pacemaker-ticket-support >= 2.0 +BuildRequires: asciidoc BuildRequires: autoconf BuildRequires: automake BuildRequires: glib2-devel BuildRequires: libglue-devel +BuildRequires: libpacemaker-devel BuildRequires: libxml2-devel BuildRequires: pkgconfig -%if %{with_resource_monitor} -BuildRequires: libpacemaker-devel -#pacemaker-libs-devel -%endif %description Booth manages the ticket which authorizes one of the cluster sites @@ -73,16 +70,12 @@ %build ./autogen.sh %configure \ -%if %{with_resource_monitor} - --enable-resource-monitor \ -%endif --with-initddir=%{_initrddir} make %install make DESTDIR=$RPM_BUILD_ROOT install docdir=%{_defaultdocdir}/%{name} -ln -s ../../etc/init.d/booth-arbitrator %{buildroot}/usr/sbin/rcbooth-arbitrator mkdir -p %{buildroot}/%{_mandir}/man8/ gzip < docs/boothd.8 > %{buildroot}/%{_mandir}/man8/booth.8.gz @@ -120,17 +113,14 @@ %defattr(-,root,root) %{_sbindir}/booth %{_sbindir}/boothd -%{_sbindir}/rcbooth-arbitrator -%if %{with_resource_monitor} -%{_sbindir}/booth_resource_monitord -%endif +%exclude %{_sbindir}/rcbooth-arbitrator %{_mandir}/man8/booth.8.gz %{_mandir}/man8/boothd.8.gz %dir /usr/lib/ocf %dir /usr/lib/ocf/resource.d %dir /usr/lib/ocf/resource.d/pacemaker %dir %{_sysconfdir}/booth -%{_initddir}/booth-arbitrator +%exclude %{_initddir}/booth-arbitrator /usr/lib/ocf/resource.d/pacemaker/booth-site %config %{_sysconfdir}/booth/booth.conf.example ++++++ booth.tar.bz2 ++++++ ++++ 16132 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 zip for openSUSE:13.1:Update
by root＠hilbert.suse.de 17 Apr '14

17 Apr '14

Hello community, here is the log from the commit of package zip for openSUSE:13.1:Update checked in at 2014-04-17 08:29:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/zip (Old) and /work/SRC/openSUSE:13.1:Update/.zip.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "zip" Changes: -------- New Changes file: NO CHANGES FILE!!! New: ---- _link ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ <link package='zip.2717' 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 sysconfig for openSUSE:13.1:Update
by root＠hilbert.suse.de 17 Apr '14

17 Apr '14

Hello community, here is the log from the commit of package sysconfig for openSUSE:13.1:Update checked in at 2014-04-17 08:29:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/sysconfig (Old) and /work/SRC/openSUSE:13.1:Update/.sysconfig.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sysconfig" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.ZQ2HNP/_old 2014-04-17 08:29:09.000000000 +0200 +++ /var/tmp/diff_new_pack.ZQ2HNP/_new 2014-04-17 08:29:09.000000000 +0200 @@ -1 +1 @@ -<link package='sysconfig.2699' cicount='copy' /> +<link package='sysconfig.2730' 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 kernel-firmware for openSUSE:13.1:Update
by root＠hilbert.suse.de 17 Apr '14

17 Apr '14

Hello community, here is the log from the commit of package kernel-firmware for openSUSE:13.1:Update checked in at 2014-04-17 08:28:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/kernel-firmware (Old) and /work/SRC/openSUSE:13.1:Update/.kernel-firmware.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kernel-firmware" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.iOkdjE/_old 2014-04-17 08:28:04.000000000 +0200 +++ /var/tmp/diff_new_pack.iOkdjE/_new 2014-04-17 08:28:04.000000000 +0200 @@ -1 +1 @@ -<link package='kernel-firmware.2419' cicount='copy' /> +<link package='kernel-firmware.2727' 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 bcache-tools for openSUSE:13.1:Update
by root＠hilbert.suse.de 16 Apr '14

16 Apr '14

Hello community, here is the log from the commit of package bcache-tools for openSUSE:13.1:Update checked in at 2014-04-16 09:20:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/bcache-tools (Old) and /work/SRC/openSUSE:13.1:Update/.bcache-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "bcache-tools" Changes: -------- New Changes file: NO CHANGES FILE!!! New: ---- _link ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ <link package='bcache-tools.2725' 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 lvm2 for openSUSE:13.1:Update
by root＠hilbert.suse.de 16 Apr '14

16 Apr '14

Hello community, here is the log from the commit of package lvm2 for openSUSE:13.1:Update checked in at 2014-04-16 09:18:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/lvm2 (Old) and /work/SRC/openSUSE:13.1:Update/.lvm2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lvm2" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.XnmmQC/_old 2014-04-16 09:18:56.000000000 +0200 +++ /var/tmp/diff_new_pack.XnmmQC/_new 2014-04-16 09:18:56.000000000 +0200 @@ -1 +1 @@ -<link package='lvm2.2466' cicount='copy' /> +<link package='lvm2.2722' 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 yast2-slide-show for openSUSE:Factory
by root＠hilbert.suse.de 16 Apr '14

16 Apr '14

Hello community, here is the log from the commit of package yast2-slide-show for openSUSE:Factory checked in at 2014-04-16 07:45:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-slide-show (Old) and /work/SRC/openSUSE:Factory/.yast2-slide-show.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-slide-show" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-slide-show/yast2-slide-show.changes 2013-11-19 10:57:12.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-slide-show.new/yast2-slide-show.changes 2014-04-16 07:45:59.000000000 +0200 @@ -1,0 +2,18 @@ +Tue Apr 15 13:39:29 UTC 2014 - ke(a)suse.de + +- Add more SLES images. +- Use SLES contents for SLED, too. + +------------------------------------------------------------------- +Tue Apr 15 09:13:27 UTC 2014 - ke(a)suse.de + +- Add SLES test images. +- 3.1.2 + +------------------------------------------------------------------- +Mon Apr 14 14:20:32 UTC 2014 - ke(a)suse.de + +- Enable SLES; use contents provided by mge. +- 3.1.1 + +------------------------------------------------------------------- Old: ---- yast2-slide-show-3.1.0.tar.bz2 New: ---- yast2-slide-show-3.1.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-slide-show.spec ++++++ --- /var/tmp/diff_new_pack.k1HtmW/_old 2014-04-16 07:46:00.000000000 +0200 +++ /var/tmp/diff_new_pack.k1HtmW/_new 2014-04-16 07:46:00.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package yast2-slide-show # -# 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,19 +17,20 @@ Name: yast2-slide-show -Version: 3.1.0 +Version: 3.1.3 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 # xml2po uses temporary files that do not like being called twice +# xml2po probably is not thread-safe. %define jobs 1 BuildRequires: docbook_4 BuildRequires: gnome-doc-utils BuildRequires: pkgconfig BuildRequires: sgml-skel -BuildRequires: yast2-devtools >= 3.0.6 +BuildRequires: yast2-devtools >= 3.1.10 %if 0%{?suse_version} > 1120 # was in gnome-doc-utils before BuildRequires: xml2po @@ -42,28 +43,28 @@ Source12: slideshow-sled-po.tar.gz %description -The slide show displayed during package installation with YaST2. +The slide show displayed during package installation with YaST. %package SuSELinux -Summary: YaST2 - Slide Show (openSUSE) +Summary: YaST - Slide Show (openSUSE) Group: Metapackages %description SuSELinux -The slide show displayed during package installation with YaST2. +The slide show displayed during package installation with YaST. %package SLES -Summary: YaST2 - Slide Show (SUSE Linux Enterprise Server) +Summary: YaST - Slide Show (SUSE Linux Enterprise Server) Group: Metapackages %description SLES -The slide show displayed during package installation with YaST2. +The slide show displayed during package installation with YaST. %package SLED -Summary: YaST2 - Slide Show (SUSE Linux Enterprise Desktop) +Summary: YaST - Slide Show (SUSE Linux Enterprise Desktop) Group: Metapackages %description SLED -The slide show displayed during package installation with YaST2. +The slide show displayed during package installation with YaST. %prep %setup -n %{name}-%{version} @@ -77,6 +78,12 @@ tar xf %{S:12} langs=$(tar tf %{S:12}|sed 's=.*po/==;s=\.po$==;/^$/d'|sort -u|fmt -w1000) sed -i "s|^langs *=.*$|langs = en $langs|" Makefile.am +popd + +pushd SLES +tar xf %{S:12} +langs=$(tar tf %{S:12}|sed 's=.*po/==;s=\.po$==;/^$/d'|sort -u|fmt -w1000) +sed -i "s|^langs *=.*$|langs = en $langs|" Makefile.am popd %build ++++++ yast2-slide-show-3.1.0.tar.bz2 -> yast2-slide-show-3.1.3.tar.bz2 ++++++ Files old/yast2-slide-show-3.1.0/SLED/pic/01_welcome.png and new/yast2-slide-show-3.1.3/SLED/pic/01_welcome.png differ Files old/yast2-slide-show-3.1.0/SLED/pic/02_cont_running_sys.png and new/yast2-slide-show-3.1.3/SLED/pic/02_cont_running_sys.png differ Files old/yast2-slide-show-3.1.0/SLED/pic/02_innovation.png and new/yast2-slide-show-3.1.3/SLED/pic/02_innovation.png differ Files old/yast2-slide-show-3.1.0/SLED/pic/03_best_managed_linux.png and new/yast2-slide-show-3.1.3/SLED/pic/03_best_managed_linux.png differ Files old/yast2-slide-show-3.1.0/SLED/pic/03_connect.png and new/yast2-slide-show-3.1.3/SLED/pic/03_connect.png differ Files old/yast2-slide-show-3.1.0/SLED/pic/04_cloud.png and new/yast2-slide-show-3.1.3/SLED/pic/04_cloud.png differ Files old/yast2-slide-show-3.1.0/SLED/pic/04_office.png and new/yast2-slide-show-3.1.3/SLED/pic/04_office.png differ Files old/yast2-slide-show-3.1.0/SLED/pic/05_inter_os.png and new/yast2-slide-show-3.1.3/SLED/pic/05_inter_os.png differ Files old/yast2-slide-show-3.1.0/SLED/pic/05_music.png and new/yast2-slide-show-3.1.3/SLED/pic/05_music.png differ Files old/yast2-slide-show-3.1.0/SLED/pic/06_graphics.png and new/yast2-slide-show-3.1.3/SLED/pic/06_graphics.png differ Files old/yast2-slide-show-3.1.0/SLED/pic/06_modular.png and new/yast2-slide-show-3.1.3/SLED/pic/06_modular.png differ Files old/yast2-slide-show-3.1.0/SLED/pic/07_greenIT.png and new/yast2-slide-show-3.1.3/SLED/pic/07_greenIT.png differ Files old/yast2-slide-show-3.1.0/SLED/pic/07_life.png and new/yast2-slide-show-3.1.3/SLED/pic/07_life.png differ Files old/yast2-slide-show-3.1.0/SLED/pic/08_desktop.png and new/yast2-slide-show-3.1.3/SLED/pic/08_desktop.png differ Files old/yast2-slide-show-3.1.0/SLED/pic/08_security.png and new/yast2-slide-show-3.1.3/SLED/pic/08_security.png differ Files old/yast2-slide-show-3.1.0/SLED/pic/09_openSUSE.png and new/yast2-slide-show-3.1.3/SLED/pic/09_openSUSE.png differ Files old/yast2-slide-show-3.1.0/SLED/pic/09_scc.png and new/yast2-slide-show-3.1.3/SLED/pic/09_scc.png differ Files old/yast2-slide-show-3.1.0/SLED/pic/10_easy-management.png and new/yast2-slide-show-3.1.3/SLED/pic/10_easy-management.png differ Files old/yast2-slide-show-3.1.0/SLED/pic/10_more.png and new/yast2-slide-show-3.1.3/SLED/pic/10_more.png differ Files old/yast2-slide-show-3.1.0/SLED/pic/11_hardware.png and new/yast2-slide-show-3.1.3/SLED/pic/11_hardware.png differ Files old/yast2-slide-show-3.1.0/SLED/pic/12_interoperability.png and new/yast2-slide-show-3.1.3/SLED/pic/12_interoperability.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slide-show-3.1.0/SLED/slideshow.xml new/yast2-slide-show-3.1.3/SLED/slideshow.xml --- old/yast2-slide-show-3.1.0/SLED/slideshow.xml 2013-11-18 18:10:10.000000000 +0100 +++ new/yast2-slide-show-3.1.3/SLED/slideshow.xml 2014-04-15 15:52:37.000000000 +0200 @@ -5,6 +5,9 @@ <!ENTITY suselinux "&suse; Linux"> <!ENTITY opensuse "openSUSE"> <!ENTITY suse-version "11.1"> +<!ENTITY sle "&suselinux; Enterprise"> +<!ENTITY sls "&sle; Server"> +<!ENTITY sld "&sle; Desktop"> ]>   @@ -13,264 +16,356 @@ <section> <title>Slide Show</title> + + <section label="01_sle12"> + <title>&sle; 12</title> + <itemizedlist> + <listitem> + <para> + Continuously Running Systems + </para> + </listitem> + <listitem> + <para> + Best Managed Linux + </para> + </listitem> + <listitem> + <para> + Made for Cloud + </para> + </listitem> + <listitem> + <para> + Most Interoperable Operating System + </para> + </listitem> + <listitem> + <para> + Modular Design + </para> + </listitem> + </itemizedlist> + </section> -<section label="01_welcome"> - <title>Welcome to SUSE Linux Enterprise Desktop</title> - -<para>SUSE Linux Enterprise Desktop is the industry's leading -enterprise-quality Linux operating system that is optimized and ready -for both, business and personal use. SUSE Linux Enterprise Desktop -provides market-leading usability, seamless interoperability with -existing enterprise computer systems, and dozens of essential office -applications that enable businesses to use Linux and open source with -confidence. Designed for general-purpose use, SUSE Linux Enterprise -Desktop can also be tailored to fit fixed-function or special-purpose -roles such as on technical workstations, kiosks, and thin clients.</para> -</section> -<section label="02_innovation"> - <title>The Latest Desktop Innovations</title> - -<para>Novell's leadership in desktop innovation is unparalleled. Combining -results from extensive and ongoing usability studies with an outstanding -technology vision, Novell introduces SUSE Linux Enterprise Desktop 11 as -the most integrated and powerful Linux desktop. SUSE Linux Enterprise -Desktop can be installed on a wide range of client devices including -desktops, notebooks, netbooks, nettops, workstations, and more and -includes all the applications you need to be productive at work -or home.</para> - -<para>Novell's sponsorship and industry leadership in key open source -projects such as the Linux kernel, OpenOffice.org, GNOME, Evolution, -NetworkManager, Banshee, Mono, Compiz, F-Spot, Beagle, and many others -illustrate Novell's unmatched innovation in the Linux desktop.</para> - -</section> -<section label="03_connect"> - <title>Connect and Communicate</title> - - <para>SUSE Linux Enterprise Desktop 11 provides all the tools you need - to communicate with the world.</para> - - <para>The Firefox Web browser is the best Web browser in the market. It - boasts a complete set of browser features and lightning-fast performance - out of the box, and delivers a rich user experience through plug-ins - such as Java, Novell Moonlight, Adobe Acrobat Reader, and Adobe - Flash Player, which are all included in SUSE Linux Enterprise Desktop - 11.</para> - - <para>Novell Evolution is a complete collaboration client suite - supporting collaboration open standards. It includes Novell GroupWise - and Microsoft Exchange connectivity for messaging, contact management, - calendaring and task management.</para> - - <para>SUSE Linux Enterprise Desktop also includes an instant messaging - client that lets you connect with people all over the world.</para> - - <para>So to always have you online NetworkManager, our easy-to-use - network configuration tool can access the most complex and secured - networks, including WEP, WPA, VPN and other technologies, or simply - the open wireless network from your coffee shop, and makes sure to keep - you connected to the Internet no matter where you are.</para> - -</section> -<section label="04_office"> - <title>Spreadsheets, Presentations, Text Documents and More</title> - <para>SUSE Linux Enterprise Desktop comes complete with the latest - version of the leading open source office productivity suite, - OpenOffice.org. OpenOffice.org Novell Edition comes with word - processing, spreadsheet, presentation, database, and drawing - applications.</para> - -<para>As the leading alternative to Microsoft Office, OpenOffice.org -Novell Edition fully supports the latest open document format standards, -the widest range of Microsoft Office file formats and many others.</para> - -<para>OpenOffice.org Novell Edition also provides enhanced VBA macro -support, an improved Solver, and pivot table capability. To spice up all -your presentations, OpenOffice.org Novell Edition has great new slide -transitions that nicely blend with our desktop effects.</para> - -</section> -<section label="05_music"> - <title>Banshee: Manage your Media Library</title> - -<para>Novell is proud to sponsor the open source Banshee project, -the easy-to-use and beautifully polished media management application. -Listen to music, manage your music library, burn your own music CDs, or -synchronize your music to your portable media player or smartphone to -be able to listen to your music on-the-go. Banshee also gives you the ability -to subscribe to a variety of sources, including streamed music and -podcasts.</para> - -<para>To ensure the highest quality recordings and playback, Novell -developed its own state of the art Advanced Audio Coding (AAC) encoder -and decoder.</para> - -<para>New to SUSE Linux Enterprise Desktop 11, Banshee enables you to -include videos into your media library, effortlessly letting you get -entertained and up-to-date with video podcasts directly from your Linux -desktop. Synchronize video podcasts to your portable media player for -viewing on-the-go.</para> - -<para>Discover new music through the use of greatly integrated Web -services like Last.fm radio.</para> - -</section> -<section label="06_graphics"> - <title>Photos, Images, Drawings, Graphics</title> - -<para>Our Photo management tool in SUSE Linux Enterprise Desktop could -very well be the most user-friendly one ever invented. Recognizing -virtually all digital cameras and photo storage devices automatically, -F-Spot will let you import and manage all your -photos in very few clicks. It keeps an original copy of your photos, allowing you to be -creative and try all kinds of modifications while making sure you never -lose any of those precious snapshots again. Uploading pictures to the -Internet has never been easier. Whether it is for printing or for your -friends and family to enjoy, your photos are just 1-click away.</para> - -<para>For advanced image manipulation and graphics creation, the -open-source community created GIMP. It is a fantastic and a complete -photo retouching, image composition and image authoring application. GIMP -has enough features to satisfy the most exacting artist.</para> - -<para>Wondering about advanced vector graphics? Then Inkscape is the right graphical software for -you. It is a versatile graphics solution using the W3C standard Scalable -Vector Graphics (SVG) file format. Inkscape natively supports opening -or importing SVG, SVGZ (gzipped SVG), PDF, and AI (Adobe Illustrator) -formats.</para> - -</section> -<section label="07_greenIT"> - <title>Linux Helps Reduce Your Carbon Footprint</title> - -<para>We are concerned about the environment. Whether you are a mobile -worker or desktop user, SUSE Linux Enterprise Desktop reduces your -power consumption without impacting your productivity in any way. With -increasing reliability, the system will maximize energy saving and will -even let you track it.</para> - -<para>Now with effective power management on the processor, chipsets, -platform and operating system level, Novell and its partners optimize -power consumption in order to provide you with the longest possible -battery life.</para> - -<para>Novell works with its hardware manufacturing partners to ensure -that their systems installed with SUSE Linux Enterprise Desktop earn -the ENERGY STAR qualification.</para> - -<para>By seamlessly providing remote desktop access, Novell aims to -promote more electronic collaboration and even reduce your need for -travel.</para> - -</section> -<section label="08_security"> - <title>Keep Your System Secure and Up-to-Date</title> - - <para>When your system is connected to the Internet, you will be happy - to know that we enabled the SUSE Linux Firewall to help secure - your system and data from intruders. We also included AppArmor, - the most effective and easy-to-use Linux application security system - available. It proactively protects the operating system and applications - from external or internal threats.</para> - - -<para>In SUSE Linux Enterprise Desktop 11, we have introduced a new -granular privilege system PolicyKit that greatly improves the ability -for users and applications to be granted access to privileged operations -when needed. Furthermore, we have improved wireless and wired -network security connectivity and data encryption capabilities.</para> - -<para>Novell is dedicated to promptly provide its users with the latest -security updates. To ensure that the latest security patches are installed -on your system, Novell provides a comprehensive resource management -solution that allows you to stay up-to-date with all security updates.</para> - -</section> - <section label="09_openSUSE"> - <title>openSUSE.org</title> + <section label="02_cont_running_sys"> + <title>Continuously Running Systems</title> + <para> + Snapshot & rollback for the full system + </para> + <para> + Have a well <emphasis>known state</emphasis> to which you can go + back, to give you <emphasis>peace of mind</emphasis> for: + </para> + <itemizedlist> + <listitem> + <para> + Kernel upgrades + </para> + </listitem> + <listitem> + <para> + Service pack installations + </para> + </listitem> + </itemizedlist> + </section> - <para>The openSUSE project is a worldwide community program sponsored by - Novell that promotes the use of Linux everywhere. Please visit opensuse.org - where you can find and join a community of users and developers who all have - the same goal in mind: to create and distribute the world's most usable - Linux distribution. openSUSE provides the base of our award-winning SUSE Linux - Enterprise products.</para> - - <para>The openSUSE Build Service is an open and complete distribution - development platform that provides a transparent infrastructure for - development of the openSUSE distribution. With the openSUSE Build Service, - you can easily find the latest open source packages you are looking for. It - provides a bridge between developers and users with feedback and rating - functionality. For developers it is an efficient place to build up groups and - work together through its project model.</para> - - <para>Zypp is our software management engine and open source project that - powers products like YaST, Zypper and ZENworks with a powerful dependency - resolver and a convenient package management API.</para> + <section label="03_best_managed_linux"> + <title>Best Managed Linux</title> + <itemizedlist> + <listitem> + <para> + <emphasis>YaST:</emphasis> the only integrated single system + management solution in the Linux world + </para> + <itemizedlist> + <listitem> + <para> + Write your own extensions in Ruby now! + </para> + </listitem> + </itemizedlist> + </listitem> + <listitem> + <para> + Wicked: a new framework for simplifying the complexity of Linux + network management + </para> + <itemizedlist> + <listitem> + <para> + Network configuration as a service + </para> + </listitem> + <listitem> + <para> + Smooth adoption & migration + </para> + </listitem> + </itemizedlist> + </listitem> + </itemizedlist> </section> + <section label="04_cloud"> + <title>Made for Cloud</title> + <itemizedlist> + <listitem> + <para> + Reliable Host + </para> + <itemizedlist> + <listitem> + <para> + KVM and Xen support included </para> + </listitem> + <listitem> + <para> + Basis for OpenStack-based SUSE® Cloud + </para> + </listitem> + </itemizedlist> + </listitem> + <listitem> + <para> + Perfect Guest + </para> + <itemizedlist> + <listitem> + <para> + Works well on mainstream hypervisors: Xen, KVM, VMware® vSphere, + Microsoft® Hyper-V etc. + </para> + </listitem> + <listitem> + <para> + Available on Amazon® EC2, Microsoft® Azure, Google® Compute + Engine, and other 50+ public clouds + </para> + </listitem> + </itemizedlist> + </listitem> + </itemizedlist> + </section> + <section label="05_inter_os"> + <title>Most Interoperable Operating System</title> -<section label="10_easy-management"> - <title>Easy to Deploy and Manage</title> + <itemizedlist> + <listitem> + <para> + Networking – IPv6 + </para> + <itemizedlist> + <listitem> + <para> + Scalable network infrastructures + </para> + </listitem> + <listitem> + <para> + Compliant to USGv6 standard + </para> + </listitem> + </itemizedlist> + </listitem> + <listitem> + <para> + Operating Systems + </para> + <itemizedlist> + <listitem> + <para> + Windows: Samba 4 + </para> + <itemizedlist> + <listitem> + <para> + Active Directory integration + </para> + </listitem> + <listitem> + <para> + Out-of-the-box experience via YaST + </para> + </listitem> + </itemizedlist> + </listitem> + <listitem> + <para> + UNIX & Linux: NFSv4.1 + </para> + </listitem> + </itemizedlist> + </listitem> + </itemizedlist> + </section> -<para>SUSE Linux Enterprise supports many deployment strategies -providing system administrators flexible ways to customize and tailor -the distribution to their needs.</para> - -<para>AutoYaST is an integrated solution for installing one or more systems -automatically without user intervention. Installations are performed -using a control file with installation and configuration data.</para> - -<para>The openSUSE KIWI imaging system provides a complete operating -system image solution for supported hardware platforms as well as -virtualization systems.</para> - -<para>With these solutions combined with several key open source projects -such as GConf, PolicyKit and Firstboot, SUSE Linux Enterprise Desktop -is the easiest Linux desktop to deploy and manage.</para> + <section label="06_modular"> + <title>Modular Design</title> -</section> -<section label="11_hardware"> - <title>Certified for SUSE Linux Enterprise Desktop</title> + <para> + Five different modules give you balance between the latest + technologies and enterprise-level stability: + </para> + <itemizedlist> + <listitem> + <para> + Web and Scripting Module + </para> + </listitem> + <listitem> + <para> + Legacy Module + </para> + </listitem> + <listitem> + <para> + Toolchain Module + </para> + </listitem> + <listitem> + <para> + Public Cloud Module + </para> + </listitem> + <listitem> + <para> + … Module + </para> + </listitem> + </itemizedlist> + </section> + + <section label="07_life"> + <title>Lifecycle and LTSS</title> + + <para> + SUSE® Linux Enterprise Server: + </para> + <itemizedlist> + <listitem> + <para> + 13-year lifecycle + </para> + <itemizedlist> + <listitem> + <para> + 10 years of general support + </para> + </listitem> + <listitem> + <para> + Up to 3 years of extended support + </para> + </listitem> + </itemizedlist> + </listitem> + <listitem> + <para> + 5-year lifecycle per Service Pack + </para> + <itemizedlist> + <listitem> + <para> + 2 years of general support + </para> + </listitem> + <listitem> + <para> + Up to 3 years of extended support + </para> + </listitem> + </itemizedlist> + </listitem> + <listitem> + <para> + Long Term Service Pack Support (LTSS) available for all releases + </para> + </listitem> + </itemizedlist> + </section> + <section label="08_desktop"> + <title>Desktop Experience</title> -<para>By successfully completing stringent compatibility testing -requirements, Novell's partners qualify their systems for SUSE Linux -Enterprise Desktop certification.</para> - -<para>With a system certified for SUSE Linux Enterprise Desktop you can -trustfully use our software to manage your media library, collaborate -on projects and stay connected with your friends.</para> - -<para>You can find all the systems that have passed logo certification -by visiting novell.com/desktop. Systems with certification fully take -advantage of SUSE Linux Enterprise Desktop to deliver rich Internet -experience, ease of use, and excellent performance.</para> - -<para>Novell is pleased to also be part of the Linux Driver Project -focused on working with manufacturers to create and maintain open source -Linux kernel drivers for all types of devices. Timely hardware enablement -for desktop components is achieved by porting drivers to the Linux kernel -that powers SUSE Linux Enterprise.</para> + <para> + GNOME 3 as the desktop environment for SUSE® Linux Enterprise 12 + provides two desktop experiences for you to chose from: + </para> + <itemizedlist> + <listitem> + <para> + Using GNOME 3's GNOME Shell you can explore next-generation desktop + features that can be used with a mouse and a touchscreen. + </para> + </listitem> + <listitem> + <para> + SUSE's default GNOME 3 Classic Mode utilizes the same modern + technology, while maintaining well known usage patterns. + </para> + </listitem> + </itemizedlist> + </section> -</section> -<section label="12_interoperability"> - <title>Interoperability: Work with Everyone</title> + <section label="09_scc"> + <title>SUSE Customer Center</title> -<para>SUSE Linux Enterprise Desktop is designed with today's heterogeneous -world in mind. It is fully capable to seamlessly integrate into existing -Windows file and print environments. In addition, it plugs into existing -Microsoft Active Directory and Novell eDirectory environments. With -its broad use of open standards, SUSE Linux Enterprise Desktop enables -you to share information across any IT system so that you can easily -communicate with all users around you.</para> - -<para>OpenOffice.org Novell Edition works with the widest range of -document formats including Open Document Format, Microsoft Office formats -(including OO XML), Works, WordPerfect and others.</para> - -<para>Furthermore, SUSE Linux Enterprise Desktop provides accessibility features -so that anyone can take advantage of the improved productivity and lower -cost that a Linux desktop provides.</para> + <para> + Discover a new way of managing your SUSE account and subscriptions + via one interface, anytime, anywhere! + </para> + <itemizedlist> + <listitem> + <para> + Centralize access to subscriptions and entitlements + </para> + </listitem> + <listitem> + <para> + Quick access to support tools + </para> + </listitem> + <listitem> + <para> + Easy way to provide feedback + </para> + </listitem> + </itemizedlist> + </section> + <section label="10_more"> + <title>More from SUSE ...</title> + <itemizedlist> + <listitem> + <para> + SUSE Linux Enterprise + </para> + </listitem> + <listitem> + <para> + High Availability Extension + </para> + </listitem> + <listitem> + <para> + SUSE Manager + </para> + </listitem> + <listitem> + <para> + SUSE Cloud + </para> + </listitem> + <listitem> + <para> + SUSE Storage + </para> + </listitem> + <listitem> + <para> + More + </para> + </listitem> + </itemizedlist> </section> </section> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slide-show-3.1.0/SLES/Makefile.am new/yast2-slide-show-3.1.3/SLES/Makefile.am --- old/yast2-slide-show-3.1.0/SLES/Makefile.am 2013-11-18 18:10:10.000000000 +0100 +++ new/yast2-slide-show-3.1.3/SLES/Makefile.am 2014-04-15 15:52:37.000000000 +0200 @@ -1,16 +1,93 @@ # -# Makefile.am for slide-show/slide +# Makefile.am for slide-show/SLED # -instdir = /SuSE/SuSE-SLES/CD1/suse/setup/slide +instdir = /SuSE/SuSE-SLES/CD1/suse/setup/slide -# note: txt/*/*.rtf does not work. you get a dir called "txt/*"! -EXTRA_DIST = pic/*.png \ - txt/cs/*.rtf \ - txt/de/*.rtf \ - txt/en/*.rtf +fname = slideshow +# list of languages available in SVN +# CAUTION: Czech is "cs", not "cz"! Use the LANG abbrev, not the country! +langs = +# list of languages ready for distribution _and_ installation +dist_langs = $(langs) +# take the files from txt/LL/*.rtf +# txt/*/*.rtf does not work. you get a dir called "txt/*"! +dist_lang_files = $(addprefix txt/,$(addsuffix /*.rtf,$(dist_langs))) + +EXTRA_DIST = \ + $(fname).xml $(xsl_styles) \ + $(pofiles) \ + pic/*.png \ + $(dist_lang_files) + +xml = $(addsuffix .xml,$(langs)) +rtf = $(xml:.xml=.rtf) +valid = $(xml:.xml=.valid) +# nochunk = $(xml:.xml=.nochunk) +#pofiles = $(xml:.xml=.po) +# po/LL.po +pofiles=$(addprefix po/,$(addsuffix .po,$(langs))) +xsl_styles = $(fname).xsl + +SUFFIXES = .xml .rtf .valid .po .pot + +CLEANFILES = $(rtf) $(valid) $(xml) $(fname).pot + +XSLTPROC = @XSLTPROC@ +XMLLINT = @XMLLINT@ +XML2PO = @XML2PO@ + +MSGMERGE_UPDATE = @MSGMERGE@ --update + +all: validate rtf + +outdir: + rm -fr txt + mkdir txt + +rtf: $(rtf) +%.rtf: %.xml outdir + ll=`echo $< | sed "s/\.xml$$//"`; \ + mkdir txt/$$ll ; \ + $(XSLTPROC) --nonet --stringparam out.dir "txt/$$ll" \ + $(fname).xsl $< 1>/dev/null; \ + pushd txt/$$ll ; \ + for f in *.rtf ; do \ + sed -i 's/\/>/>/;s/%imagedir%/\&imagedir;/' $$f; \ + done ; \ + popd + +validate: $(valid) +%.valid: %.xml + $(XMLLINT) --nonet --valid --noout $< && touch $@ + +pot: $(fname).pot +$(fname).pot: $(fname).xml + $(XMLLINT) --nonet --valid --noout $(fname).xml + $(XML2PO) --expand-all-entities -o $(fname).pot $(fname).xml + +# re-merge po translation files +po: $(pofiles) +$(pofiles): $(fname).pot + @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \ + echo "$(MSGMERGE_UPDATE) po/$${lang}.po $(fname).pot"; \ + if [ $${lang} = en ]; then \ + msgen -o po/$${lang}.po $(fname).pot ;\ + else $(MSGMERGE_UPDATE) po/$${lang}.po $(fname).pot ; fi + +xml: $(xml) +%.xml: po/%.po + @lang=`echo $@ | sed -e 's,.*/,,' -e 's,$(fname)_/,,' -e 's/\.xml$$//'`; \ + echo "$(XML2PO) -p po/$${lang}.po -o $${lang}.xml $(fname).pot"; \ + $(XML2PO) -p po/$${lang}.po -o $${lang}.xml $(fname).xml + +# rndir=$(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME) install-data-local: +# $(mkinstalldirs) $(rndir) +# for file in $(html); do \ +# $(INSTALL_DATA) $$file $(rndir) ; \ +# done mkdir -p $(DESTDIR)/$(instdir) -test -d $(srcdir)/txt && cp -a $(srcdir)/txt $(DESTDIR)/$(instdir) -test -d $(srcdir)/pic && cp -a $(srcdir)/pic $(DESTDIR)/$(instdir) Files old/yast2-slide-show-3.1.0/SLES/pic/01_welcome.png and new/yast2-slide-show-3.1.3/SLES/pic/01_welcome.png differ Files old/yast2-slide-show-3.1.0/SLES/pic/02_cont_running_sys.png and new/yast2-slide-show-3.1.3/SLES/pic/02_cont_running_sys.png differ Files old/yast2-slide-show-3.1.0/SLES/pic/02_platforms.png and new/yast2-slide-show-3.1.3/SLES/pic/02_platforms.png differ Files old/yast2-slide-show-3.1.0/SLES/pic/03_best_managed_linux.png and new/yast2-slide-show-3.1.3/SLES/pic/03_best_managed_linux.png differ Files old/yast2-slide-show-3.1.0/SLES/pic/03_ul.png and new/yast2-slide-show-3.1.3/SLES/pic/03_ul.png differ Files old/yast2-slide-show-3.1.0/SLES/pic/04_cloud.png and new/yast2-slide-show-3.1.3/SLES/pic/04_cloud.png differ Files old/yast2-slide-show-3.1.0/SLES/pic/04_maintenance.png and new/yast2-slide-show-3.1.3/SLES/pic/04_maintenance.png differ Files old/yast2-slide-show-3.1.0/SLES/pic/05_certification.png and new/yast2-slide-show-3.1.3/SLES/pic/05_certification.png differ Files old/yast2-slide-show-3.1.0/SLES/pic/05_inter_os.png and new/yast2-slide-show-3.1.3/SLES/pic/05_inter_os.png differ Files old/yast2-slide-show-3.1.0/SLES/pic/06_family.png and new/yast2-slide-show-3.1.3/SLES/pic/06_family.png differ Files old/yast2-slide-show-3.1.0/SLES/pic/06_modular.png and new/yast2-slide-show-3.1.3/SLES/pic/06_modular.png differ Files old/yast2-slide-show-3.1.0/SLES/pic/07_life.png and new/yast2-slide-show-3.1.3/SLES/pic/07_life.png differ Files old/yast2-slide-show-3.1.0/SLES/pic/07_oes.png and new/yast2-slide-show-3.1.3/SLES/pic/07_oes.png differ Files old/yast2-slide-show-3.1.0/SLES/pic/08_desktop.png and new/yast2-slide-show-3.1.3/SLES/pic/08_desktop.png differ Files old/yast2-slide-show-3.1.0/SLES/pic/08_firewall.png and new/yast2-slide-show-3.1.3/SLES/pic/08_firewall.png differ Files old/yast2-slide-show-3.1.0/SLES/pic/09_lotus.png and new/yast2-slide-show-3.1.3/SLES/pic/09_lotus.png differ Files old/yast2-slide-show-3.1.0/SLES/pic/09_scc.png and new/yast2-slide-show-3.1.3/SLES/pic/09_scc.png differ Files old/yast2-slide-show-3.1.0/SLES/pic/10_more.png and new/yast2-slide-show-3.1.3/SLES/pic/10_more.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slide-show-3.1.0/SLES/slideshow.xml new/yast2-slide-show-3.1.3/SLES/slideshow.xml --- old/yast2-slide-show-3.1.0/SLES/slideshow.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-slide-show-3.1.3/SLES/slideshow.xml 2014-04-15 15:52:37.000000000 +0200 @@ -0,0 +1,371 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ +<!ENTITY yast "YaST"> +<!ENTITY suse "SUSE"> +<!ENTITY suselinux "&suse; Linux"> +<!ENTITY opensuse "openSUSE"> +<!ENTITY suse-version "11.1"> +<!ENTITY sle "&suselinux; Enterprise"> +<!ENTITY sls "&sle; Server"> +<!ENTITY sld "&sle; Desktop"> +]> + + + + + +<section> + <title>Slide Show</title> + + <section label="01_sle12"> + <title>&sle; 12</title> + <itemizedlist> + <listitem> + <para> + Continuously Running Systems + </para> + </listitem> + <listitem> + <para> + Best Managed Linux + </para> + </listitem> + <listitem> + <para> + Made for Cloud + </para> + </listitem> + <listitem> + <para> + Most Interoperable Operating System + </para> + </listitem> + <listitem> + <para> + Modular Design + </para> + </listitem> + </itemizedlist> + </section> + + <section label="02_cont_running_sys"> + <title>Continuously Running Systems</title> + <para> + Snapshot & rollback for the full system + </para> + <para> + Have a well <emphasis>known state</emphasis> to which you can go + back, to give you <emphasis>peace of mind</emphasis> for: + </para> + <itemizedlist> + <listitem> + <para> + Kernel upgrades + </para> + </listitem> + <listitem> + <para> + Service pack installations + </para> + </listitem> + </itemizedlist> + </section> + + <section label="03_best_managed_linux"> + <title>Best Managed Linux</title> + <itemizedlist> + <listitem> + <para> + <emphasis>YaST:</emphasis> the only integrated single system + management solution in the Linux world + </para> + <itemizedlist> + <listitem> + <para> + Write your own extensions in Ruby now! + </para> + </listitem> + </itemizedlist> + </listitem> + <listitem> + <para> + Wicked: a new framework for simplifying the complexity of Linux + network management + </para> + <itemizedlist> + <listitem> + <para> + Network configuration as a service + </para> + </listitem> + <listitem> + <para> + Smooth adoption & migration + </para> + </listitem> + </itemizedlist> + </listitem> + </itemizedlist> + </section> + <section label="04_cloud"> + <title>Made for Cloud</title> + <itemizedlist> + <listitem> + <para> + Reliable Host + </para> + <itemizedlist> + <listitem> + <para> + KVM and Xen support included </para> + </listitem> + <listitem> + <para> + Basis for OpenStack-based SUSE® Cloud + </para> + </listitem> + </itemizedlist> + </listitem> + <listitem> + <para> + Perfect Guest + </para> + <itemizedlist> + <listitem> + <para> + Works well on mainstream hypervisors: Xen, KVM, VMware® vSphere, + Microsoft® Hyper-V etc. + </para> + </listitem> + <listitem> + <para> + Available on Amazon® EC2, Microsoft® Azure, Google® Compute + Engine, and other 50+ public clouds + </para> + </listitem> + </itemizedlist> + </listitem> + </itemizedlist> + </section> + <section label="05_inter_os"> + <title>Most Interoperable Operating System</title> + + <itemizedlist> + <listitem> + <para> + Networking – IPv6 + </para> + <itemizedlist> + <listitem> + <para> + Scalable network infrastructures + </para> + </listitem> + <listitem> + <para> + Compliant to USGv6 standard + </para> + </listitem> + </itemizedlist> + </listitem> + <listitem> + <para> + Operating Systems + </para> + <itemizedlist> + <listitem> + <para> + Windows: Samba 4 + </para> + <itemizedlist> + <listitem> + <para> + Active Directory integration + </para> + </listitem> + <listitem> + <para> + Out-of-the-box experience via YaST + </para> + </listitem> + </itemizedlist> + </listitem> + <listitem> + <para> + UNIX & Linux: NFSv4.1 + </para> + </listitem> + </itemizedlist> + </listitem> + </itemizedlist> + </section> + + <section label="06_modular"> + <title>Modular Design</title> + + <para> + Five different modules give you balance between the latest + technologies and enterprise-level stability: + </para> + <itemizedlist> + <listitem> + <para> + Web and Scripting Module + </para> + </listitem> + <listitem> + <para> + Legacy Module + </para> + </listitem> + <listitem> + <para> + Toolchain Module + </para> + </listitem> + <listitem> + <para> + Public Cloud Module + </para> + </listitem> + <listitem> + <para> + … Module + </para> + </listitem> + </itemizedlist> + </section> + + <section label="07_life"> + <title>Lifecycle and LTSS</title> + + <para> + SUSE® Linux Enterprise Server: + </para> + <itemizedlist> + <listitem> + <para> + 13-year lifecycle + </para> + <itemizedlist> + <listitem> + <para> + 10 years of general support + </para> + </listitem> + <listitem> + <para> + Up to 3 years of extended support + </para> + </listitem> + </itemizedlist> + </listitem> + <listitem> + <para> + 5-year lifecycle per Service Pack + </para> + <itemizedlist> + <listitem> + <para> + 2 years of general support + </para> + </listitem> + <listitem> + <para> + Up to 3 years of extended support + </para> + </listitem> + </itemizedlist> + </listitem> + <listitem> + <para> + Long Term Service Pack Support (LTSS) available for all releases + </para> + </listitem> + </itemizedlist> + </section> + <section label="08_desktop"> + <title>Desktop Experience</title> + + <para> + GNOME 3 as the desktop environment for SUSE® Linux Enterprise 12 + provides two desktop experiences for you to chose from: + </para> + <itemizedlist> + <listitem> + <para> + Using GNOME 3's GNOME Shell you can explore next-generation desktop + features that can be used with a mouse and a touchscreen. + </para> + </listitem> + <listitem> + <para> + SUSE's default GNOME 3 Classic Mode utilizes the same modern + technology, while maintaining well known usage patterns. + </para> + </listitem> + </itemizedlist> + </section> + + <section label="09_scc"> + <title>SUSE Customer Center</title> + + <para> + Discover a new way of managing your SUSE account and subscriptions + via one interface, anytime, anywhere! + </para> + <itemizedlist> + <listitem> + <para> + Centralize access to subscriptions and entitlements + </para> + </listitem> + <listitem> + <para> + Quick access to support tools + </para> + </listitem> + <listitem> + <para> + Easy way to provide feedback + </para> + </listitem> + </itemizedlist> + </section> + <section label="10_more"> + <title>More from SUSE ...</title> + + <itemizedlist> + <listitem> + <para> + SUSE Linux Enterprise + </para> + </listitem> + <listitem> + <para> + High Availability Extension + </para> + </listitem> + <listitem> + <para> + SUSE Manager + </para> + </listitem> + <listitem> + <para> + SUSE Cloud + </para> + </listitem> + <listitem> + <para> + SUSE Storage + </para> + </listitem> + <listitem> + <para> + More + </para> + </listitem> + </itemizedlist> + </section> +</section> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slide-show-3.1.0/SLES/slideshow.xsl new/yast2-slide-show-3.1.3/SLES/slideshow.xsl --- old/yast2-slide-show-3.1.0/SLES/slideshow.xsl 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-slide-show-3.1.3/SLES/slideshow.xsl 2014-04-15 15:52:37.000000000 +0200 @@ -0,0 +1,96 @@ +<?xml version='1.0'?> +<xsl:stylesheet + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" + xmlns:exsl="http://exslt.org/common" + extension-element-prefixes="exsl"> + +<xsl:output method="html" encoding = "UTF-8"/> +<xsl:param name="out.dir" select="'outdir'"/> + +<xsl:template match="section/section"> + <xsl:variable name="chunk.name" + select="@label"/> + <xsl:variable name="imgdir" + select="concat ($out.dir, '/', $chunk.name, '.rtf')"/> + + <xsl:choose> + <xsl:when test="element-available('exsl:document')"> + <exsl:document href = "{$imgdir}" + omit-xml-declaration = "yes" + method = "xml" + encoding = "UTF-8" + media-type = "print" + indent = "yes"> + <table> + <xsl:attribute name="cellspacing"> + <xsl:value-of select="'10'"/> + </xsl:attribute> + <xsl:attribute name="cellpadding"> + <xsl:value-of select="'5'"/> + </xsl:attribute> + + <tr> + <td> + <xsl:attribute name="valign"> + <xsl:value-of select="'top'"/> + </xsl:attribute> +  + <img> + <xsl:attribute name="src"> + <xsl:value-of select="concat('%imagedir%/', $chunk.name, '.png')"/> +</xsl:attribute> + + <xsl:attribute name="width"> + <xsl:value-of select="'150'"/> + </xsl:attribute> + <xsl:attribute name="valign"> + <xsl:value-of select="'top'"/> + </xsl:attribute> + +</img> + </td> + <td> + <xsl:apply-templates /> + </td> + </tr> + </table> + </exsl:document> + </xsl:when> + <xsl:otherwise> + <xsl:message>exsl missing</xsl:message> + </xsl:otherwise> + </xsl:choose> +</xsl:template> + +<xsl:template match="section/section/title"> + <h2> + <xsl:apply-templates /> + </h2> +</xsl:template> + +<xsl:template match="para"> + <p> + <xsl:apply-templates /> + </p> +</xsl:template> + +<xsl:template match="itemizedlist"> + <ul><xsl:apply-templates /></ul> +</xsl:template> +<xsl:template match="orderedlist"> + <ol><xsl:apply-templates /></ol> +</xsl:template> +<xsl:template match="listitem"> + <li><xsl:apply-templates /></li> +</xsl:template> +<xsl:template match="emphasis"> + <em><xsl:apply-templates /></em> +</xsl:template> + +</xsl:stylesheet> + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slide-show-3.1.0/VERSION new/yast2-slide-show-3.1.3/VERSION --- old/yast2-slide-show-3.1.0/VERSION 2013-11-18 18:10:10.000000000 +0100 +++ new/yast2-slide-show-3.1.3/VERSION 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -3.1.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slide-show-3.1.0/package/yast2-slide-show.changes new/yast2-slide-show-3.1.3/package/yast2-slide-show.changes --- old/yast2-slide-show-3.1.0/package/yast2-slide-show.changes 2013-11-18 18:10:10.000000000 +0100 +++ new/yast2-slide-show-3.1.3/package/yast2-slide-show.changes 2014-04-15 15:52:37.000000000 +0200 @@ -1,4 +1,22 @@ ------------------------------------------------------------------- +Tue Apr 15 13:39:29 UTC 2014 - ke(a)suse.de + +- Add more SLES images. +- Use SLES contents for SLED, too. + +------------------------------------------------------------------- +Tue Apr 15 09:13:27 UTC 2014 - ke(a)suse.de + +- Add SLES test images. +- 3.1.2 + +------------------------------------------------------------------- +Mon Apr 14 14:20:32 UTC 2014 - ke(a)suse.de + +- Enable SLES; use contents provided by mge. +- 3.1.1 + +------------------------------------------------------------------- Thu Sep 19 16:47:05 UTC 2013 - lslezak(a)suse.cz - do not use *.spec.in template, use *.spec file with RPM macros diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slide-show-3.1.0/package/yast2-slide-show.spec new/yast2-slide-show-3.1.3/package/yast2-slide-show.spec --- old/yast2-slide-show-3.1.0/package/yast2-slide-show.spec 2013-11-18 18:10:10.000000000 +0100 +++ new/yast2-slide-show-3.1.3/package/yast2-slide-show.spec 2014-04-15 15:52:37.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-slide-show -Version: 3.1.0 +Version: 3.1.3 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -25,12 +25,13 @@ # xml2po uses temporary files that do not like being called twice +# xml2po probably is not thread-safe. %define jobs 1 BuildRequires: docbook_4 BuildRequires: gnome-doc-utils BuildRequires: pkgconfig BuildRequires: sgml-skel -BuildRequires: yast2-devtools >= 3.0.6 +BuildRequires: yast2-devtools >= 3.1.10 %if 0%{?suse_version} > 1120 # was in gnome-doc-utils before BuildRequires: xml2po @@ -43,28 +44,28 @@ Source12: slideshow-sled-po.tar.gz %description -The slide show displayed during package installation with YaST2. +The slide show displayed during package installation with YaST. %package SuSELinux -Summary: YaST2 - Slide Show (openSUSE) +Summary: YaST - Slide Show (openSUSE) Group: Metapackages %description SuSELinux -The slide show displayed during package installation with YaST2. +The slide show displayed during package installation with YaST. %package SLES -Summary: YaST2 - Slide Show (SUSE Linux Enterprise Server) +Summary: YaST - Slide Show (SUSE Linux Enterprise Server) Group: Metapackages %description SLES -The slide show displayed during package installation with YaST2. +The slide show displayed during package installation with YaST. %package SLED -Summary: YaST2 - Slide Show (SUSE Linux Enterprise Desktop) +Summary: YaST - Slide Show (SUSE Linux Enterprise Desktop) Group: Metapackages %description SLED -The slide show displayed during package installation with YaST2. +The slide show displayed during package installation with YaST. %prep %setup -n %{name}-%{version} @@ -78,6 +79,12 @@ tar xf %{S:12} langs=$(tar tf %{S:12}|sed 's=.*po/==;s=\.po$==;/^$/d'|sort -u|fmt -w1000) sed -i "s|^langs *=.*$|langs = en $langs|" Makefile.am +popd + +pushd SLES +tar xf %{S:12} +langs=$(tar tf %{S:12}|sed 's=.*po/==;s=\.po$==;/^$/d'|sort -u|fmt -w1000) +sed -i "s|^langs *=.*$|langs = en $langs|" Makefile.am popd %build -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xen for openSUSE:Factory
by root＠hilbert.suse.de 16 Apr '14

16 Apr '14

Hello community, here is the log from the commit of package xen for openSUSE:Factory checked in at 2014-04-16 07:44:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xen (Old) and /work/SRC/openSUSE:Factory/.xen.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xen" Changes: -------- --- /work/SRC/openSUSE:Factory/xen/xen.changes 2014-03-15 17:36:00.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xen.new/xen.changes 2014-04-16 07:44:07.000000000 +0200 @@ -1,0 +2,70 @@ +Wed Apr 9 08:07:03 MDT 2014 - carnold(a)suse.com + +- Upstream patches from Jan + 53356c1e-x86-HVM-correct-CPUID-leaf-80000008-handling.patch + 533ad1ee-VMX-fix-PAT-value-seen-by-guest.patch + 533d413b-x86-mm-fix-checks-against-max_mapped_pfn.patch + +------------------------------------------------------------------- +Thu Apr 3 16:21:03 UTC 2014 - carnold(a)suse.com + +- bnc#862608 - SLES 11 SP3 vm-install should get RHEL 7 support + when released + 53206661-pygrub-support-linux16-and-initrd16.patch +- Upstream bug fixes + 53299d8f-xenconsole-reset-tty-on-failure.patch + 53299d8f-xenconsole-tolerate-tty-errors.patch + +------------------------------------------------------------------- +Thu Apr 3 16:21:03 UTC 2014 - dmueller(a)suse.com + +- fix build for armv7l and aarch64 + +------------------------------------------------------------------- +Thu Apr 3 15:40:31 CEST 2014 - ohering(a)suse.de + +- Remove compiletime strings from qemu-upstream + qemu-xen-upstream-megasas-buildtime.patch + +------------------------------------------------------------------- +Wed Apr 2 08:47:27 MDT 2014 - carnold(a)suse.com + +- bnc#871546 - KMPs are not signed in SUSE:SLE-12:GA? + xen.spec + +------------------------------------------------------------------- +Tue Apr 1 08:14:29 MDT 2014 - carnold(a)suse.com + +- Upstream patches from Jan + 532fff53-x86-fix-determination-of-bit-count-for-struct-domain-allocations.patch + 5331917d-x86-enforce-preemption-in-HVM_set_mem_access-p2m_set_mem_access.patch +- Drop xsa89.patch for upstream version (see bnc#867910, 5331917d-x86-enforce...) + +------------------------------------------------------------------- +Fri Mar 28 11:00:07 MDT 2014 - carnold(a)suse.com + +- bnc#863821 - Xen unable to boot paravirtualized VMs installed + with btrfs. Add 'Requires: grub2-x86_64-xen' to xen-tools. +- Restore soft links for qemu-system-i386 and qemu-dm +- Cleanup inconsistency in which version of qemu-system-i386 is + being used (Xen vs qemu-x86). Use only Xen's version. + xen.spec + +------------------------------------------------------------------- +Wed Mar 27 14:18:06 MDT 2014 - carnold(a)suse.com + +- Add conditionals for SLE12 when defining xend and max_cpus + xen.spec + +------------------------------------------------------------------- +Wed Mar 19 14:18:06 MDT 2014 - carnold(a)suse.com + +- Upstream patches from Jan + 5321b20b-common-make-hypercall-preemption-checks-consistent.patch + 5321b257-x86-make-hypercall-preemption-checks-consistent.patch + 53271880-VT-d-fix-RMRR-handling.patch + 5327190a-x86-Intel-work-around-Xeon-7400-series-erratum-AAI65.patch +- Dropped the following as now part of 5321b257 + 5310bac3-mm-ensure-useful-progress-in-decrease_reservation.patch + +------------------------------------------------------------------- @@ -3,0 +74,3 @@ +- bnc#867910 - VUL-0: EMBARGOED: xen: XSA-89: HVMOP_set_mem_access + is not preemptible + xsa89.patch Old: ---- 5310bac3-mm-ensure-useful-progress-in-decrease_reservation.patch New: ---- 53206661-pygrub-support-linux16-and-initrd16.patch 5321b20b-common-make-hypercall-preemption-checks-consistent.patch 5321b257-x86-make-hypercall-preemption-checks-consistent.patch 53271880-VT-d-fix-RMRR-handling.patch 5327190a-x86-Intel-work-around-Xeon-7400-series-erratum-AAI65.patch 53299d8f-xenconsole-reset-tty-on-failure.patch 53299d8f-xenconsole-tolerate-tty-errors.patch 532fff53-x86-fix-determination-of-bit-count-for-struct-domain-allocations.patch 5331917d-x86-enforce-preemption-in-HVM_set_mem_access-p2m_set_mem_access.patch 53356c1e-x86-HVM-correct-CPUID-leaf-80000008-handling.patch 533ad1ee-VMX-fix-PAT-value-seen-by-guest.patch 533d413b-x86-mm-fix-checks-against-max_mapped_pfn.patch qemu-xen-upstream-megasas-buildtime.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xen.spec ++++++ --- /var/tmp/diff_new_pack.tVefOJ/_old 2014-04-16 07:44:11.000000000 +0200 +++ /var/tmp/diff_new_pack.tVefOJ/_new 2014-04-16 07:44:11.000000000 +0200 @@ -41,10 +41,18 @@ %define with_qemu_traditional 1 %define with_xend_tools_pkg 0 %if %suse_version > 1230 +%if %suse_version == 1315 +%define with_xend_tools_pkg 0 +%else %define with_xend_tools_pkg 1 %endif +%endif %if %suse_version > 1230 +%if %suse_version == 1315 +%define with_xend 0 +%else %define with_xend 1 +%endif %else %define with_xend 1 %endif @@ -56,8 +64,12 @@ # %define max_cpus 4 %ifarch x86_64 +%if %suse_version == 1315 +%define max_cpus 1024 +%else %define max_cpus 512 %endif +%endif # %define xen_install_suffix %{nil} %ifarch x86_64 @@ -84,19 +96,19 @@ %ifarch %ix86 x86_64 BuildRequires: dev86 %endif -BuildRequires: flex BuildRequires: bison BuildRequires: fdupes +BuildRequires: flex BuildRequires: glib2-devel BuildRequires: libaio-devel BuildRequires: libbz2-devel +BuildRequires: libpixman-1-0-devel BuildRequires: libuuid-devel BuildRequires: libxml2-devel BuildRequires: libyajl-devel -BuildRequires: libpixman-1-0-devel %if %{?with_qemu_traditional}0 -BuildRequires: pciutils-devel BuildRequires: SDL-devel +BuildRequires: pciutils-devel %endif %if %{?with_stubdom}0 %if 0%{?suse_version} < 1230 @@ -134,12 +146,13 @@ BuildRequires: module-init-tools %if %suse_version >= 1230 BuildRequires: lndir +BuildRequires: pesign-obs-integration %else BuildRequires: xorg-x11-util-devel %endif %endif -Version: 4.4.0_08 +Version: 4.4.0_14 Release: 0 PreReq: %insserv_prereq %fillup_prereq Summary: Xen Virtualization: Hypervisor (aka VMM aka Microkernel) @@ -202,15 +215,26 @@ Patch2: 530b2880-Nested-VMX-update-nested-paging-mode-on-vmexit.patch Patch3: 530b28c5-x86-MSI-don-t-risk-division-by-zero.patch Patch4: 530c54c3-x86-mce-Reduce-boot-time-logspam.patch -Patch5: 5310bac3-mm-ensure-useful-progress-in-decrease_reservation.patch -Patch6: 5315a254-IOMMU-generalize-and-correct-softirq-processing.patch -Patch7: 5315a3bb-x86-don-t-propagate-acpi_skip_timer_override-do-Dom0.patch -Patch8: 5315a43a-x86-ACPI-also-print-address-space-for-PM1x-fields.patch -Patch9: 531d8db1-x86-hvm-refine-the-judgment-on-IDENT_PT-for-EMT.patch -Patch10: 531d8e09-x86-HVM-fix-memory-type-merging-in-epte_get_entry_emt.patch -Patch11: 531d8e34-x86-HVM-consolidate-passthrough-handling-in-epte_get_entry_emt.patch -Patch12: 531d8fd0-kexec-identify-which-cpu-the-kexec-image-is-being-executed-on.patch -Patch13: 531dc0e2-xmalloc-handle-correctly-page-allocation-when-align-size.patch +Patch5: 5315a254-IOMMU-generalize-and-correct-softirq-processing.patch +Patch6: 5315a3bb-x86-don-t-propagate-acpi_skip_timer_override-do-Dom0.patch +Patch7: 5315a43a-x86-ACPI-also-print-address-space-for-PM1x-fields.patch +Patch8: 531d8db1-x86-hvm-refine-the-judgment-on-IDENT_PT-for-EMT.patch +Patch9: 531d8e09-x86-HVM-fix-memory-type-merging-in-epte_get_entry_emt.patch +Patch10: 531d8e34-x86-HVM-consolidate-passthrough-handling-in-epte_get_entry_emt.patch +Patch11: 531d8fd0-kexec-identify-which-cpu-the-kexec-image-is-being-executed-on.patch +Patch12: 531dc0e2-xmalloc-handle-correctly-page-allocation-when-align-size.patch +Patch13: 53206661-pygrub-support-linux16-and-initrd16.patch +Patch14: 5321b20b-common-make-hypercall-preemption-checks-consistent.patch +Patch15: 5321b257-x86-make-hypercall-preemption-checks-consistent.patch +Patch16: 53271880-VT-d-fix-RMRR-handling.patch +Patch17: 5327190a-x86-Intel-work-around-Xeon-7400-series-erratum-AAI65.patch +Patch18: 53299d8f-xenconsole-reset-tty-on-failure.patch +Patch19: 53299d8f-xenconsole-tolerate-tty-errors.patch +Patch20: 532fff53-x86-fix-determination-of-bit-count-for-struct-domain-allocations.patch +Patch21: 5331917d-x86-enforce-preemption-in-HVM_set_mem_access-p2m_set_mem_access.patch +Patch22: 53356c1e-x86-HVM-correct-CPUID-leaf-80000008-handling.patch +Patch23: 533ad1ee-VMX-fix-PAT-value-seen-by-guest.patch +Patch24: 533d413b-x86-mm-fix-checks-against-max_mapped_pfn.patch # Upstream qemu Patch250: VNC-Support-for-ExtendedKeyEvent-client-message.patch Patch251: 0001-net-move-the-tap-buffer-into-TAPState.patch @@ -277,6 +301,7 @@ Patch386: libxc-pass-errno-to-callers-of-xc_domain_save.patch Patch387: libxl.set-migration-constraints-from-cmdline.patch Patch388: libxl.honor-more-top-level-vfb-options.patch +Patch389: qemu-xen-upstream-megasas-buildtime.patch # Xend Patch400: xend-set-migration-constraints-from-cmdline.patch Patch402: xen.migrate.tools-xend_move_assert_to_exception_block.patch @@ -425,6 +450,7 @@ Summary: Xen Virtualization: Control tools for domain 0 Group: System/Kernel Requires: bridge-utils +Requires: grub2-x86_64-xen Requires: multipath-tools Requires: python Requires: python-curses @@ -529,6 +555,9 @@ Summary: Xen para-virtual device drivers for fully virtualized guests Group: System/Kernel Conflicts: xen +%if %suse_version >= 1230 +Requires: pesign-obs-integration +%endif %description KMP Xen is a virtual machine monitor for x86 that supports execution of @@ -577,6 +606,17 @@ %patch11 -p1 %patch12 -p1 %patch13 -p1 +%patch14 -p1 +%patch15 -p1 +%patch16 -p1 +%patch17 -p1 +%patch18 -p1 +%patch19 -p1 +%patch20 -p1 +%patch21 -p1 +%patch22 -p1 +%patch23 -p1 +%patch24 -p1 # Upstream qemu patches %patch250 -p1 %patch251 -p1 @@ -642,6 +682,7 @@ %patch386 -p1 %patch387 -p1 %patch388 -p1 +%patch389 -p1 # Xend %patch400 -p1 %patch402 -p1 @@ -786,6 +827,7 @@ export EXTRA_CFLAGS_QEMU_XEN="$RPM_OPT_FLAGS" # EFI %if %{?with_dom0_support}0 +export BRP_PESIGN_FILES="*.ko *.efi /lib/firmware" make -C xen install \ %if %{?with_gcc47}0 CC=gcc-4.7 \ @@ -832,6 +874,8 @@ echo %{_libdir}/efi >> xen.files.txt fi %ifarch x86_64 +ln -s /usr/lib/xen/bin/qemu-dm $RPM_BUILD_ROOT/%{_libdir}/xen/bin/qemu-dm +ln -s /usr/lib/xen/bin/qemu-system-i386 $RPM_BUILD_ROOT/%{_libdir}/xen/bin/qemu-system-i386 cp -avL xenalyze.hg/dump-raw $RPM_BUILD_ROOT/%{_bindir}/xenalyze.dump-raw cp -avL xenalyze.hg/xenalyze $RPM_BUILD_ROOT/%{_bindir} %endif @@ -1340,14 +1384,6 @@ %{fillup_and_insserv -y -n xendomains xendomains} %{fillup_only -n pciback} %endif -if [ -f /usr/bin/qemu-system-i386 ]; then - rm -f /usr/lib/xen/bin/qemu-system-i386 - ln -s /usr/bin/qemu-system-i386 /usr/lib/xen/bin/qemu-system-i386 -fi -if [ -f /usr/bin/qemu-system-x86_64 ]; then - rm -f /usr/lib/xen/bin/qemu-system-x86_64 - ln -s /usr/bin/qemu-system-x86_64 /usr/lib/xen/bin/qemu-system-x86_64 -fi if [ -f /usr/bin/qemu-img ]; then if [ -f /usr/bin/qemu-img-xen ]; then rm /usr/bin/qemu-img-xen ++++++ 531d8e34-x86-HVM-consolidate-passthrough-handling-in-epte_get_entry_emt.patch ++++++ --- /var/tmp/diff_new_pack.tVefOJ/_old 2014-04-16 07:44:11.000000000 +0200 +++ /var/tmp/diff_new_pack.tVefOJ/_new 2014-04-16 07:44:11.000000000 +0200 @@ -19,9 +19,21 @@ Reviewed-by: "Xu, Dongxiao" <dongxiao.xu(a)intel.com> Acked-by: Keir Fraser <keir(a)xen.org> +# Commit 1f8b57779785bf9f55c16312bb1ec679929c314b +# Date 2014-03-28 13:43:25 +0100 +# Author Jan Beulich <jbeulich(a)suse.com> +# Committer Jan Beulich <jbeulich(a)suse.com> +x86/EPT: relax treatment of APIC MFN + +There's no point in this being mapped UC by the guest due to using a +respective PAT index - set the ignore-PAT flag to true. + +Signed-off-by: Jan Beulich <jbeulich(a)suse.com> +Reviewed-by: Tim Deegan <tim(a)xen.org> + --- a/xen/arch/x86/hvm/mtrr.c +++ b/xen/arch/x86/hvm/mtrr.c -@@ -698,14 +698,20 @@ uint8_t epte_get_entry_emt(struct domain +@@ -698,14 +698,24 @@ uint8_t epte_get_entry_emt(struct domain if ( hvm_get_mem_pinned_cacheattr(d, gfn, &type) ) return type; @@ -39,8 +51,12 @@ if ( direct_mmio ) - return MTRR_TYPE_UNCACHABLE; -+ return mfn_x(mfn) != d->arch.hvm_domain.vmx.apic_access_mfn -+ ? MTRR_TYPE_UNCACHABLE : MTRR_TYPE_WRBACK; ++ { ++ if ( mfn_x(mfn) != d->arch.hvm_domain.vmx.apic_access_mfn ) ++ return MTRR_TYPE_UNCACHABLE; ++ *ipat = 1; ++ return MTRR_TYPE_WRBACK; ++ } if ( iommu_snoop ) { ++++++ 53206661-pygrub-support-linux16-and-initrd16.patch ++++++ Subject: xen/pygrub: grub2/grub.cfg from RHEL 7 has new commands in menuentry From: Joby Poriyath joby.poriyath(a)citrix.com Tue Feb 4 18:10:35 2014 +0000 Date: Wed Mar 12 13:51:29 2014 +0000: Git: dd03048708af072374963d6d0721cc6d4c5f52cf menuentry in grub2/grub.cfg uses linux16 and initrd16 commands instead of linux and initrd. Due to this RHEL 7 (beta) guest failed to boot after the installation. In addition to this, RHEL 7 menu entries have two different single-quote delimited strings on the same line, and the greedy grouping for menuentry parsing gets both strings, and the options inbetween. Signed-off-by: Joby Poriyath <joby.poriyath(a)citrix.com> Reviewed-by: Andrew Cooper <andrew.cooper3(a)citrix.com> Acked-by: Ian Campbell <ian.campbell(a)citrix.com> Cc: george.dunlap(a)citrix.com diff --git a/tools/pygrub/examples/rhel-7-beta.grub2 b/tools/pygrub/examples/rhel-7-beta.grub2 new file mode 100644 index 0000000..88f0f99 --- /dev/null +++ b/tools/pygrub/examples/rhel-7-beta.grub2 @@ -0,0 +1,118 @@ +# +# DO NOT EDIT THIS FILE +# +# It is automatically generated by grub2-mkconfig using templates +# from /etc/grub.d and settings from /etc/default/grub +# + +### BEGIN /etc/grub.d/00_header ### +set pager=1 + +if [ -s $prefix/grubenv ]; then + load_env +fi +if [ "${next_entry}" ] ; then + set default="${next_entry}" + set next_entry= + save_env next_entry + set boot_once=true +else + set default="${saved_entry}" +fi + +if [ x"${feature_menuentry_id}" = xy ]; then + menuentry_id_option="--id" +else + menuentry_id_option="" +fi + +export menuentry_id_option + +if [ "${prev_saved_entry}" ]; then + set saved_entry="${prev_saved_entry}" + save_env saved_entry + set prev_saved_entry= + save_env prev_saved_entry + set boot_once=true +fi + +function savedefault { + if [ -z "${boot_once}" ]; then + saved_entry="${chosen}" + save_env saved_entry + fi +} + +function load_video { + if [ x$feature_all_video_module = xy ]; then + insmod all_video + else + insmod efi_gop + insmod efi_uga + insmod ieee1275_fb + insmod vbe + insmod vga + insmod video_bochs + insmod video_cirrus + fi +} + +terminal_output console +set timeout=5 +### END /etc/grub.d/00_header ### + +### BEGIN /etc/grub.d/10_linux ### +menuentry 'Red Hat Enterprise Linux Everything, with Linux 3.10.0-54.0.1.el7.x86_64' --class red --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-3.10.0-54.0.1.el7.x86_64-advanced-d23b8b49-4cfe-4900-8ef1-ec80bc633163' { + load_video + set gfxpayload=keep + insmod gzio + insmod part_msdos + insmod xfs + set root='hd0,msdos1' + if [ x$feature_platform_search_hint = xy ]; then + search --no-floppy --fs-uuid --set=root --hint='hd0,msdos1' 89ffef78-82b3-457c-bc57-42cccc373851 + else + search --no-floppy --fs-uuid --set=root 89ffef78-82b3-457c-bc57-42cccc373851 + fi + linux16 /vmlinuz-3.10.0-54.0.1.el7.x86_64 root=/dev/mapper/rhel-root ro rd.lvm.lv=rhel/swap vconsole.keymap=uk crashkernel=auto rd.lvm.lv=rhel/root vconsole.font=latarcyrheb-sun16 LANG=en_GB.UTF-8 + initrd16 /initramfs-3.10.0-54.0.1.el7.x86_64.img +} +menuentry 'Red Hat Enterprise Linux Everything, with Linux 0-rescue-af34f0b8cf364cdbbe6d093f8228a37f' --class red --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-0-rescue-af34f0b8cf364cdbbe6d093f8228a37f-advanced-d23b8b49-4cfe-4900-8ef1-ec80bc633163' { + load_video + insmod gzio + insmod part_msdos + insmod xfs + set root='hd0,msdos1' + if [ x$feature_platform_search_hint = xy ]; then + search --no-floppy --fs-uuid --set=root --hint='hd0,msdos1' 89ffef78-82b3-457c-bc57-42cccc373851 + else + search --no-floppy --fs-uuid --set=root 89ffef78-82b3-457c-bc57-42cccc373851 + fi + linux16 /vmlinuz-0-rescue-af34f0b8cf364cdbbe6d093f8228a37f root=/dev/mapper/rhel-root ro rd.lvm.lv=rhel/swap vconsole.keymap=uk crashkernel=auto rd.lvm.lv=rhel/root vconsole.font=latarcyrheb-sun16 + initrd16 /initramfs-0-rescue-af34f0b8cf364cdbbe6d093f8228a37f.img +} + +### END /etc/grub.d/10_linux ### + +### BEGIN /etc/grub.d/20_linux_xen ### +### END /etc/grub.d/20_linux_xen ### + +### BEGIN /etc/grub.d/20_ppc_terminfo ### +### END /etc/grub.d/20_ppc_terminfo ### + +### BEGIN /etc/grub.d/30_os-prober ### +### END /etc/grub.d/30_os-prober ### + +### BEGIN /etc/grub.d/40_custom ### +# This file provides an easy way to add custom menu entries. Simply type the +# menu entries you want to add after this comment. Be careful not to change +# the 'exec tail' line above. +### END /etc/grub.d/40_custom ### + +### BEGIN /etc/grub.d/41_custom ### +if [ -f ${config_directory}/custom.cfg ]; then + source ${config_directory}/custom.cfg +elif [ -z "${config_directory}" -a -f $prefix/custom.cfg ]; then + source $prefix/custom.cfg; +fi +### END /etc/grub.d/41_custom ### diff --git a/tools/pygrub/src/GrubConf.py b/tools/pygrub/src/GrubConf.py index cb853c9..974cded 100644 --- a/tools/pygrub/src/GrubConf.py +++ b/tools/pygrub/src/GrubConf.py @@ -348,7 +348,9 @@ class Grub2Image(_GrubImage): commands = {'set:root': 'root', 'linux': 'kernel', + 'linux16': 'kernel', 'initrd': 'initrd', + 'initrd16': 'initrd', 'echo': None, 'insmod': None, 'search': None} @@ -394,7 +396,7 @@ class Grub2ConfigFile(_GrubConfigFile): continue # new image - title_match = re.match('^menuentry ["\'](.*)["\'] (.*){', l) + title_match = re.match('^menuentry ["\'](.*?)["\'] (.*){', l) if title_match: if img is not None: raise RuntimeError, "syntax error: cannot nest menuentry (%d %s)" % (len(img),img) ++++++ 5321b20b-common-make-hypercall-preemption-checks-consistent.patch ++++++ # Commit 8c0eed2cc8d8a2ccccdffe4c386b625b672dc12a # Date 2014-03-13 14:26:35 +0100 # Author Jan Beulich <jbeulich(a)suse.com> # Committer Jan Beulich <jbeulich(a)suse.com> common: make hypercall preemption checks consistent - never preempt on the first iteration (ensure forward progress) - do cheap checks first Signed-off-by: Jan Beulich <jbeulich(a)suse.com> Reviewed-by: Andrew Cooper <andrew.cooper3(a)citrix.com> Reviewed-by: Tim Deegan <tim(a)xen.org> Acked-by: Keir Fraser <keir(a)xen.org> --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -63,7 +63,7 @@ static void increase_reservation(struct for ( i = a->nr_done; i < a->nr_extents; i++ ) { - if ( hypercall_preempt_check() ) + if ( i != a->nr_done && hypercall_preempt_check() ) { a->preempted = 1; goto out; @@ -109,7 +109,7 @@ static void populate_physmap(struct memo for ( i = a->nr_done; i < a->nr_extents; i++ ) { - if ( hypercall_preempt_check() ) + if ( i != a->nr_done && hypercall_preempt_check() ) { a->preempted = 1; goto out; @@ -268,7 +268,7 @@ static void decrease_reservation(struct for ( i = a->nr_done; i < a->nr_extents; i++ ) { - if ( hypercall_preempt_check() ) + if ( i != a->nr_done && hypercall_preempt_check() ) { a->preempted = 1; goto out; @@ -398,7 +398,8 @@ static long memory_exchange(XEN_GUEST_HA i < (exch.in.nr_extents >> in_chunk_order); i++ ) { - if ( hypercall_preempt_check() ) + if ( i != (exch.nr_exchanged >> in_chunk_order) && + hypercall_preempt_check() ) { exch.nr_exchanged = i << in_chunk_order; rcu_unlock_domain(d); --- a/xen/common/multicall.c +++ b/xen/common/multicall.c @@ -52,7 +52,7 @@ do_multicall( for ( i = 0; !rc && i < nr_calls; i++ ) { - if ( hypercall_preempt_check() ) + if ( i && hypercall_preempt_check() ) goto preempted; if ( unlikely(__copy_from_guest(&mcs->call, call_list, 1)) ) --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -375,12 +375,12 @@ static DECLARE_SOFTIRQ_TASKLET(notify_do static long guest_console_write(XEN_GUEST_HANDLE_PARAM(char) buffer, int count) { char kbuf[128]; - int kcount; + int kcount = 0; struct domain *cd = current->domain; while ( count > 0 ) { - if ( hypercall_preempt_check() ) + if ( kcount && hypercall_preempt_check() ) return hypercall_create_continuation( __HYPERVISOR_console_io, "iih", CONSOLEIO_write, count, buffer); ++++++ 5321b257-x86-make-hypercall-preemption-checks-consistent.patch ++++++ # Commit fd7bfce0395ace266159760e35dc49f7af3b90ce # Date 2014-03-13 14:27:51 +0100 # Author Jan Beulich <jbeulich(a)suse.com> # Committer Jan Beulich <jbeulich(a)suse.com> x86: make hypercall preemption checks consistent - never preempt on the first iteration (ensure forward progress) - never preempt on the last iteration (pointless/wasteful) Signed-off-by: Jan Beulich <jbeulich(a)suse.com> Reviewed-by: Andrew Cooper <andrew.cooper3(a)citrix.com> Reviewed-by: Tim Deegan <tim(a)xen.org> Acked-by: Keir Fraser <keir(a)xen.org> --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -2934,7 +2934,7 @@ long do_mmuext_op( for ( i = 0; i < count; i++ ) { - if ( curr->arch.old_guest_table || hypercall_preempt_check() ) + if ( curr->arch.old_guest_table || (i && hypercall_preempt_check()) ) { rc = -EAGAIN; break; @@ -3481,7 +3481,7 @@ long do_mmu_update( for ( i = 0; i < count; i++ ) { - if ( curr->arch.old_guest_table || hypercall_preempt_check() ) + if ( curr->arch.old_guest_table || (i && hypercall_preempt_check()) ) { rc = -EAGAIN; break; --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -326,7 +326,7 @@ hap_set_allocation(struct domain *d, uns else pages -= d->arch.paging.hap.p2m_pages; - while ( d->arch.paging.hap.total_pages != pages ) + for ( ; ; ) { if ( d->arch.paging.hap.total_pages < pages ) { @@ -355,6 +355,8 @@ hap_set_allocation(struct domain *d, uns d->arch.paging.hap.total_pages--; free_domheap_page(pg); } + else + break; /* Check to see if we need to yield and try again */ if ( preempted && hypercall_preempt_check() ) --- a/xen/arch/x86/mm/p2m-pod.c +++ b/xen/arch/x86/mm/p2m-pod.c @@ -242,7 +242,8 @@ p2m_pod_set_cache_target(struct p2m_doma p2m_pod_cache_add(p2m, page, order); - if ( hypercall_preempt_check() && preemptible ) + if ( preemptible && pod_target != p2m->pod.count && + hypercall_preempt_check() ) { ret = -EAGAIN; goto out; @@ -286,7 +287,8 @@ p2m_pod_set_cache_target(struct p2m_doma put_page(page+i); - if ( hypercall_preempt_check() && preemptible ) + if ( preemptible && pod_target != p2m->pod.count && + hypercall_preempt_check() ) { ret = -EAGAIN; goto out; --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -1674,7 +1674,7 @@ static unsigned int sh_set_allocation(st SHADOW_PRINTK("current %i target %i\n", d->arch.paging.shadow.total_pages, pages); - while ( d->arch.paging.shadow.total_pages != pages ) + for ( ; ; ) { if ( d->arch.paging.shadow.total_pages < pages ) { @@ -1709,6 +1709,8 @@ static unsigned int sh_set_allocation(st d->arch.paging.shadow.total_pages--; free_domheap_page(sp); } + else + break; /* Check to see if we need to yield and try again */ if ( preempted && hypercall_preempt_check() ) --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -3595,13 +3595,6 @@ long do_set_trap_table(XEN_GUEST_HANDLE_ for ( ; ; ) { - if ( hypercall_preempt_check() ) - { - rc = hypercall_create_continuation( - __HYPERVISOR_set_trap_table, "h", traps); - break; - } - if ( copy_from_guest(&cur, traps, 1) ) { rc = -EFAULT; @@ -3622,6 +3615,13 @@ long do_set_trap_table(XEN_GUEST_HANDLE_ init_int80_direct_trap(curr); guest_handle_add_offset(traps, 1); + + if ( hypercall_preempt_check() ) + { + rc = hypercall_create_continuation( + __HYPERVISOR_set_trap_table, "h", traps); + break; + } } return rc; --- a/xen/arch/x86/x86_64/compat/traps.c +++ b/xen/arch/x86/x86_64/compat/traps.c @@ -329,13 +329,6 @@ int compat_set_trap_table(XEN_GUEST_HAND for ( ; ; ) { - if ( hypercall_preempt_check() ) - { - rc = hypercall_create_continuation( - __HYPERVISOR_set_trap_table, "h", traps); - break; - } - if ( copy_from_guest(&cur, traps, 1) ) { rc = -EFAULT; @@ -353,6 +346,13 @@ int compat_set_trap_table(XEN_GUEST_HAND init_int80_direct_trap(current); guest_handle_add_offset(traps, 1); + + if ( hypercall_preempt_check() ) + { + rc = hypercall_create_continuation( + __HYPERVISOR_set_trap_table, "h", traps); + break; + } } return rc; ++++++ 53271880-VT-d-fix-RMRR-handling.patch ++++++ # Commit dd527061770789d8152b1dea68056987b202d87a # Date 2014-03-17 16:45:04 +0100 # Author Jan Beulich <jbeulich(a)suse.com> # Committer Jan Beulich <jbeulich(a)suse.com> VT-d: fix RMRR handling Removing mapped RMRR tracking structures in dma_pte_clear_one() is wrong for two reasons: First, these regions may cover more than a single page. And second, multiple devices (and hence multiple devices assigned to any particular guest) may share a single RMRR (whether assigning such devices to distinct guests is a safe thing to do is another question). Therefore move the removal of the tracking structures into the counterpart function to the one doing the insertion - intel_iommu_remove_device(), and add a reference count to the tracking structure. Further, for the handling of the mappings of the respective memory regions to be correct, RMRRs must not overlap. Add a respective check to acpi_parse_one_rmrr(). And finally, with all of this being VT-d specific, move the cleanup of the list as well as the structure type definition where it belongs - in VT-d specific rather than IOMMU generic code. Note that this doesn't address yet another issue associated with RMRR handling: The purpose of the RMRRs as well as the way the respective IOMMU page table mappings get inserted both suggest that these regions would need to be marked E820_RESERVED in all (HVM?) guests' memory maps, yet nothing like this is being done in hvmloader. (For PV guests this would also seem to be necessary, but may conflict with PV guests possibly assuming there to be just a single E820 entry representing all of its RAM.) Signed-off-by: Jan Beulich <jbeulich(a)suse.com> Acked-by: Xiantao Zhang <xiantao.zhang(a)intel.com> --- a/xen/drivers/passthrough/iommu.c +++ b/xen/drivers/passthrough/iommu.c @@ -412,9 +412,8 @@ static int iommu_populate_page_table(str void iommu_domain_destroy(struct domain *d) { struct hvm_iommu *hd = domain_hvm_iommu(d); - struct list_head *ioport_list, *rmrr_list, *tmp; + struct list_head *ioport_list, *tmp; struct g2m_ioport *ioport; - struct mapped_rmrr *mrmrr; if ( !iommu_enabled || !hd->platform_ops ) return; @@ -428,13 +427,6 @@ void iommu_domain_destroy(struct domain list_del(&ioport->list); xfree(ioport); } - - list_for_each_safe ( rmrr_list, tmp, &hd->mapped_rmrrs ) - { - mrmrr = list_entry(rmrr_list, struct mapped_rmrr, list); - list_del(&mrmrr->list); - xfree(mrmrr); - } } int iommu_map_page(struct domain *d, unsigned long gfn, unsigned long mfn, --- a/xen/drivers/passthrough/vtd/dmar.c +++ b/xen/drivers/passthrough/vtd/dmar.c @@ -580,6 +580,16 @@ acpi_parse_one_rmrr(struct acpi_dmar_hea if ( (ret = acpi_dmar_check_length(header, sizeof(*rmrr))) != 0 ) return ret; + list_for_each_entry(rmrru, &acpi_rmrr_units, list) + if ( base_addr <= rmrru->end_address && rmrru->base_address <= end_addr ) + { + printk(XENLOG_ERR VTDPREFIX + "Overlapping RMRRs [%"PRIx64",%"PRIx64"] and [%"PRIx64",%"PRIx64"]\n", + rmrru->base_address, rmrru->end_address, + base_addr, end_addr); + return -EEXIST; + } + /* This check is here simply to detect when RMRR values are * not properly represented in the system memory map and * inform the user --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -42,6 +42,12 @@ #include "vtd.h" #include "../ats.h" +struct mapped_rmrr { + struct list_head list; + u64 base, end; + unsigned int count; +}; + /* Possible unfiltered LAPIC/MSI messages from untrusted sources? */ bool_t __read_mostly untrusted_msi; @@ -619,7 +625,6 @@ static void dma_pte_clear_one(struct dom struct hvm_iommu *hd = domain_hvm_iommu(domain); struct dma_pte *page = NULL, *pte = NULL; u64 pg_maddr; - struct mapped_rmrr *mrmrr; spin_lock(&hd->mapping_lock); /* get last level pte */ @@ -648,21 +653,6 @@ static void dma_pte_clear_one(struct dom __intel_iommu_iotlb_flush(domain, addr >> PAGE_SHIFT_4K, 1, 1); unmap_vtd_domain_page(page); - - /* if the cleared address is between mapped RMRR region, - * remove the mapped RMRR - */ - spin_lock(&hd->mapping_lock); - list_for_each_entry ( mrmrr, &hd->mapped_rmrrs, list ) - { - if ( addr >= mrmrr->base && addr <= mrmrr->end ) - { - list_del(&mrmrr->list); - xfree(mrmrr); - break; - } - } - spin_unlock(&hd->mapping_lock); } static void iommu_free_pagetable(u64 pt_maddr, int level) @@ -1700,10 +1690,17 @@ static int reassign_device_ownership( void iommu_domain_teardown(struct domain *d) { struct hvm_iommu *hd = domain_hvm_iommu(d); + struct mapped_rmrr *mrmrr, *tmp; if ( list_empty(&acpi_drhd_units) ) return; + list_for_each_entry_safe ( mrmrr, tmp, &hd->mapped_rmrrs, list ) + { + list_del(&mrmrr->list); + xfree(mrmrr); + } + if ( iommu_use_hap_pt(d) ) return; @@ -1848,14 +1845,17 @@ static int rmrr_identity_mapping(struct ASSERT(rmrr->base_address < rmrr->end_address); /* - * No need to acquire hd->mapping_lock, as the only theoretical race is - * with the insertion below (impossible due to holding pcidevs_lock). + * No need to acquire hd->mapping_lock: Both insertion and removal + * get done while holding pcidevs_lock. */ list_for_each_entry( mrmrr, &hd->mapped_rmrrs, list ) { if ( mrmrr->base == rmrr->base_address && mrmrr->end == rmrr->end_address ) + { + ++mrmrr->count; return 0; + } } base = rmrr->base_address & PAGE_MASK_4K; @@ -1876,9 +1876,8 @@ static int rmrr_identity_mapping(struct return -ENOMEM; mrmrr->base = rmrr->base_address; mrmrr->end = rmrr->end_address; - spin_lock(&hd->mapping_lock); + mrmrr->count = 1; list_add_tail(&mrmrr->list, &hd->mapped_rmrrs); - spin_unlock(&hd->mapping_lock); return 0; } @@ -1940,17 +1939,52 @@ static int intel_iommu_remove_device(u8 if ( !pdev->domain ) return -EINVAL; - /* If the device belongs to dom0, and it has RMRR, don't remove it - * from dom0, because BIOS may use RMRR at booting time. - */ - if ( pdev->domain->domain_id == 0 ) + for_each_rmrr_device ( rmrr, bdf, i ) { - for_each_rmrr_device ( rmrr, bdf, i ) + struct hvm_iommu *hd; + struct mapped_rmrr *mrmrr, *tmp; + + if ( rmrr->segment != pdev->seg || + PCI_BUS(bdf) != pdev->bus || + PCI_DEVFN2(bdf) != devfn ) + continue; + + /* + * If the device belongs to dom0, and it has RMRR, don't remove + * it from dom0, because BIOS may use RMRR at booting time. + */ + if ( is_hardware_domain(pdev->domain) ) + return 0; + + hd = domain_hvm_iommu(pdev->domain); + + /* + * No need to acquire hd->mapping_lock: Both insertion and removal + * get done while holding pcidevs_lock. + */ + ASSERT(spin_is_locked(&pcidevs_lock)); + list_for_each_entry_safe ( mrmrr, tmp, &hd->mapped_rmrrs, list ) { - if ( rmrr->segment == pdev->seg && - PCI_BUS(bdf) == pdev->bus && - PCI_DEVFN2(bdf) == devfn ) - return 0; + unsigned long base_pfn, end_pfn; + + if ( rmrr->base_address != mrmrr->base || + rmrr->end_address != mrmrr->end ) + continue; + + if ( --mrmrr->count ) + break; + + base_pfn = (mrmrr->base & PAGE_MASK_4K) >> PAGE_SHIFT_4K; + end_pfn = PAGE_ALIGN_4K(mrmrr->end) >> PAGE_SHIFT_4K; + while ( base_pfn < end_pfn ) + { + if ( intel_iommu_unmap_page(pdev->domain, base_pfn) ) + return -ENXIO; + base_pfn++; + } + + list_del(&mrmrr->list); + xfree(mrmrr); } } --- a/xen/include/xen/hvm/iommu.h +++ b/xen/include/xen/hvm/iommu.h @@ -29,12 +29,6 @@ struct g2m_ioport { unsigned int np; }; -struct mapped_rmrr { - struct list_head list; - u64 base; - u64 end; -}; - struct hvm_iommu { u64 pgd_maddr; /* io page directory machine address */ spinlock_t mapping_lock; /* io page table lock */ ++++++ 5327190a-x86-Intel-work-around-Xeon-7400-series-erratum-AAI65.patch ++++++ # Commit 96d1b237ae9b2f2718bb1c59820701f17d3d86e0 # Date 2014-03-17 16:47:22 +0100 # Author Jan Beulich <jbeulich(a)suse.com> # Committer Jan Beulich <jbeulich(a)suse.com> x86/Intel: work around Xeon 7400 series erratum AAI65 Linux commit 40e2d7f9b5dae048789c64672bf3027fbb663ffa ("x86 idle: Repair large-server 50-watt idle-power regression") tells us that this applies not just to the named Xeon 7400 series, but also NHM-EX and WSM-EX; sadly Intel's documentation is so badly searchable that I wasn't able to locate the respective errata (and hence can't quote their numbers here). Signed-off-by: Jan Beulich <jbeulich(a)suse.com> Reviewed-by: Andrew Cooper <andrew.cooper3(a)citrix.com> Acked-by: Kevin Tian <kevin.tian(a)intel.com> --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -296,6 +296,9 @@ void mwait_idle_with_hints(unsigned int unsigned int cpu = smp_processor_id(); s_time_t expires = per_cpu(timer_deadline, cpu); + if ( boot_cpu_has(X86_FEATURE_CLFLUSH_MONITOR) ) + clflush((void *)&mwait_wakeup(cpu)); + __monitor((void *)&mwait_wakeup(cpu), 0, 0); smp_mb(); --- a/xen/arch/x86/cpu/intel.c +++ b/xen/arch/x86/cpu/intel.c @@ -147,6 +147,9 @@ void __devinit early_intel_workaround(st /* * P4 Xeon errata 037 workaround. * Hardware prefetcher may cause stale data to be loaded into the cache. + * + * Xeon 7400 erratum AAI65 (and further newer Xeons) + * MONITOR/MWAIT may have excessive false wakeups */ static void __devinit Intel_errata_workarounds(struct cpuinfo_x86 *c) { @@ -161,6 +164,10 @@ static void __devinit Intel_errata_worka wrmsr (MSR_IA32_MISC_ENABLE, lo, hi); } } + + if (c->x86 == 6 && cpu_has_clflush && + (c->x86_model == 29 || c->x86_model == 46 || c->x86_model == 47)) + set_bit(X86_FEATURE_CLFLUSH_MONITOR, c->x86_capability); } --- a/xen/include/asm-x86/cpufeature.h +++ b/xen/include/asm-x86/cpufeature.h @@ -71,6 +71,7 @@ #define X86_FEATURE_TSC_RELIABLE (3*32+12) /* TSC is known to be reliable */ #define X86_FEATURE_XTOPOLOGY (3*32+13) /* cpu topology enum extensions */ #define X86_FEATURE_CPUID_FAULTING (3*32+14) /* cpuid faulting */ +#define X86_FEATURE_CLFLUSH_MONITOR (3*32+15) /* clflush reqd with monitor */ /* Intel-defined CPU features, CPUID level 0x00000001 (ecx), word 4 */ #define X86_FEATURE_XMM3 (4*32+ 0) /* Streaming SIMD Extensions-3 */ ++++++ 53299d8f-xenconsole-reset-tty-on-failure.patch ++++++ Subject: tools/console: reset tty when xenconsole fails From: Ian Jackson ian.jackson(a)eu.citrix.com Mon Feb 24 15:16:19 2014 +0000 Date: Wed Mar 19 13:37:19 2014 +0000: Git: 111931f36885874103d65685ab15ea3d25d93da7 If xenconsole (the client program) fails, it calls err. This would previously neglect to reset the user's terminal to sanity. Use atexit to do so. This routinely happens in Xen 4.4 RC5 with pygrub because libxl writes the value "" to the tty xenstore key when using xenconsole. After this patch this just results in a harmless error message. Reported-by: M A Young <m.a.young(a)durham.ac.uk> Signed-off-by: Ian Jackson <Ian.Jackson(a)eu.citrix.com> CC: M A Young <m.a.young(a)durham.ac.uk> CC: Ian Campbell <Ian.Campbell(a)citrix.com> Acked-by: George Dunlap <george.dunlap(a)eu.citrix.com> Acked-by: Ian Campbell <ian.campbell(a)citrix.com> --- v2: Fix whitespace error (reintroduce hard tab) Fix commit message not to claim ignorance about root cause Index: xen-4.4.0-testing/tools/console/client/main.c =================================================================== --- xen-4.4.0-testing.orig/tools/console/client/main.c +++ xen-4.4.0-testing/tools/console/client/main.c @@ -258,6 +258,13 @@ typedef enum { CONSOLE_SERIAL, } console_type; +static struct termios stdin_old_attr; + +static void restore_term_stdin(void) +{ + restore_term(STDIN_FILENO, &stdin_old_attr); +} + int main(int argc, char **argv) { struct termios attr; @@ -384,9 +391,9 @@ int main(int argc, char **argv) } init_term(spty, &attr); - init_term(STDIN_FILENO, &attr); + init_term(STDIN_FILENO, &stdin_old_attr); + atexit(restore_term_stdin); /* if this fails, oh dear */ console_loop(spty, xs, path); - restore_term(STDIN_FILENO, &attr); free(path); free(dom_path); ++++++ 53299d8f-xenconsole-tolerate-tty-errors.patch ++++++ Subject: tools/console: xenconsole tolerate tty errors From: Ian Jackson ian.jackson(a)eu.citrix.com Thu Feb 27 17:46:49 2014 +0000 Date: Wed Mar 19 13:37:19 2014 +0000: Git: 39ba2989b10b6a1852e253b204eb010f8e7026f1 Since 28d386fc4341 (XSA-57), libxl writes an empty value for the console tty node, with read-only permission for the guest, when setting up pv console "frontends". (The actual tty value is later set by xenconsoled.) Writing an empty node is not strictly necessary to stop the frontend from writing dangerous values here, but it is a good belt-and-braces approach. Unfortunately this confuses xenconsole. It reads the empty value, and tries to open it as the tty. xenconsole then exits. Fix this by having xenconsole treat an empty value the same way as no value at all. Also, make the error opening the tty be nonfatal: we just print a warning, but do not exit. I think this is helpful in theoretical situations where xenconsole is racing with libxl and/or xenconsoled. Signed-off-by: Ian Jackson <Ian.Jackson(a)eu.citrix.com> Acked-by: Ian Campbell <Ian.Campbell(a)citrix.com> CC: George Dunlap <george.dunlap(a)eu.citrix.com> --- v2: Combine two conditions and move the free Index: xen-4.4.0-testing/tools/console/client/main.c =================================================================== --- xen-4.4.0-testing.orig/tools/console/client/main.c +++ xen-4.4.0-testing/tools/console/client/main.c @@ -115,12 +115,12 @@ static int get_pty_fd(struct xs_handle * /* We only watch for one thing, so no need to * disambiguate: just read the pty path */ pty_path = xs_read(xs, XBT_NULL, path, &len); - if (pty_path != NULL) { + if (pty_path != NULL && pty_path[0] != '\0') { pty_fd = open(pty_path, O_RDWR | O_NOCTTY); if (pty_fd == -1) - err(errno, "Could not open tty `%s'", pty_path); - free(pty_path); + warn("Could not open tty `%s'", pty_path); } + free(pty_path); } } while (pty_fd == -1 && (now = time(NULL)) < start + seconds); ++++++ 532fff53-x86-fix-determination-of-bit-count-for-struct-domain-allocations.patch ++++++ # Commit b3d2f8b2cba9fce5bc8995612d0d13fcefec7769 # Date 2014-03-24 10:48:03 +0100 # Author Jan Beulich <jbeulich(a)suse.com> # Committer Jan Beulich <jbeulich(a)suse.com> x86: fix determination of bit count for struct domain allocations We can't just add in the hole shift value, as the hole may be at or above the 44-bit boundary. Instead we need to determine the total bit count until reaching 32 significant (not squashed out) bits in PFN representations. Signed-off-by: Jan Beulich <jbeulich(a)suse.com> Acked-by: Keir Fraser <keir(a)xen.org> --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -180,6 +180,28 @@ void dump_pageframe_info(struct domain * spin_unlock(&d->page_alloc_lock); } +/* + * The hole may be at or above the 44-bit boundary, so we need to determine + * the total bit count until reaching 32 significant (not squashed out) bits + * in PFN representations. + * Note that the way "bits" gets initialized/updated/bounds-checked guarantees + * that the function will never return zero, and hence will never be called + * more than once (which is important due to it being deliberately placed in + * .init.text). + */ +static unsigned int __init noinline _domain_struct_bits(void) +{ + unsigned int bits = 32 + PAGE_SHIFT; + unsigned int sig = hweight32(~pfn_hole_mask); + unsigned int mask = pfn_hole_mask >> 32; + + for ( ; bits < BITS_PER_LONG && sig < 32; ++bits, mask >>= 1 ) + if ( !(mask & 1) ) + ++sig; + + return bits; +} + struct domain *alloc_domain_struct(void) { struct domain *d; @@ -187,7 +209,10 @@ struct domain *alloc_domain_struct(void) * We pack the PDX of the domain structure into a 32-bit field within * the page_info structure. Hence the MEMF_bits() restriction. */ - unsigned int bits = 32 + PAGE_SHIFT + pfn_pdx_hole_shift; + static unsigned int __read_mostly bits; + + if ( unlikely(!bits) ) + bits = _domain_struct_bits(); BUILD_BUG_ON(sizeof(*d) > PAGE_SIZE); d = alloc_xenheap_pages(0, MEMF_bits(bits)); ++++++ 5331917d-x86-enforce-preemption-in-HVM_set_mem_access-p2m_set_mem_access.patch ++++++ References: bnc#867910 CVE-2014-2599 XSA-89 # Commit 0fe53c4f279e1a8ef913e71ed000236d21ce96de # Date 2014-03-25 15:23:57 +0100 # Author Jan Beulich <jbeulich(a)suse.com> # Committer Jan Beulich <jbeulich(a)suse.com> x86: enforce preemption in HVM_set_mem_access / p2m_set_mem_access() Processing up to 4G PFNs may take almost arbitrarily long, so preemption is needed here. This is CVE-2014-2599 / XSA-89. Signed-off-by: Jan Beulich <jbeulich(a)suse.com> Reviewed-by: Tim Deegan <tim(a)xen.org> --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -4465,6 +4465,15 @@ long do_hvm_op(unsigned long op, XEN_GUE goto param_fail5; rc = p2m_set_mem_access(d, a.first_pfn, a.nr, a.hvmmem_access); + if ( rc > 0 ) + { + a.first_pfn += a.nr - rc; + a.nr = rc; + if ( __copy_to_guest(arg, &a, 1) ) + rc = -EFAULT; + else + rc = -EAGAIN; + } param_fail5: rcu_unlock_domain(d); --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1366,15 +1366,14 @@ void p2m_mem_access_resume(struct domain /* Set access type for a region of pfns. * If start_pfn == -1ul, sets the default access type */ -int p2m_set_mem_access(struct domain *d, unsigned long start_pfn, - uint32_t nr, hvmmem_access_t access) +long p2m_set_mem_access(struct domain *d, unsigned long pfn, uint32_t nr, + hvmmem_access_t access) { struct p2m_domain *p2m = p2m_get_hostp2m(d); - unsigned long pfn; p2m_access_t a, _a; p2m_type_t t; mfn_t mfn; - int rc = 0; + long rc; /* N.B. _not_ static: initializer depends on p2m->default_access */ p2m_access_t memaccess[] = { @@ -1397,14 +1396,17 @@ int p2m_set_mem_access(struct domain *d, a = memaccess[access]; /* If request to set default access */ - if ( start_pfn == ~0ull ) + if ( pfn == ~0ul ) { p2m->default_access = a; return 0; } + if ( !nr ) + return 0; + p2m_lock(p2m); - for ( pfn = start_pfn; pfn < start_pfn + nr; pfn++ ) + for ( ; ; ++pfn ) { mfn = p2m->get_entry(p2m, pfn, &t, &_a, 0, NULL); if ( p2m->set_entry(p2m, pfn, mfn, PAGE_ORDER_4K, t, a) == 0 ) @@ -1412,6 +1414,13 @@ int p2m_set_mem_access(struct domain *d, rc = -ENOMEM; break; } + + /* Check for continuation if it's not the last interation. */ + if ( !--nr || hypercall_preempt_check() ) + { + rc = nr; + break; + } } p2m_unlock(p2m); return rc; --- a/xen/include/asm-x86/p2m.h +++ b/xen/include/asm-x86/p2m.h @@ -576,8 +576,8 @@ void p2m_mem_access_resume(struct domain /* Set access type for a region of pfns. * If start_pfn == -1ul, sets the default access type */ -int p2m_set_mem_access(struct domain *d, unsigned long start_pfn, - uint32_t nr, hvmmem_access_t access); +long p2m_set_mem_access(struct domain *d, unsigned long start_pfn, + uint32_t nr, hvmmem_access_t access); /* Get access type for a pfn * If pfn == -1ul, gets the default access type */ ++++++ 53356c1e-x86-HVM-correct-CPUID-leaf-80000008-handling.patch ++++++ # Commit ef437690af8b75e6758dce77af75a22b63982883 # Date 2014-03-28 13:33:34 +0100 # Author Jan Beulich <jbeulich(a)suse.com> # Committer Jan Beulich <jbeulich(a)suse.com> x86/HVM: correct CPUID leaf 80000008 handling CPUID[80000008].EAX[23:16] have been given the meaning of the guest physical address restriction (in case it needs to be smaller than the host's), hence we need to mirror that into vCPUID[80000008].EAX[7:0]. Enforce a lower limit at the same time, as well as a fixed value for the virtual address bits, and zero for the guest physical address ones. In order for the vMTRR code to see these overrides we need to make it call hvm_cpuid() instead of domain_cpuid(), which in turn requires special casing (and relaxing) the controlling domain. This additionally should hide an ordering problem in the tools: Both xend and xl appear to be restoring a guest from its image before setting up the CPUID policy in the hypervisor, resulting in domain_cpuid() returning all zeros and hence the check in mtrr_var_range_msr_set() failing if the guest previously had more than the minimum 36 physical address bits. Signed-off-by: Jan Beulich <jbeulich(a)suse.com> Reviewed-by: Tim Deegan <tim(a)xen.org> --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2885,6 +2885,8 @@ void hvm_cpuid(unsigned int input, unsig switch ( input ) { + unsigned int sub_leaf, _eax, _ebx, _ecx, _edx; + case 0x1: /* Fix up VLAPIC details. */ *ebx &= 0x00FFFFFFu; @@ -2918,8 +2920,6 @@ void hvm_cpuid(unsigned int input, unsig *edx = v->vcpu_id * 2; break; case 0xd: - { - unsigned int sub_leaf, _eax, _ebx, _ecx, _edx; /* EBX value of main leaf 0 depends on enabled xsave features */ if ( count == 0 && v->arch.xcr0 ) { @@ -2936,7 +2936,7 @@ void hvm_cpuid(unsigned int input, unsig } } break; - } + case 0x80000001: /* We expose RDTSCP feature to guest only when tsc_mode == TSC_MODE_DEFAULT and host_tsc_is_safe() returns 1 */ @@ -2950,6 +2950,23 @@ void hvm_cpuid(unsigned int input, unsig if ( !(hvm_pae_enabled(v) || hvm_long_mode_enabled(v)) ) *edx &= ~cpufeat_mask(X86_FEATURE_PSE36); break; + + case 0x80000008: + count = cpuid_eax(0x80000008); + count = (count >> 16) & 0xff ?: count & 0xff; + if ( (*eax & 0xff) > count ) + *eax = (*eax & ~0xff) | count; + + hvm_cpuid(1, NULL, NULL, NULL, &_edx); + count = _edx & (cpufeat_mask(X86_FEATURE_PAE) | + cpufeat_mask(X86_FEATURE_PSE36)) ? 36 : 32; + if ( (*eax & 0xff) < count ) + *eax = (*eax & ~0xff) | count; + + hvm_cpuid(0x80000001, NULL, NULL, NULL, &_edx); + *eax = (*eax & ~0xffff00) | (_edx & cpufeat_mask(X86_FEATURE_LM) + ? 0x3000 : 0x2000); + break; } } --- a/xen/arch/x86/hvm/mtrr.c +++ b/xen/arch/x86/hvm/mtrr.c @@ -145,7 +145,7 @@ bool_t is_var_mtrr_overlapped(struct mtr static int hvm_mtrr_pat_init(void) { - unsigned int i, j, phys_addr; + unsigned int i, j; memset(&mtrr_epat_tbl, INVALID_MEM_TYPE, sizeof(mtrr_epat_tbl)); for ( i = 0; i < MTRR_NUM_TYPES; i++ ) @@ -172,11 +172,7 @@ static int hvm_mtrr_pat_init(void) } } - phys_addr = 36; - if ( cpuid_eax(0x80000000) >= 0x80000008 ) - phys_addr = (uint8_t)cpuid_eax(0x80000008); - - size_or_mask = ~((1 << (phys_addr - PAGE_SHIFT)) - 1); + size_or_mask = ~((1 << (paddr_bits - PAGE_SHIFT)) - 1); return 0; } @@ -455,7 +451,7 @@ bool_t mtrr_fix_range_msr_set(struct mtr bool_t mtrr_var_range_msr_set( struct domain *d, struct mtrr_state *m, uint32_t msr, uint64_t msr_content) { - uint32_t index, type, phys_addr, eax, ebx, ecx, edx; + uint32_t index, type, phys_addr, eax; uint64_t msr_mask; uint64_t *var_range_base = (uint64_t*)m->var_ranges; @@ -468,16 +464,21 @@ bool_t mtrr_var_range_msr_set( type == 4 || type == 5 || type == 6)) ) return 0; - phys_addr = 36; - domain_cpuid(d, 0x80000000, 0, &eax, &ebx, &ecx, &edx); - if ( eax >= 0x80000008 ) + if ( d == current->domain ) { - domain_cpuid(d, 0x80000008, 0, &eax, &ebx, &ecx, &edx); - phys_addr = (uint8_t)eax; + phys_addr = 36; + hvm_cpuid(0x80000000, &eax, NULL, NULL, NULL); + if ( eax >= 0x80000008 ) + { + hvm_cpuid(0x80000008, &eax, NULL, NULL, NULL); + phys_addr = (uint8_t)eax; + } } + else + phys_addr = paddr_bits; msr_mask = ~((((uint64_t)1) << phys_addr) - 1); msr_mask |= (index & 1) ? 0x7ffUL : 0xf00UL; - if ( unlikely(msr_content && (msr_content & msr_mask)) ) + if ( unlikely(msr_content & msr_mask) ) { HVM_DBG_LOG(DBG_LEVEL_MSR, "invalid msr content:%"PRIx64"\n", msr_content); ++++++ 533ad1ee-VMX-fix-PAT-value-seen-by-guest.patch ++++++ # Commit fce79f8ce91dc45f3a4d699ee67c49e6cbeb1197 # Date 2014-04-01 16:49:18 +0200 # Author Jan Beulich <jbeulich(a)suse.com> # Committer Jan Beulich <jbeulich(a)suse.com> VMX: fix PAT value seen by guest The XSA-60 fixes introduced a window during which the guest PAT gets forced to all zeros. This shouldn't be visible to the guest. Therefore we need to intercept PAT MSR accesses during that time period. Signed-off-by: Jan Beulich <jbeulich(a)suse.com> Reviewed-by: Liu Jinsong <jinsong.liu(a)intel.com> --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -984,6 +984,8 @@ static void vmx_handle_cd(struct vcpu *v vmx_get_guest_pat(v, pat); vmx_set_guest_pat(v, uc_pat); + vmx_enable_intercept_for_msr(v, MSR_IA32_CR_PAT, + MSR_TYPE_R | MSR_TYPE_W); wbinvd(); /* flush possibly polluted cache */ hvm_asid_flush_vcpu(v); /* invalidate memory type cached in TLB */ @@ -993,6 +995,9 @@ static void vmx_handle_cd(struct vcpu *v { v->arch.hvm_vcpu.cache_mode = NORMAL_CACHE_MODE; vmx_set_guest_pat(v, *pat); + if ( !iommu_enabled || iommu_snoop ) + vmx_disable_intercept_for_msr(v, MSR_IA32_CR_PAT, + MSR_TYPE_R | MSR_TYPE_W); hvm_asid_flush_vcpu(v); /* no need to flush cache */ } } ++++++ 533d413b-x86-mm-fix-checks-against-max_mapped_pfn.patch ++++++ # Commit 088ee1d47b65d6bb92de61b404805f4ca92e3240 # Date 2014-04-03 12:08:43 +0100 # Author Jan Beulich <JBeulich(a)suse.com> # Committer Tim Deegan <tim(a)xen.org> x86/mm: fix checks against max_mapped_pfn This value is an inclusive one, i.e. this fixes an off-by-one in memory sharing and an off-by-two in shadow code. Signed-off-by: Jan Beulich <jbeulich(a)suse.com> Reviewed-by: Tim Deegan <tim(a)xen.org> --- a/xen/arch/x86/mm/mem_sharing.c +++ b/xen/arch/x86/mm/mem_sharing.c @@ -1268,8 +1268,8 @@ int relinquish_shared_pages(struct domai return 0; p2m_lock(p2m); - for (gfn = p2m->next_shared_gfn_to_relinquish; - gfn < p2m->max_mapped_pfn; gfn++ ) + for ( gfn = p2m->next_shared_gfn_to_relinquish; + gfn <= p2m->max_mapped_pfn; gfn++ ) { p2m_access_t a; p2m_type_t t; --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -3489,9 +3489,7 @@ int shadow_track_dirty_vram(struct domai struct sh_dirty_vram *dirty_vram = d->arch.hvm_domain.dirty_vram; struct p2m_domain *p2m = p2m_get_hostp2m(d); - if (end_pfn < begin_pfn - || begin_pfn > p2m->max_mapped_pfn - || end_pfn >= p2m->max_mapped_pfn) + if ( end_pfn < begin_pfn || end_pfn > p2m->max_mapped_pfn + 1 ) return -EINVAL; /* We perform p2m lookups, so lock the p2m upfront to avoid deadlock */ ++++++ qemu-xen-upstream-megasas-buildtime.patch ++++++ Causes rebuilds. Says rpmlint. --- tools/qemu-xen-dir-remote/hw/scsi/megasas.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: xen-4.4.0-testing/tools/qemu-xen-dir-remote/hw/scsi/megasas.c =================================================================== --- xen-4.4.0-testing.orig/tools/qemu-xen-dir-remote/hw/scsi/megasas.c +++ xen-4.4.0-testing/tools/qemu-xen-dir-remote/hw/scsi/megasas.c @@ -712,8 +712,8 @@ static int megasas_ctrl_get_info(Megasas snprintf(info.package_version, 0x60, "%s-QEMU", QEMU_VERSION); memcpy(info.image_component[0].name, "APP", 3); memcpy(info.image_component[0].version, MEGASAS_VERSION "-QEMU", 9); - memcpy(info.image_component[0].build_date, __DATE__, 11); - memcpy(info.image_component[0].build_time, __TIME__, 8); + memcpy(info.image_component[0].build_date, "Apr 1 2014", 11); + memcpy(info.image_component[0].build_time, "12:34:56", 8); info.image_component_count = 1; if (pci_dev->has_rom) { uint8_t biosver[32]; ++++++ xen2libvirt.py ++++++ --- /var/tmp/diff_new_pack.tVefOJ/_old 2014-04-16 07:44:11.000000000 +0200 +++ /var/tmp/diff_new_pack.tVefOJ/_new 2014-04-16 07:44:11.000000000 +0200 @@ -1,113 +1,113 @@ -#!/usr/bin/env python -# -# Copyright (C) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library. If not, see -# <http://www.gnu.org/licenses/>. -# -# Authors: -# Jim Fehlig <jfehlig(a)suse.com> -# -# Read native Xen configuration format, convert to libvirt domXML, and -# import (virsh define <xml>) into libvirt. - -import sys -import os -import argparse -import re - -try: - import libvirt -except ImportError: - print 'Unable to import the libvirt module. Is libvirt-python installed?' - sys.exit(1) - -parser = argparse.ArgumentParser(description='Import Xen domain configuration into libvirt') -parser.add_argument('-c', '--convert-only', help='Convert Xen domain configuration into libvirt domXML, but do not import into libvirt', action='store_true', dest='convert_only') -parser.add_argument('-r', '--recursive', help='Operate recursivelly on all Xen domain configuration rooted at path', action='store_true') -parser.add_argument('-f', '--format', help='Format of Xen domain configuration. Supported formats are xm and sexpr', choices=['xm', 'sexpr'], default=None) -parser.add_argument('-v', '--verbose', help='Print information about the import process', action='store_true') -parser.add_argument('path', help='Path to Xen domain configuration') - - -def print_verbose(msg): - if args.verbose: - print msg - - -def check_config(path, config): - isbinary = os.system('file -b ' + path + ' | grep text > /dev/null') - - if isbinary: - print 'File %s is not a text file containing Xen xm or sexpr configuration' - sys.exit(1) - - if config.find('$domain'): - return 'sexpr' - return 'xm' - - -def import_domain(conn, path, format=None, convert_only=False): - - f = open(path, 'r') - config = f.read() - print_verbose('Xen domain configuration read from %s:\n %s' % (path, config)) - if format is None: - format = check_config(path, config) - - if format == 'sexpr': - print_verbose('scrubbing domin from configuration') - config = re.sub("\(domid [0-9]*$", "", config) - print_verbose('scrubbed sexpr:\n %s' % config) - xml = conn.domainXMLFromNative('xen-sxpr', config, 0) - else: - # if format != sexpr, try xm - xml = conn.domainXMLFromNative('xen-xm', config, 0) - - f.close() - - print_verbose('Successfully converted Xen domain configuration to ' - 'libvirt domXML:\n %s' % xml) - if convert_only: - print xml - else: - print_verbose('Importing converted libvirt domXML into libvirt...') - dom = conn.defineXML(xml) - if dom is None: - print 'Failed to define domain from converted domXML' - sys.exit(1) - print_verbose('domXML successfully imported into libvirt') - - -args = parser.parse_args() -path = args.path - -# Connect to libvirt -conn = libvirt.open(None) -if conn is None: - print('Failed to open connection to the hypervisor') - sys.exit(1) - -if args.recursive: - try: - for root, dirs, files in os.walk(path): - for name in files: - abs_name = os.path.join(root, name) - print_verbose('Processing file %s' % abs_name) - import_domain(conn, abs_name, args.format, args.convert_only) - except IOError: - print('Failed to open/read path %s' % path) - sys.exit(1) -else: - import_domain(conn, args.path, args.format, args.convert_only) +#!/usr/bin/env python +# +# Copyright (C) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library. If not, see +# <http://www.gnu.org/licenses/>. +# +# Authors: +# Jim Fehlig <jfehlig(a)suse.com> +# +# Read native Xen configuration format, convert to libvirt domXML, and +# import (virsh define <xml>) into libvirt. + +import sys +import os +import argparse +import re + +try: + import libvirt +except ImportError: + print 'Unable to import the libvirt module. Is libvirt-python installed?' + sys.exit(1) + +parser = argparse.ArgumentParser(description='Import Xen domain configuration into libvirt') +parser.add_argument('-c', '--convert-only', help='Convert Xen domain configuration into libvirt domXML, but do not import into libvirt', action='store_true', dest='convert_only') +parser.add_argument('-r', '--recursive', help='Operate recursivelly on all Xen domain configuration rooted at path', action='store_true') +parser.add_argument('-f', '--format', help='Format of Xen domain configuration. Supported formats are xm and sexpr', choices=['xm', 'sexpr'], default=None) +parser.add_argument('-v', '--verbose', help='Print information about the import process', action='store_true') +parser.add_argument('path', help='Path to Xen domain configuration') + + +def print_verbose(msg): + if args.verbose: + print msg + + +def check_config(path, config): + isbinary = os.system('file -b ' + path + ' | grep text > /dev/null') + + if isbinary: + print 'File %s is not a text file containing Xen xm or sexpr configuration' + sys.exit(1) + + if config.find('$domain'): + return 'sexpr' + return 'xm' + + +def import_domain(conn, path, format=None, convert_only=False): + + f = open(path, 'r') + config = f.read() + print_verbose('Xen domain configuration read from %s:\n %s' % (path, config)) + if format is None: + format = check_config(path, config) + + if format == 'sexpr': + print_verbose('scrubbing domin from configuration') + config = re.sub("\(domid [0-9]*$", "", config) + print_verbose('scrubbed sexpr:\n %s' % config) + xml = conn.domainXMLFromNative('xen-sxpr', config, 0) + else: + # if format != sexpr, try xm + xml = conn.domainXMLFromNative('xen-xm', config, 0) + + f.close() + + print_verbose('Successfully converted Xen domain configuration to ' + 'libvirt domXML:\n %s' % xml) + if convert_only: + print xml + else: + print_verbose('Importing converted libvirt domXML into libvirt...') + dom = conn.defineXML(xml) + if dom is None: + print 'Failed to define domain from converted domXML' + sys.exit(1) + print_verbose('domXML successfully imported into libvirt') + + +args = parser.parse_args() +path = args.path + +# Connect to libvirt +conn = libvirt.open(None) +if conn is None: + print('Failed to open connection to the hypervisor') + sys.exit(1) + +if args.recursive: + try: + for root, dirs, files in os.walk(path): + for name in files: + abs_name = os.path.join(root, name) + print_verbose('Processing file %s' % abs_name) + import_domain(conn, abs_name, args.format, args.convert_only) + except IOError: + print('Failed to open/read path %s' % path) + sys.exit(1) +else: + import_domain(conn, args.path, args.format, args.convert_only) ++++++ xenconsole-no-multiple-connections.patch ++++++ --- /var/tmp/diff_new_pack.tVefOJ/_old 2014-04-16 07:44:11.000000000 +0200 +++ /var/tmp/diff_new_pack.tVefOJ/_new 2014-04-16 07:44:11.000000000 +0200 @@ -10,16 +10,18 @@ fd_set watch_fdset; int xs_fd = xs_fileno(xs), pty_fd = -1; int start, now; -@@ -119,6 +120,12 @@ static int get_pty_fd(struct xs_handle * +@@ -119,6 +120,14 @@ static int get_pty_fd(struct xs_handle * pty_fd = open(pty_path, O_RDWR | O_NOCTTY); if (pty_fd == -1) - err(errno, "Could not open tty `%s'", pty_path); -+ memset(&lock, 0, sizeof(lock)); -+ lock.l_type = F_WRLCK; -+ lock.l_whence = SEEK_SET; -+ if (fcntl(pty_fd, F_SETLK, &lock) != 0) -+ err(errno, "Could not lock tty '%s'", -+ pty_path); - free(pty_path); + warn("Could not open tty `%s'", pty_path); ++ else { ++ memset(&lock, 0, sizeof(lock)); ++ lock.l_type = F_WRLCK; ++ lock.l_whence = SEEK_SET; ++ if (fcntl(pty_fd, F_SETLK, &lock) != 0) ++ err(errno, "Could not lock tty '%s'", ++ pty_path); ++ } } + free(pty_path); } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit suse-xsl-stylesheets for openSUSE:Factory
by root＠hilbert.suse.de 16 Apr '14

16 Apr '14

Hello community, here is the log from the commit of package suse-xsl-stylesheets for openSUSE:Factory checked in at 2014-04-16 07:43:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/suse-xsl-stylesheets (Old) and /work/SRC/openSUSE:Factory/.suse-xsl-stylesheets.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "suse-xsl-stylesheets" Changes: -------- --- /work/SRC/openSUSE:Factory/suse-xsl-stylesheets/suse-xsl-stylesheets.changes 2014-01-14 21:52:04.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.suse-xsl-stylesheets.new/suse-xsl-stylesheets.changes 2014-04-16 07:43:59.000000000 +0200 @@ -1,0 +2,19 @@ +Tue Apr 15 11:14:36 UTC 2014 - rsalevsky(a)suse.com + +Version 2.0~beta3: + +- 2013 Stylesheets + * PDF output: Hyphenate URLs as workaround for FOP issue (daps#135) + * HTML output: When using --meta, output only one file name per + information box + * HTML output: Support for os="hidden" + * HTML output: light frames for figures + +- 2005 Stylesheets: + * HTML output: When using --meta, multiple file names would sometimes + erroneously be output in the information boxes + +- Novdoc: + * Add some basic missing attributes to uri element + +------------------------------------------------------------------- Old: ---- suse-xsl-stylesheets-2.0~beta2.tar.bz2 New: ---- suse-xsl-stylesheets-2.0~beta3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ suse-xsl-stylesheets.spec ++++++ --- /var/tmp/diff_new_pack.XjIzHj/_old 2014-04-16 07:44:00.000000000 +0200 +++ /var/tmp/diff_new_pack.XjIzHj/_new 2014-04-16 07:44:00.000000000 +0200 @@ -17,7 +17,7 @@ Name: suse-xsl-stylesheets -Version: 2.0~beta2 +Version: 2.0~beta3 Release: 0 ############################################################### ++++++ suse-xsl-stylesheets-2.0~beta2.tar.bz2 -> suse-xsl-stylesheets-2.0~beta3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/suse-xsl-stylesheets/schema/novdocx.dtd new/suse-xsl-stylesheets/schema/novdocx.dtd --- old/suse-xsl-stylesheets/schema/novdocx.dtd 2013-12-16 14:32:27.000000000 +0100 +++ new/suse-xsl-stylesheets/schema/novdocx.dtd 2014-03-13 10:43:54.000000000 +0100 @@ -1006,6 +1006,12 @@ %profiling.attributes; %xmlbase;> +<!ATTLIST uri + type CDATA #IMPLIED + role CDATA #IMPLIED + %profiling.attributes; + %xmlbase;> + <!ATTLIST variablelist id ID #IMPLIED %profiling.attributes; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/suse-xsl-stylesheets/xslt2005/xhtml/sections.xsl new/suse-xsl-stylesheets/xslt2005/xhtml/sections.xsl --- old/suse-xsl-stylesheets/xslt2005/xhtml/sections.xsl 2012-04-11 13:10:06.000000000 +0200 +++ new/suse-xsl-stylesheets/xslt2005/xhtml/sections.xsl 2014-03-20 14:50:58.000000000 +0100 @@ -19,7 +19,7 @@ self::sect1 or self::sect2 or self::sect3 or - self::sect4]/@xml:base"/> + self::sect4][1]/@xml:base"/> <xsl:if test="$draft.mode = 'yes' and $xmlbase != ''"> <div class="filenameblock"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/suse-xsl-stylesheets/xslt2013/fo/docbook.xsl new/suse-xsl-stylesheets/xslt2013/fo/docbook.xsl --- old/suse-xsl-stylesheets/xslt2013/fo/docbook.xsl 2013-12-16 16:18:23.000000000 +0100 +++ new/suse-xsl-stylesheets/xslt2013/fo/docbook.xsl 2014-03-10 11:47:56.000000000 +0100 @@ -54,12 +54,12 @@ <xsl:include href="admon.xsl"/> <xsl:include href="component.xsl"/> <xsl:include href="block.xsl"/> + <xsl:include href="hyphenate-url.xsl"/> <xsl:include href="titlepage.xsl"/> <xsl:include href="titlepage.templates.xsl"/> <xsl:include href="pagesetup.xsl"/> - <xsl:include href="lists.xsl"/> <xsl:include href="l10n.properties.xsl"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/suse-xsl-stylesheets/xslt2013/fo/formal.xsl new/suse-xsl-stylesheets/xslt2013/fo/formal.xsl --- old/suse-xsl-stylesheets/xslt2013/fo/formal.xsl 2013-09-03 19:09:41.000000000 +0200 +++ new/suse-xsl-stylesheets/xslt2013/fo/formal.xsl 2014-01-29 15:29:25.000000000 +0100 @@ -22,6 +22,112 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format"> +  + <xsl:template name="formal.object"> + <xsl:param name="placement" select="'before'"/> + + <xsl:variable name="id"> + <xsl:call-template name="object.id"/> + </xsl:variable> + + <xsl:variable name="content"> + <xsl:if test="$placement = 'before'"> + <xsl:call-template name="formal.object.heading"> + <xsl:with-param name="placement" select="$placement"/> + </xsl:call-template> + </xsl:if> + <fo:block> +  + <xsl:if test="self::example"> + <xsl:if test="glosslist|bibliolist|itemizedlist|orderedlist| + segmentedlist|simplelist|variablelist|programlistingco| + screenco|screenshot|cmdsynopsis|funcsynopsis| + classsynopsis|fieldsynopsis|constructorsynopsis| + destructorsynopsis|methodsynopsis|formalpara|para| + simpara|address|blockquote|graphicco|mediaobjectco| + indexterm|beginpage"> + <xsl:attribute name="border-left" + ><xsl:value-of select="&mediumline;"/>mm solid &light-gray;</xsl:attribute> + <xsl:attribute name="margin-left" + ><xsl:value-of select="&mediumline; div 2"/>mm</xsl:attribute> +  + <xsl:attribute name="padding-left" + ><xsl:value-of select="&columnfragment;"/>mm</xsl:attribute> + </xsl:if> + </xsl:if> + <xsl:apply-templates/> + </fo:block> + <xsl:if test="$placement != 'before'"> + <xsl:call-template name="formal.object.heading"> + <xsl:with-param name="placement" select="$placement"/> + </xsl:call-template> + </xsl:if> + </xsl:variable> + + <xsl:variable name="keep.together"> + <xsl:call-template name="pi.dbfo_keep-together"/> + </xsl:variable> + + <xsl:choose> +  + <xsl:when test="self::figure"> + <fo:block id="{$id}" + xsl:use-attribute-sets="figure.properties"> + <xsl:if test="$keep.together != ''"> + <xsl:attribute name="keep-together.within-column"><xsl:value-of + select="$keep.together"/></xsl:attribute> + </xsl:if> + <xsl:copy-of select="$content"/> + </fo:block> + </xsl:when> + <xsl:when test="self::example"> + <fo:block id="{$id}" + xsl:use-attribute-sets="example.properties"> + <xsl:if test="$keep.together != ''"> + <xsl:attribute name="keep-together.within-column"><xsl:value-of + select="$keep.together"/></xsl:attribute> + </xsl:if> + <xsl:copy-of select="$content"/> + </fo:block> + </xsl:when> + <xsl:when test="self::equation"> + <fo:block id="{$id}" + xsl:use-attribute-sets="equation.properties"> + <xsl:if test="$keep.together != ''"> + <xsl:attribute name="keep-together.within-column"><xsl:value-of + select="$keep.together"/></xsl:attribute> + </xsl:if> + <xsl:copy-of select="$content"/> + </fo:block> + </xsl:when> + <xsl:when test="self::procedure"> + <fo:block id="{$id}" + xsl:use-attribute-sets="procedure.properties"> + <xsl:if test="$keep.together != ''"> + <xsl:attribute name="keep-together.within-column"><xsl:value-of + select="$keep.together"/></xsl:attribute> + </xsl:if> + <xsl:copy-of select="$content"/> + </fo:block> + </xsl:when> + <xsl:otherwise> + <fo:block id="{$id}" + xsl:use-attribute-sets="formal.object.properties"> + <xsl:if test="$keep.together != ''"> + <xsl:attribute name="keep-together.within-column"><xsl:value-of + select="$keep.together"/></xsl:attribute> + </xsl:if> + <xsl:copy-of select="$content"/> + </fo:block> + </xsl:otherwise> + </xsl:choose> + </xsl:template> + <xsl:template match="procedure|example|table|figure|variablelist|itemizedlist|orderedlist" mode="object.label.template"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/suse-xsl-stylesheets/xslt2013/fo/hyphenate-url.xsl new/suse-xsl-stylesheets/xslt2013/fo/hyphenate-url.xsl --- old/suse-xsl-stylesheets/xslt2013/fo/hyphenate-url.xsl 1970-01-01 01:00:00.000000000 +0100 +++ new/suse-xsl-stylesheets/xslt2013/fo/hyphenate-url.xsl 2014-03-10 11:47:56.000000000 +0100 @@ -0,0 +1,188 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE xsl:stylesheet > +<xsl:stylesheet version="1.0" + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:fo="http://www.w3.org/1999/XSL/Format"> + + +<xsl:template name="hyphenate-url"> + <xsl:param name="url" select="''"/> + <xsl:param name="removestartslash" select="true()"/> + <xsl:param name="removeendslash" select="true()"/> + <xsl:param name="insertendslash" select="false()"/> + + <xsl:variable name="normalurl" select="normalize-space($url)"/> + +  + <xsl:variable name="A" select="starts-with($url, '/') and + $removestartslash and $normalurl != '/'"/> + <xsl:variable name="B" select="(substring($url, string-length($url), 1) = '/') + and $removeendslash and $normalurl != '/'"/> + <xsl:variable name="len" select="string-length($normalurl)"/> + + + + + + <xsl:choose> +  + <xsl:when test="$ulink.hyphenate = '' or $fop1.extensions != 0"> + <xsl:value-of select="$normalurl"/> + </xsl:when> + +  + <xsl:when test="contains($normalurl, '://') and + (string-length($normalurl) - + string-length(substring-before($normalurl,'://'))) + = 3 + "> + <xsl:copy-of select="$normalurl"/> + </xsl:when> + + +  + <xsl:when test="contains($normalurl, '://')"> + <xsl:variable name="schema" select="substring-before($normalurl,'://')"/> + <xsl:variable name="core" select="substring($normalurl, + string-length(substring-before($normalurl, '://'))+4, + $len - string-length($schema) -3 - $B)"/> + <xsl:value-of select="$schema"/> + <xsl:text>://</xsl:text> + <xsl:copy-of select="$ulink.hyphenate"/> + <xsl:call-template name="hyphenate-url-string"> + <xsl:with-param name="url" select="$core"/> + </xsl:call-template> + <xsl:if test="$B or $insertendslash"> + <xsl:text>/</xsl:text> + </xsl:if> + </xsl:when> + + <xsl:otherwise> + <xsl:if test="$A"> + <xsl:text>/</xsl:text> + </xsl:if> + <xsl:call-template name="hyphenate-url-string"> + <xsl:with-param name="url" + select="substring($normalurl, + $A +1, + string-length($normalurl) - $A - $B)"/> + </xsl:call-template> + <xsl:if test="$B"> + <xsl:text>/</xsl:text> + </xsl:if> + </xsl:otherwise> + </xsl:choose> +</xsl:template> + + +<xsl:template name="hyphenate-url-string"> + <xsl:param name="url" select="''"/> + <xsl:variable name="char" select="substring($url,1,1)"/> + + <xsl:choose> + <xsl:when test="$url=''"/> + +  + <xsl:when test="contains($ulink.hyphenate.before.chars, $char)"> + <xsl:value-of select="concat($ulink.hyphenate, $char)"/> + <xsl:call-template name="hyphenate-url-string"> + <xsl:with-param name="url" select="substring($url, 2)"/> + </xsl:call-template> + </xsl:when> + +  + <xsl:when test="contains($ulink.hyphenate.after.chars, $char)"> + <xsl:value-of select="concat($char, $ulink.hyphenate)"/> + <xsl:call-template name="hyphenate-url-string"> + <xsl:with-param name="url" select="substring($url, 2)"/> + </xsl:call-template> + </xsl:when> + + <xsl:otherwise> + <xsl:value-of select="$char"/> + <xsl:call-template name="hyphenate-url-string"> + <xsl:with-param name="url" select="substring($url, 2)"/> + </xsl:call-template> + </xsl:otherwise> + </xsl:choose> +</xsl:template> + + + +<xsl:template match="filename" mode="hyphenate-url"> + <xsl:apply-templates mode="hyphenate-url"/> +</xsl:template> + + +<xsl:template match="text()" mode="hyphenate-url"> + <xsl:call-template name="hyphenate-url"> + <xsl:with-param name="url" select="."/> + </xsl:call-template> +</xsl:template> + + +<xsl:template match="text()[preceding-sibling::replaceable]" mode="hyphenate-url"> + <xsl:call-template name="hyphenate-url"> + <xsl:with-param name="url" select="."/> + <xsl:with-param name="removestartslash" select="false()"/> + </xsl:call-template> +</xsl:template> + + +<xsl:template match="replaceable" mode="hyphenate-url"> + <xsl:call-template name="inline.italicseq"> + <xsl:with-param name="content"> + <xsl:call-template name="hyphenate-url"> + <xsl:with-param name="url"> + <xsl:apply-templates mode="hyphenate-url"/> + </xsl:with-param> + </xsl:call-template> + </xsl:with-param> + </xsl:call-template> +</xsl:template> + + +</xsl:stylesheet> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/suse-xsl-stylesheets/xslt2013/fo/inline.xsl new/suse-xsl-stylesheets/xslt2013/fo/inline.xsl --- old/suse-xsl-stylesheets/xslt2013/fo/inline.xsl 2014-01-14 13:39:00.000000000 +0100 +++ new/suse-xsl-stylesheets/xslt2013/fo/inline.xsl 2014-02-07 13:29:34.000000000 +0100 @@ -30,6 +30,7 @@ xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> + <xsl:template name="inline.monoseq"> <xsl:param name="content"> <xsl:call-template name="simple.xlink"> @@ -39,18 +40,29 @@ </xsl:call-template> </xsl:param> <xsl:param name="purpose" select="'none'"/> - <xsl:param name="mono-ancestor" select="0"/> + <xsl:param name="mode" select="'normal'"/> <xsl:param name="before" select="''"/> <xsl:param name="after" select="''"/> <xsl:variable name="mono-verbatim-ancestor"> - <xsl:if test="$mono-ancestor = 1 or ancestor::screen or + <xsl:if test="$mode = 'mono-ancestor' or ancestor::screen or ancestor::programlisting or ancestor::synopsis">1</xsl:if> </xsl:variable> + <xsl:variable name="underline-color"> + <xsl:choose> + <xsl:when test="(ancestor::title and + not(ancestor::note or ancestor::tip or ancestor::important or + ancestor::warning or ancestor::caution)) or + $purpose = 'xref'"> + <xsl:value-of select="$dark-green"/> + </xsl:when> + <xsl:otherwise>&mid-gray;</xsl:otherwise> + </xsl:choose> + </xsl:variable> <fo:inline xsl:use-attribute-sets="monospace.properties" font-weight="normal" font-style="normal"> <xsl:if test="$mono-verbatim-ancestor != 1"> - <xsl:attribute name="border-bottom">&thinline;mm solid &mid-gray;</xsl:attribute> + <xsl:attribute name="border-bottom">&thinline;mm solid <xsl:value-of select="$underline-color"/></xsl:attribute> <xsl:attribute name="padding-bottom">0.1em</xsl:attribute> </xsl:if> <xsl:choose> @@ -101,18 +113,29 @@ </xsl:call-template> </xsl:param> <xsl:param name="purpose" select="'none'"/> - <xsl:param name="mono-ancestor" select="0"/> + <xsl:param name="mode" select="'normal'"/> <xsl:param name="before" select="''"/> <xsl:param name="after" select="''"/> <xsl:variable name="mono-verbatim-ancestor"> - <xsl:if test="$mono-ancestor = 1 or ancestor::screen or + <xsl:if test="$mode = 'mono-ancestor' or ancestor::screen or ancestor::programlisting or ancestor::synopsis">1</xsl:if> </xsl:variable> + <xsl:variable name="underline-color"> + <xsl:choose> + <xsl:when test="(ancestor::title and + not(ancestor::note or ancestor::tip or ancestor::important or + ancestor::warning or ancestor::caution)) or + $purpose = 'xref'"> + <xsl:value-of select="$dark-green"/> + </xsl:when> + <xsl:otherwise>&mid-gray;</xsl:otherwise> + </xsl:choose> + </xsl:variable> <fo:inline xsl:use-attribute-sets="monospace.properties mono.bold" font-style="normal"> <xsl:if test="$mono-verbatim-ancestor != 1"> - <xsl:attribute name="border-bottom">&thinline;mm solid &mid-gray;</xsl:attribute> + <xsl:attribute name="border-bottom">&thinline;mm solid <xsl:value-of select="$underline-color"/></xsl:attribute> <xsl:attribute name="padding-bottom">0.1em</xsl:attribute> </xsl:if> <xsl:choose> @@ -163,18 +186,29 @@ </xsl:call-template> </xsl:param> <xsl:param name="purpose" select="'none'"/> - <xsl:param name="mono-ancestor" select="0"/> + <xsl:param name="mode" select="'normal'"/> <xsl:param name="before" select="''"/> <xsl:param name="after" select="''"/> <xsl:variable name="mono-verbatim-ancestor"> - <xsl:if test="$mono-ancestor = 1 or ancestor::screen or + <xsl:if test="$mode = 'mono-ancestor' or ancestor::screen or ancestor::programlisting or ancestor::synopsis">1</xsl:if> </xsl:variable> + <xsl:variable name="underline-color"> + <xsl:choose> + <xsl:when test="(ancestor::title and + not(ancestor::note or ancestor::tip or ancestor::important or + ancestor::warning or ancestor::caution)) or + $purpose = 'xref'"> + <xsl:value-of select="$dark-green"/> + </xsl:when> + <xsl:otherwise>&mid-gray;</xsl:otherwise> + </xsl:choose> + </xsl:variable> <fo:inline xsl:use-attribute-sets="monospace.properties italicized" font-weight="normal"> <xsl:if test="$mono-verbatim-ancestor != 1"> - <xsl:attribute name="border-bottom">&thinline;mm solid &mid-gray;</xsl:attribute> + <xsl:attribute name="border-bottom">&thinline;mm solid <xsl:value-of select="$underline-color"/></xsl:attribute> <xsl:attribute name="padding-bottom">0.1em</xsl:attribute> </xsl:if> <xsl:choose> @@ -284,29 +318,33 @@ </xsl:apply-templates> </xsl:template> - + <xsl:template match="command|userinput"> <xsl:param name="purpose" select="'none'"/> + <xsl:param name="mode" select="'normal'"/> <xsl:call-template name="inline.boldmonoseq"> <xsl:with-param name="purpose" select="$purpose"/> + <xsl:with-param name="mode" select="$mode"/> </xsl:call-template> </xsl:template> <xsl:template match="classname|exceptionname|interfacename|methodname |computeroutput|constant|envar|filename|function|literal |code|option|parameter|prompt|systemitem|varname|email|uri - |cmdsynopsis/command|function|literal|package"> + |cmdsynopsis/command|package"> <xsl:param name="purpose" select="'none'"/> + <xsl:param name="mode" select="'normal'"/> <xsl:call-template name="inline.monoseq"> <xsl:with-param name="purpose" select="$purpose"/> + <xsl:with-param name="mode" select="$mode"/> </xsl:call-template> </xsl:template> <xsl:template match="sgmltag|tag" name="sgmltag"> <xsl:param name="purpose" select="'none'"/> - <xsl:param name="mono-ancestor" select="0"/> + <xsl:param name="mode" select="'normal'"/> <xsl:variable name="class"> <xsl:if test="@class"> <xsl:value-of select="@class"/> @@ -339,7 +377,7 @@ <xsl:call-template name="inline.monoseq"> <xsl:with-param name="purpose" select="$purpose"/> - <xsl:with-param name="mono-ancestor" select="$mono-ancestor"/> + <xsl:with-param name="mode" select="$mode"/> <xsl:with-param name="before" select="$before"/> <xsl:with-param name="after" select="$after"/> </xsl:call-template> @@ -347,31 +385,35 @@ <xsl:template match="replaceable|structfield"> <xsl:param name="purpose" select="'none'"/> + <xsl:param name="mode" select="'normal'"/> <xsl:call-template name="inline.italicmonoseq"> <xsl:with-param name="purpose" select="$purpose"/> + <xsl:with-param name="mode" select="$mode"/> </xsl:call-template> </xsl:template> + + <xsl:template match="command|userinput" mode="mono-ancestor"> <xsl:param name="purpose" select="'none'"/> <xsl:call-template name="inline.boldmonoseq"> <xsl:with-param name="purpose" select="$purpose"/> - <xsl:with-param name="mono-ancestor" select="1"/> + <xsl:with-param name="mode" select="'mono-ancestor'"/> </xsl:call-template> </xsl:template> <xsl:template match="classname|exceptionname|interfacename|methodname |computeroutput|constant|envar|filename|function|literal |code|option|parameter|prompt|systemitem|varname|email|uri - |cmdsynopsis/command|function|literal|package" + |cmdsynopsis/command|package" mode="mono-ancestor"> <xsl:param name="purpose" select="'none'"/> <xsl:call-template name="inline.monoseq"> <xsl:with-param name="purpose" select="$purpose"/> - <xsl:with-param name="mono-ancestor" select="1"/> + <xsl:with-param name="mode" select="'mono-ancestor'"/> </xsl:call-template> </xsl:template> @@ -380,7 +422,7 @@ <xsl:call-template name="sgmltag"> <xsl:with-param name="purpose" select="$purpose"/> - <xsl:with-param name="mono-ancestor" select="1"/> + <xsl:with-param name="mode" select="'mono-ancestor'"/> </xsl:call-template> </xsl:template> @@ -390,7 +432,7 @@ <xsl:call-template name="inline.italicmonoseq"> <xsl:with-param name="purpose" select="$purpose"/> - <xsl:with-param name="mono-ancestor" select="1"/> + <xsl:with-param name="mode" select="'mono-ancestor'"/> </xsl:call-template> </xsl:template> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/suse-xsl-stylesheets/xslt2013/fo/param.xsl new/suse-xsl-stylesheets/xslt2013/fo/param.xsl --- old/suse-xsl-stylesheets/xslt2013/fo/param.xsl 2013-12-03 19:01:53.000000000 +0100 +++ new/suse-xsl-stylesheets/xslt2013/fo/param.xsl 2014-03-10 11:47:56.000000000 +0100 @@ -356,4 +356,14 @@ <xsl:param name="titlepage.background.width" ><xsl:value-of select="(&column; * 5) + (&gutter; * 3)"/>mm</xsl:param> + + +<xsl:param name="ulink.hyphenate.before.chars" + >.,%?&#\~+{_-</xsl:param> +<xsl:param name="ulink.hyphenate.after.chars" + >/:@=};</xsl:param> + + </xsl:stylesheet> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/suse-xsl-stylesheets/xslt2013/static/css/style.css new/suse-xsl-stylesheets/xslt2013/static/css/style.css --- old/suse-xsl-stylesheets/xslt2013/static/css/style.css 2013-12-18 14:30:44.000000000 +0100 +++ new/suse-xsl-stylesheets/xslt2013/static/css/style.css 2014-04-14 11:53:11.000000000 +0200 @@ -59,11 +59,7 @@ } #_toolbar-bottom, -#_fixed-header-wrap #_bubble-toc, #_content > .set, #_content > .book, -#_content > .article, #_content > .part, #_content > .chapter, #_content > .preface, -#_content > .appendix, #_content > .glossary, #_content > .reference, -#_content > .refentry, #_content > .bibliography, #_content > .index, -.page-bottom { +#_fixed-header-wrap #_bubble-toc, .documentation, .page-bottom { margin: 0 auto; min-width: 150px; max-width: 978px; @@ -83,11 +79,7 @@ padding-top: 40px; } -#_footer, #_toolbar-bottom, #_content > .set, #_content > .book, -#_content > .article, #_content > .part, #_content > .chapter, -#_content > .preface, #_content > .appendix, #_content > .glossary, -#_content > .reference, #_content > .refentry, #_content > .bibliography, -#_content > .index, #_content > .page-bottom { +#_footer, #_toolbar-bottom, .documentation, .page-bottom { overflow: hidden; } @@ -1173,17 +1165,14 @@ /* .CHAPTER/... AREA */ -#_content > .set, #_content > .book, #_content > .article, #_content > .part, -#_content > .chapter, #_content > .preface, #_content > .appendix, -#_content > .glossary, #_content > .reference, #_content > .refentry, -#_content > .bibliography, #_content > .index { +.documentation { padding: 0 20px; } /* We need to scroll ~30 pixels up, such that the headline won't be hidden by the fixed header. */ /* [attribute] selector works in IE 7+. Firefox, Opera and Webkit-based browsers had it far earlier. */ -#_content a[id] { +.documentation a[id] { position: relative; top: -33px; display: block; @@ -1191,7 +1180,7 @@ height: 0; } -#_content [id]:target > span, #_content .admonition[id]:target > h6 { +.documentation [id]:target > span, .documentation .admonition[id]:target > h6 { background-color: rgba(255,255,0,0.3); transition: background-color 0.2s ease-out 0.3s; /* Clean the below up in Q3 2013 or so... */ @@ -1224,7 +1213,7 @@ display: none; } -#_content .screen a[id] { +.documentation .screen a[id] { display: none; } @@ -1439,7 +1428,7 @@ line-height: 15px; overflow: hidden; padding: 0 3px; - border-bottom: 1px solid #FFF; + border-bottom: 1px solid transparent; background-color: #EEE; text-transform: uppercase; display: inline-block; @@ -1565,7 +1554,7 @@ /* Text styles */ -#_content span, #_content a, #_content p, #_content em, #_content strong { +.documentation span, .documentation a, .documentation p, .documentation em, .documentation strong { position: relative; z-index: 2; } @@ -1913,7 +1902,6 @@ max-width: 100%; min-height: 60px; text-align: center; - color: #999; margin: 24px 0 -9px; overflow: hidden; position: relative; @@ -1927,24 +1915,22 @@ text-align: center; color: #999; padding: 12px 10px; - background-color: #333; + background-color: #FFF; overflow: hidden; - border-top: 1px solid #202020; - border-left: 1px solid #202020; - border-right: 1px solid #202020; + border: 1px solid #EFEFF0; } .figure img { padding: 0; - background-color: #FFF; width: auto; margin: 0 auto; /* Please clean this mess out in ~2014 -- leave only the line with "calc" in there */ + min-width: 50px; max-width: 100%; max-width: calc(100% - 2px); max-width: -moz-calc(100% - 2px); max-width: -webkit-calc(100% - 2px); - display: block; /* inline images weirdly have some whitespace below them, thus block'ing */ + display: block; /* inline images weirdly have some whitespace below them, thus blocking */ } .figure-title { @@ -1954,28 +1940,19 @@ } div.figure .figure-title-wrap { - background-color: #202020; + background-color: #EFEFF0; width: 100%; overflow: hidden; } -div.figure .number, div.figure .permalink:hover, div.figure .permalink:focus, div.figure .permalink:active { - color: #76AD2D; - text-decoration: none; - font-weight: normal; -} - -div.figure .name, div.figure .permalink { - color: #FFF; -} - .informalfigure img { + min-width: 50px; max-width: 100%; display: block; /* inline images weirdly have some whitespace below them, thus block'ing */ color: #999; margin: 17px 0 24px; padding: 1px; - border: 1px solid #202020; + border: 1px solid #EFEFF0; width: auto; } @@ -2314,7 +2291,7 @@ padding: 10px; } -#_content > .doc-status { +.documentation > .doc-status { margin: 0 auto; min-width: 380px; max-width: 978px; @@ -2342,6 +2319,36 @@ font-size: 22px; } +.hidden { + background-color: #E3C1C1; + position: static; + margin-top: 20px; + margin-left: -10px; + margin-right: -10px; + padding-left: 10px; + padding-right: 10px; + padding-bottom: 10px; +} + +.hidden:before { + content: 'Hidden'; + display: block; + float: left; + background-color: #8C0000; + color: #FFF; + padding: 3px 5px; + margin-top: 10px; +} + +.hidden .hidden { + margin-top: 0; + padding-bottom: 0; +} + +.hidden .hidden:before { + content: none; +} + body.draft { background: url(../images/draft.png) no-repeat fixed left 50%; } @@ -2363,10 +2370,7 @@ color: #202020; } - #_content > .set, #_content > .book, #_content > .article, - #_content > .part, #_content > .chapter, #_content > .preface, - #_content > .appendix, #_content > .glossary, #_content > .reference, - #_content > .refentry, #_content > .bibliography, #_content > .index { + .documentation { padding: 0; } @@ -2535,10 +2539,7 @@ padding: 0; } - #_footer, #_content > .set, #_content > .book, #_content > .article, #_content > .part, - #_content > .chapter, #_content > .preface, #_content > .appendix, - #_content > .glossary, #_content > .reference, #_content > .refentry, - #_content > .bibliography, #_content > .index { + #_footer, .documentation { padding: 0 10px; } @@ -2871,7 +2872,7 @@ margin: 0 auto; } - #_content ul, #_content ol { + .documentation ul, .documentation ol { padding-left: 10px; } @@ -2917,7 +2918,7 @@ max-width: -webkit-calc(100% + 20px); max-width: calc(100% + 20px); } - #_content ol.procedure { + .documentation ol.procedure { padding-left: 20px; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/suse-xsl-stylesheets/xslt2013/xhtml/chunk-common.xsl new/suse-xsl-stylesheets/xslt2013/xhtml/chunk-common.xsl --- old/suse-xsl-stylesheets/xslt2013/xhtml/chunk-common.xsl 2013-10-16 11:54:03.000000000 +0200 +++ new/suse-xsl-stylesheets/xslt2013/xhtml/chunk-common.xsl 2014-03-13 14:16:42.000000000 +0100 @@ -614,9 +614,11 @@ <xsl:with-param name="node" select="'id-content'"/> </xsl:call-template> <xsl:call-template name="metadata"/> + <div class="documentation"> <xsl:copy-of select="$content"/> + </div> <div class="page-bottom"> <xsl:call-template name="bottom.navigation"> <xsl:with-param name="prev" select="$prev"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/suse-xsl-stylesheets/xslt2013/xhtml/docbook.xsl new/suse-xsl-stylesheets/xslt2013/xhtml/docbook.xsl --- old/suse-xsl-stylesheets/xslt2013/xhtml/docbook.xsl 2013-10-28 17:11:16.000000000 +0100 +++ new/suse-xsl-stylesheets/xslt2013/xhtml/docbook.xsl 2014-03-13 14:16:42.000000000 +0100 @@ -510,7 +510,7 @@ </xsl:template> <xsl:template name="outerelement.class.attribute"> -  <xsl:param name="node" select="'body'"/> @@ -579,9 +579,11 @@ <xsl:with-param name="node" select="'id-content'"/> </xsl:call-template> <xsl:call-template name="metadata"/> + <div class="documentation"> <xsl:apply-templates select="."/> + </div> <div class="page-bottom"> <xsl:call-template name="share.and.print"> <xsl:with-param name="prev" select="$prev"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/suse-xsl-stylesheets/xslt2013/xhtml/html.xsl new/suse-xsl-stylesheets/xslt2013/xhtml/html.xsl --- old/suse-xsl-stylesheets/xslt2013/xhtml/html.xsl 2012-11-07 13:47:52.000000000 +0100 +++ new/suse-xsl-stylesheets/xslt2013/xhtml/html.xsl 2014-03-26 19:16:38.000000000 +0100 @@ -36,4 +36,24 @@ </xsl:choose> </xsl:template> -</xsl:stylesheet> \ No newline at end of file + +  + <xsl:template name="common.html.attributes"> + <xsl:param name="inherit" select="0"/> + <xsl:param name="class"> + <xsl:value-of select="local-name(.)"/> + <xsl:text> </xsl:text> + <xsl:if test="($draft.mode = 'yes' or $draft.mode = 'maybe') + and normalize-space(@os) = 'hidden'"> + <xsl:value-of select="@os"/> + </xsl:if> + </xsl:param> + + <xsl:apply-templates select="." mode="common.html.attributes"> + <xsl:with-param name="class" select="$class"/> + <xsl:with-param name="inherit" select="$inherit"/> + </xsl:apply-templates> + </xsl:template> + +</xsl:stylesheet> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/suse-xsl-stylesheets/xslt2013/xhtml/sections.xsl new/suse-xsl-stylesheets/xslt2013/xhtml/sections.xsl --- old/suse-xsl-stylesheets/xslt2013/xhtml/sections.xsl 2013-09-25 13:27:58.000000000 +0200 +++ new/suse-xsl-stylesheets/xslt2013/xhtml/sections.xsl 2014-03-20 15:59:22.000000000 +0100 @@ -229,10 +229,18 @@ <xsl:call-template name="create.permalink"> <xsl:with-param name="object" select="$section"/> </xsl:call-template> + <xsl:call-template name="create.header.line"> + <xsl:with-param name="object" select="$section"/> + </xsl:call-template> </xsl:element> <xsl:call-template name="debug.filename-id"/> </xsl:template> + +<xsl:template name="create.header.line"> + <xsl:param name="object" select="."/> +</xsl:template> + <xsl:template name="debug.filename-id"> <xsl:param name="node" select="."/> <xsl:variable name="xmlbase" @@ -245,7 +253,7 @@ self::sect1 or self::sect2 or self::sect3 or - self::sect4]/@xml:base"/> + self::sect4][1]/@xml:base"/> <xsl:if test="$draft.mode = 'yes' and $xmlbase != ''"> <div class="doc-status"> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pinta for openSUSE:Factory
by root＠hilbert.suse.de 16 Apr '14

16 Apr '14

Hello community, here is the log from the commit of package pinta for openSUSE:Factory checked in at 2014-04-16 07:35:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pinta (Old) and /work/SRC/openSUSE:Factory/.pinta.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pinta" Changes: -------- --- /work/SRC/openSUSE:Factory/pinta/pinta.changes 2012-10-03 09:55:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.pinta.new/pinta.changes 2014-04-16 07:35:18.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Apr 12 09:13:48 UTC 2014 - mailaender(a)opensuse.org + +- added %post macros + +------------------------------------------------------------------- @@ -8 +13 @@ -Wed Jun 13 04:50:23 UTC 2012 - Matthias Mailänder +Wed Jun 13 04:50:23 UTC 2012 - mailaender(a)opensuse.org ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pinta.spec ++++++ --- /var/tmp/diff_new_pack.VMK8DO/_old 2014-04-16 07:35:19.000000000 +0200 +++ /var/tmp/diff_new_pack.VMK8DO/_new 2014-04-16 07:35:19.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package pinta # -# Copyright (c) 2012 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 @@ -30,6 +30,7 @@ BuildRequires: mono-devel >= 2.8 BuildRequires: mono-addins BuildRequires: update-desktop-files +BuildRequires: hicolor-icon-theme Requires: gnome-icon-theme BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -55,8 +56,15 @@ %suse_update_desktop_file -n %{name} -%clean -%{__rm} -rf '%{buildroot}' +%if 0%{?suse_version} >= 1140 +%post +%desktop_database_post +%icon_theme_cache_post + +%postun +%desktop_database_postun +%icon_theme_cache_postun +%endif %files -f %{name}.lang %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 mlocate for openSUSE:Factory
by root＠hilbert.suse.de 16 Apr '14

16 Apr '14

Hello community, here is the log from the commit of package mlocate for openSUSE:Factory checked in at 2014-04-16 07:28:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mlocate (Old) and /work/SRC/openSUSE:Factory/.mlocate.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mlocate" Changes: -------- --- /work/SRC/openSUSE:Factory/mlocate/mlocate.changes 2014-04-03 17:11:23.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mlocate.new/mlocate.changes 2014-04-16 07:28:44.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Apr 15 09:52:00 UTC 2014 - tchvatal(a)suse.com + +- Update once more to always hit the same code and to avoid + regressions that are hit only under some setup scenarios. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mlocate.cron ++++++ --- /var/tmp/diff_new_pack.ggaVUo/_old 2014-04-16 07:28:45.000000000 +0200 +++ /var/tmp/diff_new_pack.ggaVUo/_new 2014-04-16 07:28:45.000000000 +0200 @@ -56,15 +56,13 @@ # run the updatedb if possible if [ -x /usr/bin/updatedb ]; then - if [ -n "${RUN_UPDATEDB_AS}" ] ; then - # change the perms to the var directory to our desired user - chown -R "${RUN_UPDATEDB_AS}":root /var/lib/mlocate - # change the user and run the updatedb under it - /usr/bin/su "${RUN_UPDATEDB_AS}" -c "/usr/bin/updatedb ${NODEVS} ${UPDATEDB_PRUNEFS} ${UPDATEDB_PRUNEPATHS}" - else - # just run it as root - /usr/bin/updatedb ${NODEVS} ${UPDATEDB_PRUNEFS} ${UPDATEDB_PRUNEPATHS} + if [ -z "${RUN_UPDATEDB_AS}" ] ; then + RUN_UPDATEDB_AS=root fi + # change the perms to the var directory to our desired user + chown -R "${RUN_UPDATEDB_AS}":root /var/lib/mlocate + # change the user and run the updatedb under it + /usr/bin/su "${RUN_UPDATEDB_AS}" -c "/usr/bin/updatedb ${NODEVS} ${UPDATEDB_PRUNEFS} ${UPDATEDB_PRUNEPATHS}" else echo >&2 "Warning: \"/usr/bin/updatedb\" is not executable, unable to run updatedb." exit 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 libvirt for openSUSE:Factory
by root＠hilbert.suse.de 16 Apr '14

16 Apr '14

Hello community, here is the log from the commit of package libvirt for openSUSE:Factory checked in at 2014-04-16 07:27:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libvirt (Old) and /work/SRC/openSUSE:Factory/.libvirt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libvirt" Changes: -------- --- /work/SRC/openSUSE:Factory/libvirt/libvirt.changes 2014-04-05 16:47:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libvirt.new/libvirt.changes 2014-04-16 07:27:04.000000000 +0200 @@ -1,0 +2,13 @@ +Tue Apr 8 09:44:50 MDT 2014 - jfehlig(a)suse.com + +- libxl: Set disk format for empty cdrom device + 0e0c1a74-domid-fix.patch, 7a1452f5-libxl-empty-cdrom.patch + bnc#872517 + +------------------------------------------------------------------- +Mon Apr 7 14:34:59 CST 2014 - cyliu(a)suse.com + +- Fate#315125: add NOCOW flag + add-nocow-to-vol-xml.patch + +------------------------------------------------------------------- New: ---- 0e0c1a74-domid-fix.patch 7a1452f5-libxl-empty-cdrom.patch add-nocow-to-vol-xml.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvirt.spec ++++++ --- /var/tmp/diff_new_pack.mRudzx/_old 2014-04-16 07:27:05.000000000 +0200 +++ /var/tmp/diff_new_pack.mRudzx/_new 2014-04-16 07:27:05.000000000 +0200 @@ -428,10 +428,13 @@ Source2: libvirtd-relocation-server.fw Source99: baselibs.conf # Upstream patches +Patch0: 0e0c1a74-domid-fix.patch +Patch1: 7a1452f5-libxl-empty-cdrom.patch # Need to go upstream Patch100: xen-name-for-devid.patch Patch101: ia64-clone.patch Patch102: xen-pv-cdrom.patch +Patch103: add-nocow-to-vol-xml.patch # Our patches Patch200: libvirtd-defaults.patch Patch201: libvirtd-init-script.patch @@ -943,9 +946,12 @@ %prep %setup -q +%patch0 -p1 +%patch1 -p1 %patch100 -p1 %patch101 -p1 %patch102 -p1 +%patch103 -p1 %patch200 -p1 %patch201 -p1 %patch202 -p1 ++++++ 0e0c1a74-domid-fix.patch ++++++ commit 0e0c1a7489a6a04c5060d0fe7fad6337ed98ec01 Author: Stefan Bader <stefan.bader(a)canonical.com> Date: Thu Mar 27 17:55:02 2014 +0100 libxl: Use id from virDomainObj inside the driver There is a domain id in the virDomain structure as well as in the virDomainObj structure. While the former can become stale the latter is kept up to date. So it is safer to always (virDomainObjPtr)->def->id internally. This will fix issues seen when managing Xen guests through libvirt from virt-manager (not being able to get domain info after define or reboot). This was caused both though libxlDomainGetInfo() only but there were a lot of places that might potentially cause issues, too. Signed-off-by: Stefan Bader <stefan.bader(a)canonical.com> Index: libvirt-1.2.3/src/libxl/libxl_driver.c =================================================================== --- libvirt-1.2.3.orig/src/libxl/libxl_driver.c +++ libvirt-1.2.3/src/libxl/libxl_driver.c @@ -770,10 +770,10 @@ libxlDomainSuspend(virDomainPtr dom) priv = vm->privateData; if (virDomainObjGetState(vm, NULL) != VIR_DOMAIN_PAUSED) { - if (libxl_domain_pause(priv->ctx, dom->id) != 0) { + if (libxl_domain_pause(priv->ctx, vm->def->id) != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to suspend domain '%d' with libxenlight"), - dom->id); + vm->def->id); goto endjob; } @@ -829,10 +829,10 @@ libxlDomainResume(virDomainPtr dom) priv = vm->privateData; if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_PAUSED) { - if (libxl_domain_unpause(priv->ctx, dom->id) != 0) { + if (libxl_domain_unpause(priv->ctx, vm->def->id) != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to resume domain '%d' with libxenlight"), - dom->id); + vm->def->id); goto endjob; } @@ -883,10 +883,10 @@ libxlDomainShutdownFlags(virDomainPtr do } priv = vm->privateData; - if (libxl_domain_shutdown(priv->ctx, dom->id) != 0) { + if (libxl_domain_shutdown(priv->ctx, vm->def->id) != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to shutdown domain '%d' with libxenlight"), - dom->id); + vm->def->id); goto cleanup; } @@ -930,10 +930,10 @@ libxlDomainReboot(virDomainPtr dom, unsi } priv = vm->privateData; - if (libxl_domain_reboot(priv->ctx, dom->id) != 0) { + if (libxl_domain_reboot(priv->ctx, vm->def->id) != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to reboot domain '%d' with libxenlight"), - dom->id); + vm->def->id); goto cleanup; } ret = 0; @@ -974,7 +974,7 @@ libxlDomainDestroyFlags(virDomainPtr dom priv = vm->privateData; if (libxl_domain_destroy(priv->ctx, vm->def->id, NULL) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to destroy domain '%d'"), dom->id); + _("Failed to destroy domain '%d'"), vm->def->id); goto cleanup; } @@ -1105,10 +1105,10 @@ libxlDomainSetMemoryFlags(virDomainPtr d if (flags & VIR_DOMAIN_MEM_LIVE) { priv = vm->privateData; - if (libxl_domain_setmaxmem(priv->ctx, dom->id, newmem) < 0) { + if (libxl_domain_setmaxmem(priv->ctx, vm->def->id, newmem) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to set maximum memory for domain '%d'" - " with libxenlight"), dom->id); + " with libxenlight"), vm->def->id); goto endjob; } } @@ -1138,13 +1138,13 @@ libxlDomainSetMemoryFlags(virDomainPtr d priv = vm->privateData; /* Unlock virDomainObj while ballooning memory */ virObjectUnlock(vm); - res = libxl_set_memory_target(priv->ctx, dom->id, newmem, 0, + res = libxl_set_memory_target(priv->ctx, vm->def->id, newmem, 0, /* force */ 1); virObjectLock(vm); if (res < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to set memory for domain '%d'" - " with libxenlight"), dom->id); + " with libxenlight"), vm->def->id); goto endjob; } } @@ -1202,9 +1202,10 @@ libxlDomainGetInfo(virDomainPtr dom, vir info->memory = vm->def->mem.cur_balloon; info->maxMem = vm->def->mem.max_balloon; } else { - if (libxl_domain_info(priv->ctx, &d_info, dom->id) != 0) { + if (libxl_domain_info(priv->ctx, &d_info, vm->def->id) != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("libxl_domain_info failed for domain '%d'"), dom->id); + _("libxl_domain_info failed for domain '%d'"), + vm->def->id); goto cleanup; } info->cpuTime = d_info.cpu_time; @@ -1483,11 +1484,11 @@ libxlDomainCoreDump(virDomainPtr dom, co if (!(flags & VIR_DUMP_LIVE) && virDomainObjGetState(vm, NULL) == VIR_DOMAIN_RUNNING) { - if (libxl_domain_pause(priv->ctx, dom->id) != 0) { + if (libxl_domain_pause(priv->ctx, vm->def->id) != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Before dumping core, failed to suspend domain '%d'" " with libxenlight"), - dom->id); + vm->def->id); goto endjob; } virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, VIR_DOMAIN_PAUSED_DUMP); @@ -1496,20 +1497,20 @@ libxlDomainCoreDump(virDomainPtr dom, co /* Unlock virDomainObj while dumping core */ virObjectUnlock(vm); - ret = libxl_domain_core_dump(priv->ctx, dom->id, to, NULL); + ret = libxl_domain_core_dump(priv->ctx, vm->def->id, to, NULL); virObjectLock(vm); if (ret != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to dump core of domain '%d' with libxenlight"), - dom->id); + vm->def->id); ret = -1; goto unpause; } if (flags & VIR_DUMP_CRASH) { - if (libxl_domain_destroy(priv->ctx, dom->id, NULL) < 0) { + if (libxl_domain_destroy(priv->ctx, vm->def->id, NULL) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to destroy domain '%d'"), dom->id); + _("Failed to destroy domain '%d'"), vm->def->id); goto unpause; } @@ -1524,10 +1525,10 @@ libxlDomainCoreDump(virDomainPtr dom, co unpause: if (virDomainObjIsActive(vm) && paused) { - if (libxl_domain_unpause(priv->ctx, dom->id) != 0) { + if (libxl_domain_unpause(priv->ctx, vm->def->id) != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("After dumping core, failed to resume domain '%d' with" - " libxenlight"), dom->id); + " libxenlight"), vm->def->id); } else { virDomainObjSetState(vm, VIR_DOMAIN_RUNNING, VIR_DOMAIN_RUNNING_UNPAUSED); @@ -1786,19 +1787,19 @@ libxlDomainSetVcpusFlags(virDomainPtr do break; case VIR_DOMAIN_VCPU_LIVE: - if (libxl_set_vcpuonline(priv->ctx, dom->id, &map) != 0) { + if (libxl_set_vcpuonline(priv->ctx, vm->def->id, &map) != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to set vcpus for domain '%d'" - " with libxenlight"), dom->id); + " with libxenlight"), vm->def->id); goto endjob; } break; case VIR_DOMAIN_VCPU_LIVE | VIR_DOMAIN_VCPU_CONFIG: - if (libxl_set_vcpuonline(priv->ctx, dom->id, &map) != 0) { + if (libxl_set_vcpuonline(priv->ctx, vm->def->id, &map) != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to set vcpus for domain '%d'" - " with libxenlight"), dom->id); + " with libxenlight"), vm->def->id); goto endjob; } def->vcpus = nvcpus; @@ -1934,7 +1935,7 @@ libxlDomainPinVcpuFlags(virDomainPtr dom libxlDomainObjPrivatePtr priv; priv = vm->privateData; - if (libxl_set_vcpuaffinity(priv->ctx, dom->id, vcpu, &map) != 0) { + if (libxl_set_vcpuaffinity(priv->ctx, vm->def->id, vcpu, &map) != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to pin vcpu '%d' with libxenlight"), vcpu); @@ -2099,11 +2100,11 @@ libxlDomainGetVcpus(virDomainPtr dom, vi } priv = vm->privateData; - if ((vcpuinfo = libxl_list_vcpu(priv->ctx, dom->id, &maxcpu, + if ((vcpuinfo = libxl_list_vcpu(priv->ctx, vm->def->id, &maxcpu, &hostcpus)) == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to list vcpus for domain '%d' with libxenlight"), - dom->id); + vm->def->id); goto cleanup; } @@ -3608,7 +3609,7 @@ libxlDomainGetSchedulerType(virDomainPtr default: virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to get scheduler id for domain '%d'" - " with libxenlight"), dom->id); + " with libxenlight"), vm->def->id); goto cleanup; } @@ -3659,10 +3660,10 @@ libxlDomainGetSchedulerParametersFlags(v goto cleanup; } - if (libxl_domain_sched_params_get(priv->ctx, dom->id, &sc_info) != 0) { + if (libxl_domain_sched_params_get(priv->ctx, vm->def->id, &sc_info) != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to get scheduler parameters for domain '%d'" - " with libxenlight"), dom->id); + " with libxenlight"), vm->def->id); goto cleanup; } @@ -3740,10 +3741,10 @@ libxlDomainSetSchedulerParametersFlags(v goto endjob; } - if (libxl_domain_sched_params_get(priv->ctx, dom->id, &sc_info) != 0) { + if (libxl_domain_sched_params_get(priv->ctx, vm->def->id, &sc_info) != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to get scheduler parameters for domain '%d'" - " with libxenlight"), dom->id); + " with libxenlight"), vm->def->id); goto endjob; } @@ -3756,10 +3757,10 @@ libxlDomainSetSchedulerParametersFlags(v sc_info.cap = params[i].value.ui; } - if (libxl_domain_sched_params_set(priv->ctx, dom->id, &sc_info) != 0) { + if (libxl_domain_sched_params_set(priv->ctx, vm->def->id, &sc_info) != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to set scheduler parameters for domain '%d'" - " with libxenlight"), dom->id); + " with libxenlight"), vm->def->id); goto endjob; } ++++++ 7a1452f5-libxl-empty-cdrom.patch ++++++ commit 7a1452f5334f98680187ae6d11fe2a49c1b38548 Author: Stefan Bader <stefan.bader(a)canonical.com> Date: Thu Mar 27 17:55:03 2014 +0100 libxl: Set disk format for empty cdrom device The XML config for a CDROM device can be without a source path, indicating that there is no media present. Without this change the libxl driver fails to start a guest in that case because the libxl library checks for the LIBXL_DISK_FORMAT_EMPTY format type and tries to stat the NULL pointer that gets passed on. > libxl: error: libxl_device.c:265:libxl__device_disk_set_backend: > Disk vdev=hdc failed to stat: (null): Bad address Signed-off-by: Stefan Bader <stefan.bader(a)canonical.com> Index: libvirt-1.2.3/src/libxl/libxl_conf.c =================================================================== --- libvirt-1.2.3.orig/src/libxl/libxl_conf.c +++ libvirt-1.2.3/src/libxl/libxl_conf.c @@ -827,6 +827,9 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk x_disk->removable = 1; x_disk->readwrite = !l_disk->readonly; x_disk->is_cdrom = l_disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM ? 1 : 0; + /* An empty CDROM must have the empty format, otherwise libxl fails. */ + if (x_disk->is_cdrom && !x_disk->pdev_path) + x_disk->format = LIBXL_DISK_FORMAT_EMPTY; if (l_disk->transient) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("libxenlight does not support transient disks")); ++++++ add-nocow-to-vol-xml.patch ++++++ Index: libvirt-1.2.3/docs/schemas/storagevol.rng =================================================================== --- libvirt-1.2.3.orig/docs/schemas/storagevol.rng +++ libvirt-1.2.3/docs/schemas/storagevol.rng @@ -139,6 +139,11 @@ <ref name='compat'/> </optional> <optional> + <element name='nocow'> + <empty/> + </element> + </optional> + <optional> <ref name='fileFormatFeatures'/> </optional> </interleave> Index: libvirt-1.2.3/src/conf/storage_conf.c =================================================================== --- libvirt-1.2.3.orig/src/conf/storage_conf.c +++ libvirt-1.2.3/src/conf/storage_conf.c @@ -1401,6 +1401,9 @@ virStorageVolDefParseXML(virStoragePoolD virStringFreeList(version); } + if (virXPathNode("./target/nocow", ctxt)) + ret->target.nocow = true; + if (options->featureFromString && virXPathNode("./target/features", ctxt)) { if ((n = virXPathNodeSet("./target/features/*", ctxt, &nodes)) < 0) goto error; Index: libvirt-1.2.3/src/conf/storage_conf.h =================================================================== --- libvirt-1.2.3.orig/src/conf/storage_conf.h +++ libvirt-1.2.3/src/conf/storage_conf.h @@ -90,6 +90,7 @@ struct _virStorageVolTarget { virStorageEncryptionPtr encryption; virBitmapPtr features; char *compat; + bool nocow; }; typedef struct _virStorageVolDef virStorageVolDef; Index: libvirt-1.2.3/src/storage/storage_backend.c =================================================================== --- libvirt-1.2.3.orig/src/storage/storage_backend.c +++ libvirt-1.2.3/src/storage/storage_backend.c @@ -37,6 +37,9 @@ #ifdef __linux__ # include <sys/ioctl.h> # include <linux/fs.h> +# ifndef FS_NOCOW_FL +# define FS_NOCOW_FL 0x00800000 /* Do not cow file */ +# endif #endif #if WITH_SELINUX @@ -449,6 +452,21 @@ virStorageBackendCreateRaw(virConnectPtr goto cleanup; } + if (vol->target.nocow) { +#ifdef __linux__ + int attr; + + /* Set NOCOW flag. This is an optimisation for btrfs. + * The FS_IOC_SETFLAGS ioctl return value will be ignored since any + * failure of this operation should not block the left work. + */ + if (ioctl(fd, FS_IOC_GETFLAGS, &attr) == 0) { + attr |= FS_NOCOW_FL; + ioctl(fd, FS_IOC_SETFLAGS, &attr); + } +#endif + } + if ((ret = createRawFile(fd, vol, inputvol)) < 0) /* createRawFile already reported the exact error. */ ret = -1; @@ -712,6 +730,7 @@ virStorageBackendCreateQemuImgOpts(char bool preallocate, int format, const char *compat, + bool nocow, virBitmapPtr features) { virBuffer buf = VIR_BUFFER_INITIALIZER; @@ -724,6 +743,8 @@ virStorageBackendCreateQemuImgOpts(char virBufferAddLit(&buf, "encryption=on,"); if (preallocate) virBufferAddLit(&buf, "preallocation=metadata,"); + if (nocow) + virBufferAddLit(&buf, "nocow=on,"); if (compat) virBufferAsprintf(&buf, "compat=%s,", compat); @@ -945,6 +966,7 @@ virStorageBackendCreateQemuImgCmd(virCon do_encryption, preallocate, vol->target.format, compat, + vol->target.nocow, vol->target.features) < 0) { virCommandFree(cmd); return NULL; ++++++ fix-pci-attach-xen-driver.patch ++++++ --- /var/tmp/diff_new_pack.mRudzx/_old 2014-04-16 07:27:05.000000000 +0200 +++ /var/tmp/diff_new_pack.mRudzx/_new 2014-04-16 07:27:05.000000000 +0200 @@ -8,11 +8,11 @@ This patch changes the xend driver to always call 'device_configure' for PCI devices to be consistent with the usage in the xen tools. -Index: libvirt-1.2.2/src/xen/xend_internal.c +Index: libvirt-1.2.3/src/xen/xend_internal.c =================================================================== ---- libvirt-1.2.2.orig/src/xen/xend_internal.c -+++ libvirt-1.2.2/src/xen/xend_internal.c -@@ -2217,6 +2217,7 @@ xenDaemonAttachDeviceFlags(virConnectPtr +--- libvirt-1.2.3.orig/src/xen/xend_internal.c ++++ libvirt-1.2.3/src/xen/xend_internal.c +@@ -2219,6 +2219,7 @@ xenDaemonAttachDeviceFlags(virConnectPtr virBuffer buf = VIR_BUFFER_INITIALIZER; char class[8], ref[80]; char *target = NULL; @@ -20,7 +20,7 @@ virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG, -1); -@@ -2315,8 +2316,18 @@ xenDaemonAttachDeviceFlags(virConnectPtr +@@ -2317,8 +2318,18 @@ xenDaemonAttachDeviceFlags(virConnectPtr } sexpr = virBufferContentAndReset(&buf); ++++++ ia64-clone.patch ++++++ --- /var/tmp/diff_new_pack.mRudzx/_old 2014-04-16 07:27:05.000000000 +0200 +++ /var/tmp/diff_new_pack.mRudzx/_new 2014-04-16 07:27:05.000000000 +0200 @@ -1,8 +1,8 @@ -Index: libvirt-1.2.2/src/lxc/lxc_container.c +Index: libvirt-1.2.3/src/lxc/lxc_container.c =================================================================== ---- libvirt-1.2.2.orig/src/lxc/lxc_container.c -+++ libvirt-1.2.2/src/lxc/lxc_container.c -@@ -162,12 +162,19 @@ int lxcContainerHasReboot(void) +--- libvirt-1.2.3.orig/src/lxc/lxc_container.c ++++ libvirt-1.2.3/src/lxc/lxc_container.c +@@ -164,12 +164,19 @@ int lxcContainerHasReboot(void) VIR_FREE(buf); cmd = v ? LINUX_REBOOT_CMD_CAD_ON : LINUX_REBOOT_CMD_CAD_OFF; @@ -22,7 +22,7 @@ VIR_FREE(stack); if (cpid < 0) { virReportSystemError(errno, "%s", -@@ -2004,6 +2011,9 @@ int lxcContainerStart(virDomainDefPtr de +@@ -2007,6 +2014,9 @@ int lxcContainerStart(virDomainDefPtr de .handshakefd = handshakefd }; @@ -32,7 +32,7 @@ /* allocate a stack for the container */ if (VIR_ALLOC_N(stack, stacksize) < 0) return -1; -@@ -2029,7 +2039,11 @@ int lxcContainerStart(virDomainDefPtr de +@@ -2032,7 +2042,11 @@ int lxcContainerStart(virDomainDefPtr de cflags |= CLONE_NEWNET; } @@ -44,7 +44,7 @@ VIR_FREE(stack); VIR_DEBUG("clone() completed, new container PID is %d", pid); -@@ -2063,12 +2077,19 @@ int lxcContainerAvailable(int features) +@@ -2066,12 +2080,19 @@ int lxcContainerAvailable(int features) if (features & LXC_CONTAINER_FEATURE_NET) flags |= CLONE_NEWNET; ++++++ libvirt-guests-init-script.patch ++++++ --- /var/tmp/diff_new_pack.mRudzx/_old 2014-04-16 07:27:05.000000000 +0200 +++ /var/tmp/diff_new_pack.mRudzx/_new 2014-04-16 07:27:05.000000000 +0200 @@ -1,9 +1,9 @@ Adjust libvirt-guests init files to conform to SUSE standards -Index: libvirt-1.2.2/tools/libvirt-guests.init.in +Index: libvirt-1.2.3/tools/libvirt-guests.init.in =================================================================== ---- libvirt-1.2.2.orig/tools/libvirt-guests.init.in -+++ libvirt-1.2.2/tools/libvirt-guests.init.in +--- libvirt-1.2.3.orig/tools/libvirt-guests.init.in ++++ libvirt-1.2.3/tools/libvirt-guests.init.in @@ -3,15 +3,15 @@ # the following is the LSB init header # @@ -28,10 +28,10 @@ ### END INIT INFO # the following is chkconfig init header -Index: libvirt-1.2.2/tools/libvirt-guests.sh.in +Index: libvirt-1.2.3/tools/libvirt-guests.sh.in =================================================================== ---- libvirt-1.2.2.orig/tools/libvirt-guests.sh.in -+++ libvirt-1.2.2/tools/libvirt-guests.sh.in +--- libvirt-1.2.3.orig/tools/libvirt-guests.sh.in ++++ libvirt-1.2.3/tools/libvirt-guests.sh.in @@ -16,14 +16,13 @@ # License along with this library. If not, see # <http://www.gnu.org/licenses/>. @@ -189,10 +189,10 @@ esac -exit $RETVAL +rc_exit -Index: libvirt-1.2.2/tools/libvirt-guests.sysconf +Index: libvirt-1.2.3/tools/libvirt-guests.sysconf =================================================================== ---- libvirt-1.2.2.orig/tools/libvirt-guests.sysconf -+++ libvirt-1.2.2/tools/libvirt-guests.sysconf +--- libvirt-1.2.3.orig/tools/libvirt-guests.sysconf ++++ libvirt-1.2.3/tools/libvirt-guests.sysconf @@ -1,19 +1,29 @@ +## Path: System/Virtualization/libvirt-guests + ++++++ libvirt-suse-netcontrol.patch ++++++ --- /var/tmp/diff_new_pack.mRudzx/_old 2014-04-16 07:27:05.000000000 +0200 +++ /var/tmp/diff_new_pack.mRudzx/_new 2014-04-16 07:27:05.000000000 +0200 @@ -1,7 +1,7 @@ -Index: libvirt-1.2.2/configure.ac +Index: libvirt-1.2.3/configure.ac =================================================================== ---- libvirt-1.2.2.orig/configure.ac -+++ libvirt-1.2.2/configure.ac +--- libvirt-1.2.3.orig/configure.ac ++++ libvirt-1.2.3/configure.ac @@ -231,6 +231,7 @@ LIBVIRT_CHECK_FUSE LIBVIRT_CHECK_GLUSTER LIBVIRT_CHECK_HAL @@ -10,7 +10,7 @@ LIBVIRT_CHECK_NUMACTL LIBVIRT_CHECK_OPENWSMAN LIBVIRT_CHECK_PCIACCESS -@@ -2368,11 +2369,12 @@ if test "$with_libvirtd" = "no" ; then +@@ -2374,11 +2375,12 @@ if test "$with_libvirtd" = "no" ; then with_interface=no fi @@ -26,7 +26,7 @@ esac if test "$with_interface" = "yes" ; then -@@ -2766,6 +2768,7 @@ LIBVIRT_RESULT_FUSE +@@ -2772,6 +2774,7 @@ LIBVIRT_RESULT_FUSE LIBVIRT_RESULT_GLUSTER LIBVIRT_RESULT_HAL LIBVIRT_RESULT_NETCF @@ -34,11 +34,11 @@ LIBVIRT_RESULT_NUMACTL LIBVIRT_RESULT_OPENWSMAN LIBVIRT_RESULT_PCIACCESS -Index: libvirt-1.2.2/src/Makefile.am +Index: libvirt-1.2.3/src/Makefile.am =================================================================== ---- libvirt-1.2.2.orig/src/Makefile.am -+++ libvirt-1.2.2/src/Makefile.am -@@ -801,6 +801,10 @@ if WITH_NETCF +--- libvirt-1.2.3.orig/src/Makefile.am ++++ libvirt-1.2.3/src/Makefile.am +@@ -807,6 +807,10 @@ if WITH_NETCF INTERFACE_DRIVER_SOURCES += \ interface/interface_backend_netcf.c endif WITH_NETCF @@ -49,7 +49,7 @@ if WITH_UDEV INTERFACE_DRIVER_SOURCES += \ interface/interface_backend_udev.c -@@ -1386,10 +1390,15 @@ if WITH_NETCF +@@ -1396,10 +1400,15 @@ if WITH_NETCF libvirt_driver_interface_la_CFLAGS += $(NETCF_CFLAGS) libvirt_driver_interface_la_LIBADD += $(NETCF_LIBS) else ! WITH_NETCF @@ -65,11 +65,11 @@ endif ! WITH_NETCF if WITH_DRIVER_MODULES libvirt_driver_interface_la_LIBADD += ../gnulib/lib/libgnu.la -Index: libvirt-1.2.2/tools/virsh.c +Index: libvirt-1.2.3/tools/virsh.c =================================================================== ---- libvirt-1.2.2.orig/tools/virsh.c -+++ libvirt-1.2.2/tools/virsh.c -@@ -3209,6 +3209,8 @@ vshShowVersion(vshControl *ctl ATTRIBUTE +--- libvirt-1.2.3.orig/tools/virsh.c ++++ libvirt-1.2.3/tools/virsh.c +@@ -3251,6 +3251,8 @@ vshShowVersion(vshControl *ctl ATTRIBUTE vshPrint(ctl, " Interface"); # if defined(WITH_NETCF) vshPrint(ctl, " netcf"); @@ -78,10 +78,10 @@ # elif defined(WITH_UDEV) vshPrint(ctl, " udev"); # endif -Index: libvirt-1.2.2/src/interface/interface_backend_netcf.c +Index: libvirt-1.2.3/src/interface/interface_backend_netcf.c =================================================================== ---- libvirt-1.2.2.orig/src/interface/interface_backend_netcf.c -+++ libvirt-1.2.2/src/interface/interface_backend_netcf.c +--- libvirt-1.2.3.orig/src/interface/interface_backend_netcf.c ++++ libvirt-1.2.3/src/interface/interface_backend_netcf.c @@ -23,7 +23,12 @@ #include <config.h> @@ -96,7 +96,7 @@ #include "virerror.h" #include "datatypes.h" -@@ -63,6 +68,37 @@ VIR_ONCE_GLOBAL_INIT(virNetcfDriverState +@@ -65,6 +70,37 @@ VIR_ONCE_GLOBAL_INIT(virNetcfDriverState static virNetcfDriverStatePtr driverState = NULL; @@ -134,7 +134,7 @@ static void virNetcfDriverStateDispose(void *obj) -@@ -85,7 +121,22 @@ netcfStateInitialize(bool privileged ATT +@@ -87,7 +123,22 @@ netcfStateInitialize(bool privileged ATT if (!(driverState = virObjectLockableNew(virNetcfDriverStateClass))) return -1; @@ -157,7 +157,7 @@ if (ncf_init(&driverState->netcf, NULL) != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("failed to initialize netcf")); -@@ -93,6 +144,7 @@ netcfStateInitialize(bool privileged ATT +@@ -95,6 +146,7 @@ netcfStateInitialize(bool privileged ATT driverState = NULL; return -1; } @@ -165,11 +165,11 @@ return 0; } -Index: libvirt-1.2.2/src/interface/interface_driver.c +Index: libvirt-1.2.3/src/interface/interface_driver.c =================================================================== ---- libvirt-1.2.2.orig/src/interface/interface_driver.c -+++ libvirt-1.2.2/src/interface/interface_driver.c -@@ -28,8 +28,15 @@ interfaceRegister(void) { +--- libvirt-1.2.3.orig/src/interface/interface_driver.c ++++ libvirt-1.2.3/src/interface/interface_driver.c +@@ -30,8 +30,15 @@ interfaceRegister(void) if (netcfIfaceRegister() == 0) return 0; #endif /* WITH_NETCF */ @@ -186,10 +186,10 @@ if (udevIfaceRegister() == 0) return 0; #endif /* WITH_UDEV */ -Index: libvirt-1.2.2/m4/virt-netcontrol.m4 +Index: libvirt-1.2.3/m4/virt-netcontrol.m4 =================================================================== --- /dev/null -+++ libvirt-1.2.2/m4/virt-netcontrol.m4 ++++ libvirt-1.2.3/m4/virt-netcontrol.m4 @@ -0,0 +1,35 @@ +dnl The libnetcontrol library +dnl ++++++ libvirtd-defaults.patch ++++++ --- /var/tmp/diff_new_pack.mRudzx/_old 2014-04-16 07:27:05.000000000 +0200 +++ /var/tmp/diff_new_pack.mRudzx/_new 2014-04-16 07:27:05.000000000 +0200 @@ -1,7 +1,7 @@ -Index: libvirt-1.2.2/daemon/libvirtd.conf +Index: libvirt-1.2.3/daemon/libvirtd.conf =================================================================== ---- libvirt-1.2.2.orig/daemon/libvirtd.conf -+++ libvirt-1.2.2/daemon/libvirtd.conf +--- libvirt-1.2.3.orig/daemon/libvirtd.conf ++++ libvirt-1.2.3/daemon/libvirtd.conf @@ -18,8 +18,8 @@ # It is necessary to setup a CA and issue server certificates before # using this capability. @@ -13,11 +13,11 @@ # Listen for unencrypted TCP connections on the public TCP/IP port. # NB, must pass the --listen flag to the libvirtd process for this to -Index: libvirt-1.2.2/daemon/libvirtd-config.c +Index: libvirt-1.2.3/daemon/libvirtd-config.c =================================================================== ---- libvirt-1.2.2.orig/daemon/libvirtd-config.c -+++ libvirt-1.2.2/daemon/libvirtd-config.c -@@ -222,7 +222,7 @@ daemonConfigNew(bool privileged ATTRIBUT +--- libvirt-1.2.3.orig/daemon/libvirtd-config.c ++++ libvirt-1.2.3/daemon/libvirtd-config.c +@@ -229,7 +229,7 @@ daemonConfigNew(bool privileged ATTRIBUT if (VIR_ALLOC(data) < 0) return NULL; ++++++ support-managed-pci-xen-driver.patch ++++++ --- /var/tmp/diff_new_pack.mRudzx/_old 2014-04-16 07:27:05.000000000 +0200 +++ /var/tmp/diff_new_pack.mRudzx/_new 2014-04-16 07:27:05.000000000 +0200 @@ -8,11 +8,11 @@ src/xenxs/xen_xm.c | 28 +++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 15 deletions(-) -Index: libvirt-1.2.2/src/xenxs/xen_sxpr.c +Index: libvirt-1.2.3/src/xenxs/xen_sxpr.c =================================================================== ---- libvirt-1.2.2.orig/src/xenxs/xen_sxpr.c -+++ libvirt-1.2.2/src/xenxs/xen_sxpr.c -@@ -998,6 +998,7 @@ xenParseSxprPCI(virDomainDefPtr def, +--- libvirt-1.2.3.orig/src/xenxs/xen_sxpr.c ++++ libvirt-1.2.3/src/xenxs/xen_sxpr.c +@@ -997,6 +997,7 @@ xenParseSxprPCI(virDomainDefPtr def, int busID; int slotID; int funcID; @@ -20,7 +20,7 @@ node = cur->u.s.car; if (!sexpr_lookup(node, "dev")) -@@ -1045,11 +1046,13 @@ xenParseSxprPCI(virDomainDefPtr def, +@@ -1044,11 +1045,13 @@ xenParseSxprPCI(virDomainDefPtr def, goto error; } @@ -35,7 +35,7 @@ dev->source.subsys.type = VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI; dev->source.subsys.u.pci.addr.domain = domainID; dev->source.subsys.u.pci.addr.bus = busID; -@@ -1993,11 +1996,15 @@ static void +@@ -1991,11 +1994,15 @@ static void xenFormatSxprPCI(virDomainHostdevDefPtr def, virBufferPtr buf) { @@ -52,7 +52,7 @@ } -@@ -2016,12 +2023,6 @@ xenFormatSxprOnePCI(virDomainHostdevDefP +@@ -2014,12 +2021,6 @@ xenFormatSxprOnePCI(virDomainHostdevDefP virBufferPtr buf, int detach) { @@ -65,7 +65,7 @@ virBufferAddLit(buf, "(pci "); xenFormatSxprPCI(def, buf); if (detach) -@@ -2076,12 +2077,6 @@ xenFormatSxprAllPCI(virDomainDefPtr def, +@@ -2074,12 +2075,6 @@ xenFormatSxprAllPCI(virDomainDefPtr def, for (i = 0; i < def->nhostdevs; i++) { if (def->hostdevs[i]->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && def->hostdevs[i]->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) { @@ -78,11 +78,11 @@ xenFormatSxprPCI(def->hostdevs[i], buf); } } -Index: libvirt-1.2.2/src/xenxs/xen_xm.c +Index: libvirt-1.2.3/src/xenxs/xen_xm.c =================================================================== ---- libvirt-1.2.2.orig/src/xenxs/xen_xm.c -+++ libvirt-1.2.2/src/xenxs/xen_xm.c -@@ -802,6 +802,8 @@ xenParseXM(virConfPtr conf, int xendConf +--- libvirt-1.2.3.orig/src/xenxs/xen_xm.c ++++ libvirt-1.2.3/src/xenxs/xen_xm.c +@@ -807,6 +807,8 @@ xenParseXM(virConfPtr conf, int xendConf int busID; int slotID; int funcID; @@ -91,7 +91,7 @@ domain[0] = bus[0] = slot[0] = func[0] = '\0'; -@@ -811,6 +813,11 @@ xenParseXM(virConfPtr conf, int xendConf +@@ -816,6 +818,11 @@ xenParseXM(virConfPtr conf, int xendConf /* pci=['0000:00:1b.0','0000:00:13.0'] */ if (!(key = list->str)) goto skippci; @@ -103,7 +103,7 @@ if (!(nextkey = strchr(key, ':'))) goto skippci; -@@ -859,10 +866,30 @@ xenParseXM(virConfPtr conf, int xendConf +@@ -864,10 +871,30 @@ xenParseXM(virConfPtr conf, int xendConf if (virStrToLong_i(func, NULL, 16, &funcID) < 0) goto skippci; ++++++ virtlockd-init-script.patch ++++++ --- /var/tmp/diff_new_pack.mRudzx/_old 2014-04-16 07:27:05.000000000 +0200 +++ /var/tmp/diff_new_pack.mRudzx/_new 2014-04-16 07:27:05.000000000 +0200 @@ -1,9 +1,9 @@ Adjust virtlockd init files to conform to SUSE standards -Index: libvirt-1.2.2/src/locking/virtlockd.sysconf +Index: libvirt-1.2.3/src/locking/virtlockd.sysconf =================================================================== ---- libvirt-1.2.2.orig/src/locking/virtlockd.sysconf -+++ libvirt-1.2.2/src/locking/virtlockd.sysconf +--- libvirt-1.2.3.orig/src/locking/virtlockd.sysconf ++++ libvirt-1.2.3/src/locking/virtlockd.sysconf @@ -1,3 +1,7 @@ +## Path: System/Virtualization/virtlockd + @@ -12,10 +12,10 @@ # # Pass extra arguments to virtlockd #VIRTLOCKD_ARGS= -Index: libvirt-1.2.2/src/locking/virtlockd.init.in +Index: libvirt-1.2.3/src/locking/virtlockd.init.in =================================================================== ---- libvirt-1.2.2.orig/src/locking/virtlockd.init.in -+++ libvirt-1.2.2/src/locking/virtlockd.init.in +--- libvirt-1.2.3.orig/src/locking/virtlockd.init.in ++++ libvirt-1.2.3/src/locking/virtlockd.init.in @@ -4,12 +4,14 @@ # http://www.linux-foundation.org/spec//booksets/LSB-Core-generic/LSB-Core-ge… # ++++++ xen-pv-cdrom.patch ++++++ --- /var/tmp/diff_new_pack.mRudzx/_old 2014-04-16 07:27:05.000000000 +0200 +++ /var/tmp/diff_new_pack.mRudzx/_new 2014-04-16 07:27:05.000000000 +0200 @@ -1,8 +1,8 @@ -Index: libvirt-1.2.2/src/xenxs/xen_sxpr.c +Index: libvirt-1.2.3/src/xenxs/xen_sxpr.c =================================================================== ---- libvirt-1.2.2.orig/src/xenxs/xen_sxpr.c -+++ libvirt-1.2.2/src/xenxs/xen_sxpr.c -@@ -330,7 +330,7 @@ error: +--- libvirt-1.2.3.orig/src/xenxs/xen_sxpr.c ++++ libvirt-1.2.3/src/xenxs/xen_sxpr.c +@@ -332,7 +332,7 @@ xenParseSxprChar(const char *value, static int xenParseSxprDisks(virDomainDefPtr def, const struct sexpr *root, @@ -11,7 +11,7 @@ int xendConfigVersion) { const struct sexpr *cur, *node; -@@ -381,7 +381,6 @@ xenParseSxprDisks(virDomainDefPtr def, +@@ -383,7 +383,6 @@ xenParseSxprDisks(virDomainDefPtr def, /* There is a case without the uname to the CD-ROM device */ offset = strchr(dst, ':'); if (!offset || -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libsocialweb-branding-openSUSE for openSUSE:Factory
by root＠hilbert.suse.de 16 Apr '14

16 Apr '14

Hello community, here is the log from the commit of package libsocialweb-branding-openSUSE for openSUSE:Factory checked in at 2014-04-16 07:26:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libsocialweb-branding-openSUSE (Old) and /work/SRC/openSUSE:Factory/.libsocialweb-branding-openSUSE.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libsocialweb-branding-openSUSE" Changes: -------- --- /work/SRC/openSUSE:Factory/libsocialweb-branding-openSUSE/libsocialweb-branding-openSUSE.changes 2013-09-09 10:52:56.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libsocialweb-branding-openSUSE.new/libsocialweb-branding-openSUSE.changes 2014-04-16 07:26:56.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Apr 15 11:49:11 UTC 2014 - zaitor(a)opensuse.org + +- Bump version to 13.2, to prepare for next version of openSUSE. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libsocialweb-branding-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.8orsP1/_old 2014-04-16 07:26:57.000000000 +0200 +++ /var/tmp/diff_new_pack.8orsP1/_new 2014-04-16 07:26:57.000000000 +0200 @@ -19,7 +19,7 @@ %define keydir %{_datadir}/libsocialweb/keys Name: libsocialweb-branding-openSUSE -Version: 13.1 +Version: 13.2 Release: 0 Summary: A personal social data server -- API keys from openSUSE License: SUSE-Public-Domain -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libreoffice for openSUSE:Factory
by root＠hilbert.suse.de 16 Apr '14

16 Apr '14

Hello community, here is the log from the commit of package libreoffice for openSUSE:Factory checked in at 2014-04-16 07:26:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libreoffice (Old) and /work/SRC/openSUSE:Factory/.libreoffice.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libreoffice" Changes: -------- --- /work/SRC/openSUSE:Factory/libreoffice/libreoffice.changes 2014-04-14 20:37:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice.changes 2014-04-16 07:26:49.000000000 +0200 @@ -1,0 +2,15 @@ +Tue Apr 15 08:32:38 UTC 2014 - tchvatal(a)suse.com + +- Fix haning in KDE by applying upstream fix. Will be included + in next release. +- added patches: + * kde4-4.2.3.3-timer-mutex.patch + +------------------------------------------------------------------- +Mon Apr 14 20:00:00 UTC 2014 - tbehrens(a)suse.com + +- fix for non-working bluetooth remote control from upstream +- added patches: + * bluez5-support-for-impress-remote.diff + +------------------------------------------------------------------- New: ---- bluez5-support-for-impress-remote.diff kde4-4.2.3.3-timer-mutex.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice.spec ++++++ --- /var/tmp/diff_new_pack.Ca3c4i/_old 2014-04-16 07:26:54.000000000 +0200 +++ /var/tmp/diff_new_pack.Ca3c4i/_new 2014-04-16 07:26:54.000000000 +0200 @@ -87,6 +87,10 @@ Patch13: jvmfwk-disable-gcj.diff # Fix running wizzards in py2 as the utf is not htere Patch16: wizards-create-temlates-with-python-2.6.diff +# Fix fdo#74697 add Bluez 5 support for impress remote. +Patch17: bluez5-support-for-impress-remote.diff +# PATCH-FIX-UPSTREAM: fix kde hanging in 4.2.3.3 +Patch18: kde4-4.2.3.3-timer-mutex.patch # try to save space by using hardlinks Patch990: install-with-hardlinks.diff BuildRequires: ImageMagick @@ -837,6 +841,8 @@ %patch12 %patch13 -p1 %patch16 -p1 +%patch17 -p1 +%patch18 -p1 -R %patch990 -p1 # 256x256 icons tar -xjf %{SOURCE20} ++++++ bluez5-support-for-impress-remote.diff ++++++ ++++ 851 lines (skipped) ++++++ kde4-4.2.3.3-timer-mutex.patch ++++++ >From 7dba6e0a71d090f06a6a1a39e87572674593b48a Mon Sep 17 00:00:00 2001 From: Jan-Marek Glogowski <glogow(a)fbihome.de> Date: Mon, 10 Mar 2014 14:44:05 +0000 Subject: fdo#73115: Always run timeouts as events Right-click popup menus run click events throught the LO main loop. In case of KDE4 the LO main loop is run by a timer in the main thread, with Qt::DirectConnection execution. If the timeout actually starts a nested event loop for a new dialog, the timer is blocked, the nested mainloop detects it was started from the timeout and drops the blocked timout from polling, which blocks any further LibreOffice event loop processing. This changes the timers to Qt::QueuedConnection, so they always generate an event and are processed by the Qt event loop. Change-Id: Ie626b22be3d8f9b8934bcc5e9e0e67a365549cfc (cherry picked from commit aeda478a02523cec146f6af69710f0391061db56) Reviewed-on: https://gerrit.libreoffice.org/8514 Reviewed-by: Caolán McNamara <caolanm(a)redhat.com> Tested-by: Caolán McNamara <caolanm(a)redhat.com> --- diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx index b4be6d6..4a9b70b 100644 --- a/vcl/unx/kde4/KDEXLib.cxx +++ b/vcl/unx/kde4/KDEXLib.cxx @@ -67,9 +67,13 @@ KDEXLib::KDEXLib() : eventLoopType( LibreOfficeEventLoop ), m_bYieldFrozen( false ) { - // the timers created here means they belong to the main thread - connect( &timeoutTimer, SIGNAL( timeout()), this, SLOT( timeoutActivated())); - connect( &userEventTimer, SIGNAL( timeout()), this, SLOT( userEventActivated())); + // the timers created here means they belong to the main thread. + // As the timeoutTimer runs the LO event queue, which may block on a dialog, + // the timer has to use a Qt::QueuedConnection, otherwise the nested event + // loop will detect the blocking timer and drop it from the polling + // freezing LO X11 processing. + connect( &timeoutTimer, SIGNAL( timeout()), this, SLOT( timeoutActivated()), Qt::QueuedConnection ); + connect( &userEventTimer, SIGNAL( timeout()), this, SLOT( userEventActivated()), Qt::QueuedConnection ); // QTimer::start() can be called only in its (here main) thread, so this will // forward between threads if needed -- cgit v0.9.0.2-2-gbebe -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit baekmuk-bitmap-fonts for openSUSE:Factory
by root＠hilbert.suse.de 16 Apr '14

16 Apr '14

Hello community, here is the log from the commit of package baekmuk-bitmap-fonts for openSUSE:Factory checked in at 2014-04-16 07:25:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/baekmuk-bitmap-fonts (Old) and /work/SRC/openSUSE:Factory/.baekmuk-bitmap-fonts.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "baekmuk-bitmap-fonts" Changes: -------- --- /work/SRC/openSUSE:Factory/baekmuk-bitmap-fonts/baekmuk-bitmap-fonts.changes 2012-09-14 12:14:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.baekmuk-bitmap-fonts.new/baekmuk-bitmap-fonts.changes 2014-04-16 07:25:16.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Apr 14 13:08:55 CEST 2014 - kukuk(a)suse.de + +- Fix typos in Obsoletes + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ baekmuk-bitmap-fonts.spec ++++++ --- /var/tmp/diff_new_pack.f3t0GJ/_old 2014-04-16 07:25:17.000000000 +0200 +++ /var/tmp/diff_new_pack.f3t0GJ/_new 2014-04-16 07:25:17.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package baekmuk-bitmap-fonts # -# Copyright (c) 2012 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 @@ -55,7 +55,7 @@ BuildRequires: fontpackages-devel Provides: baekmuk = %{version} Provides: locale(xorg-x11:ko) -Obsoletes: baekumk <= 2.1 +Obsoletes: baekmuk < 2.1 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -68,7 +68,7 @@ Provides: baekmuk-ttf = %{version} Provides: scalable-font-ko Provides: locale(ko) -Obsoletes: baekumk-ttf <= 2.1 +Obsoletes: baekmuk-ttf < 2.1 %description -n baekmuk-ttf-fonts Baekmuk Fonts (Korean fonts for the X Window System, True Type -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit permissions for openSUSE:Factory
by root＠hilbert.suse.de 16 Apr '14

16 Apr '14

Hello community, here is the log from the commit of package permissions for openSUSE:Factory checked in at 2014-04-16 07:25:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/permissions (Old) and /work/SRC/openSUSE:Factory/.permissions.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "permissions" Changes: -------- --- /work/SRC/openSUSE:Factory/permissions/permissions.changes 2014-03-27 06:15:20.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.permissions.new/permissions.changes 2014-04-16 07:25:05.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Apr 15 14:24:36 UTC 2014 - meissner(a)suse.com + +- duplicate /var/run entries to /run (bnc#873708) + +------------------------------------------------------------------- Old: ---- permissions-2014.03.24.1202.tar.bz2 New: ---- permissions-2014.04.15.1621.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ permissions.spec ++++++ --- /var/tmp/diff_new_pack.2iXgbt/_old 2014-04-16 07:25:08.000000000 +0200 +++ /var/tmp/diff_new_pack.2iXgbt/_new 2014-04-16 07:25:08.000000000 +0200 @@ -20,7 +20,7 @@ BuildRequires: libcap-devel Name: permissions -Version: 2014.03.24.1202 +Version: 2014.04.15.1621 Release: 0 Provides: aaa_base:/etc/permissions PreReq: %fillup_prereq ++++++ permissions-2014.03.24.1202.tar.bz2 -> permissions-2014.04.15.1621.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/permissions-2014.03.24.1202/permissions new/permissions-2014.04.15.1621/permissions --- old/permissions-2014.03.24.1202/permissions 2014-03-24 12:02:32.000000000 +0100 +++ new/permissions-2014.04.15.1621/permissions 2014-04-15 16:21:15.000000000 +0200 @@ -71,7 +71,9 @@ /var/cache/man/ man:root 755 /var/yp/ root:root 755 /var/run/nscd/socket root:root 666 +/run/nscd/socket root:root 666 /var/run/sudo/ root:root 700 +/run/sudo/ root:root 700 # # login tracking @@ -81,6 +83,7 @@ /var/log/wtmp root:utmp 664 /var/log/btmp root:root 600 /var/run/utmp root:utmp 664 +/run/utmp root:utmp 664 # # some device files diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/permissions-2014.03.24.1202/permissions.easy new/permissions-2014.04.15.1621/permissions.easy --- old/permissions-2014.03.24.1202/permissions.easy 2014-03-24 12:02:32.000000000 +0100 +++ new/permissions-2014.04.15.1621/permissions.easy 2014-04-15 16:21:15.000000000 +0200 @@ -19,6 +19,7 @@ # for screen's session sockets: /var/run/uscreens/ root:root 1777 +/run/uscreens/ root:root 1777 # # /etc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/permissions-2014.03.24.1202/permissions.paranoid new/permissions-2014.04.15.1621/permissions.paranoid --- old/permissions-2014.03.24.1202/permissions.paranoid 2014-03-24 12:02:32.000000000 +0100 +++ new/permissions-2014.04.15.1621/permissions.paranoid 2014-04-15 16:21:15.000000000 +0200 @@ -33,6 +33,7 @@ # # for screen's session sockets: /var/run/uscreens/ root:trusted 1775 +/run/uscreens/ root:trusted 1775 # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/permissions-2014.03.24.1202/permissions.secure new/permissions-2014.04.15.1621/permissions.secure --- old/permissions-2014.03.24.1202/permissions.secure 2014-03-24 12:02:32.000000000 +0100 +++ new/permissions-2014.04.15.1621/permissions.secure 2014-04-15 16:21:15.000000000 +0200 @@ -57,6 +57,7 @@ # # for screen's session sockets: /var/run/uscreens/ root:root 1777 +/run/uscreens/ root:root 1777 # # /etc -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit servletapi4 for openSUSE:Factory
by root＠hilbert.suse.de 15 Apr '14

15 Apr '14

Hello community, here is the log from the commit of package servletapi4 for openSUSE:Factory checked in at 2014-04-15 11:47:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/servletapi4 (Old) and /work/SRC/openSUSE:Factory/.servletapi4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "servletapi4" Changes: -------- --- /work/SRC/openSUSE:Factory/servletapi4/servletapi4.changes 2013-09-12 17:04:33.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.servletapi4.new/servletapi4.changes 2014-04-15 11:47:02.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Feb 7 08:46:53 UTC 2014 - fcrozat(a)suse.com + +- Fix license tag, should be Apache-1.1 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ servletapi4.spec ++++++ --- /var/tmp/diff_new_pack.aqsf4G/_old 2014-04-15 11:47:02.000000000 +0200 +++ /var/tmp/diff_new_pack.aqsf4G/_new 2014-04-15 11:47:02.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package servletapi4 # -# 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 @@ -30,7 +30,7 @@ Version: 4.0.4 Release: 0 Summary: Java servlet and JSP implementation classes -License: Apache-2.0 +License: Apache-1.1 Group: Development/Libraries/Java Source: %{full_name}-4-src.tar.gz Patch150: java150_build.patch -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pumpa for openSUSE:Factory
by root＠hilbert.suse.de 15 Apr '14

15 Apr '14

Hello community, here is the log from the commit of package pumpa for openSUSE:Factory checked in at 2014-04-15 11:46:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pumpa (Old) and /work/SRC/openSUSE:Factory/.pumpa.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pumpa" Changes: -------- New Changes file: --- /dev/null 2014-02-13 01:09:38.344032506 +0100 +++ /work/SRC/openSUSE:Factory/.pumpa.new/pumpa.changes 2014-04-15 11:46:57.000000000 +0200 @@ -0,0 +1,4 @@ +------------------------------------------------------------------- +Thu Apr 3 13:47:55 UTC 2014 - sor.alexei(a)meowr.ru + +- Initial package. New: ---- pumpa-0.8.3.tar.gz pumpa.changes pumpa.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pumpa.spec ++++++ # # spec file for package pumpa # # 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/ # Name: pumpa Version: 0.8.3 Release: 0 License: GPL-3.0+ Summary: A simple pump.io client written in C++/Qt Url: http://saz.im/software/pumpa.html Group: System/GUI Source: %{name}-%{version}.tar.gz BuildRequires: pkg-config BuildRequires: gcc-c++ BuildRequires: pkgconfig(QtGui) BuildRequires: pkgconfig(QJson) BuildRequires: update-desktop-files BuildRequires: fdupes %description Pumpa is a simple pump.io client written in C++ and Qt and licensed under the GNU GPL 3.0 (or later). %prep %setup -q sed -i 's/^Icon=$.*$/Icon=pumpa/' %{name}.desktop %build qmake -makefile %{name}.pro \ QMAKE_CFLAGS="%{optflags}" \ QMAKE_CXXFLAGS="%{optflags}" make %{?_smp_mflags} %install make install mkdir -p %{buildroot}%{_datadir}/%{name}/images/ %{buildroot}%{_datadir}/%{name}/translations/ install -Dm 0644 images/%{name}.png %{buildroot}/%{_datadir}/icons/hicolor/32x32/apps/%{name}.png install -Dm 0755 %{name} %{buildroot}%{_bindir}/%{name} install -Dm 0644 %{name}.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop install -m 0644 images/* %{buildroot}%{_datadir}/%{name}/images/ install -m 0644 translations/*.qm %{buildroot}%{_datadir}/%{name}/translations/ %suse_update_desktop_file -G "pump.io client" -r %{name} Network InstantMessaging fdupes %{buildroot} %find_lang %{name} --with-qt %files %defattr(-,root,root) %doc LICENSE README %{_bindir}/%{name} %{_datadir}/%{name}/ %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/ %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 plasmoid-cwp for openSUSE:Factory
by root＠hilbert.suse.de 15 Apr '14

15 Apr '14

Hello community, here is the log from the commit of package plasmoid-cwp for openSUSE:Factory checked in at 2014-04-15 11:46:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plasmoid-cwp (Old) and /work/SRC/openSUSE:Factory/.plasmoid-cwp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "plasmoid-cwp" Changes: -------- --- /work/SRC/openSUSE:Factory/plasmoid-cwp/plasmoid-cwp.changes 2014-01-30 11:37:14.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.plasmoid-cwp.new/plasmoid-cwp.changes 2014-04-15 11:46:52.000000000 +0200 @@ -1,0 +2,10 @@ +Thu Apr 10 19:40:22 UTC 2014 - asterios.dramis(a)gmail.com + +- Update to version 1.10.2: + * xml: gismeteo.com: city name fixed in some cases + From 1.10.1: + * xml: wetter.com: Current temperature fixed + * xml: openweathermap.org: north wind symbol fixed (thanks to wettermeister) + * xml: gismeteo.com: city name fixed in some cases + +------------------------------------------------------------------- Old: ---- 98925-cwp-1.10.0.tar.bz2 New: ---- 98925-cwp-1.10.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasmoid-cwp.spec ++++++ --- /var/tmp/diff_new_pack.kaozTu/_old 2014-04-15 11:46:52.000000000 +0200 +++ /var/tmp/diff_new_pack.kaozTu/_new 2014-04-15 11:46:52.000000000 +0200 @@ -18,7 +18,7 @@ Name: plasmoid-cwp -Version: 1.10.0 +Version: 1.10.2 Release: 0 Summary: Customizable Weather Plasmoid License: GPL-3.0+ ++++++ 98925-cwp-1.10.0.tar.bz2 -> 98925-cwp-1.10.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.10.0/ChangeLog new/cwp-1.10.2/ChangeLog --- old/cwp-1.10.0/ChangeLog 2014-01-25 18:01:47.000000000 +0100 +++ new/cwp-1.10.2/ChangeLog 2014-03-16 22:40:28.000000000 +0100 @@ -1,3 +1,13 @@ +1.10.2 +====== +- xml: gismeteo.com: city name fixed in some cases + +1.10.1 +====== +- xml: wetter.com: Current temperature fixed +- xml: openweathermap.org: north wind symbol fixed (thanks to wettermeister) +- xml: gismeteo.com: city name fixed in some cases + 1.10.0 ====== - weather information is stored on disk each time updates are downloaded diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.10.0/README new/cwp-1.10.2/README --- old/cwp-1.10.0/README 2014-01-25 18:01:47.000000000 +0100 +++ new/cwp-1.10.2/README 2014-03-16 22:40:28.000000000 +0100 @@ -1,5 +1,5 @@ ========================================== -Customizable Weather Plasmoid (CWP) 1.10.0 +Customizable Weather Plasmoid (CWP) 1.10.2 ========================================== This is another weather plasmoid. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.10.0/data/br_weather_com.xml new/cwp-1.10.2/data/br_weather_com.xml --- old/cwp-1.10.0/data/br_weather_com.xml 2014-01-25 18:01:47.000000000 +0100 +++ new/cwp-1.10.2/data/br_weather_com.xml 2014-03-16 22:40:28.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2014-01-25" name="br.weather.com" search_page="http://br.weather.com" example_zip="BRXX0043:1:BR" unit="C" /> + <xml_file_version type="cwp" version="2014-03-16" name="br.weather.com" search_page="http://br.weather.com" example_zip="BRXX0043:1:BR" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.10.0/data/de_weather_com.xml new/cwp-1.10.2/data/de_weather_com.xml --- old/cwp-1.10.0/data/de_weather_com.xml 2014-01-25 18:01:47.000000000 +0100 +++ new/cwp-1.10.2/data/de_weather_com.xml 2014-03-16 22:40:28.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2014-01-25" name="de.weather.com" search_page="http://de.weather.com" example_zip="GMXX0087:1:GM" unit="C" /> + <xml_file_version type="cwp" version="2014-03-16" name="de.weather.com" search_page="http://de.weather.com" example_zip="GMXX0087:1:GM" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.10.0/data/espanol_weather_com.xml new/cwp-1.10.2/data/espanol_weather_com.xml --- old/cwp-1.10.0/data/espanol_weather_com.xml 2014-01-25 18:01:47.000000000 +0100 +++ new/cwp-1.10.2/data/espanol_weather_com.xml 2014-03-16 22:40:28.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2014-01-25" name="espanol.weather.com" search_page="http://espanol.weather.com" example_zip="Ciudad-de-Mexico-MXDF0132" unit="C" /> + <xml_file_version type="cwp" version="2014-03-16" name="espanol.weather.com" search_page="http://espanol.weather.com" example_zip="Ciudad-de-Mexico-MXDF0132" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.10.0/data/fr_weather_com.xml new/cwp-1.10.2/data/fr_weather_com.xml --- old/cwp-1.10.0/data/fr_weather_com.xml 2014-01-25 18:01:47.000000000 +0100 +++ new/cwp-1.10.2/data/fr_weather_com.xml 2014-03-16 22:40:28.000000000 +0100 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2014-01-25" name="fr.weather.com" search_page="http://fr.weather.com" example_zip="FRXX0076:1:FR" unit="C" /> + <xml_file_version type="cwp" version="2014-03-16" name="fr.weather.com" search_page="http://fr.weather.com" example_zip="FRXX0076:1:FR" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.10.0/data/freemeteo_com_celsius.xml new/cwp-1.10.2/data/freemeteo_com_celsius.xml --- old/cwp-1.10.0/data/freemeteo_com_celsius.xml 2014-01-25 18:01:47.000000000 +0100 +++ new/cwp-1.10.2/data/freemeteo_com_celsius.xml 2014-03-16 22:40:28.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2014-01-25" name="freemeteo.com" search_page="http://freemeteo.com" example_zip="gid=3117735&la=4" unit="C" /> + <xml_file_version type="cwp" version="2014-03-16" name="freemeteo.com" search_page="http://freemeteo.com" example_zip="gid=3117735&la=4" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.10.0/data/freemeteo_com_fahrenheit.xml new/cwp-1.10.2/data/freemeteo_com_fahrenheit.xml --- old/cwp-1.10.0/data/freemeteo_com_fahrenheit.xml 2014-01-25 18:01:47.000000000 +0100 +++ new/cwp-1.10.2/data/freemeteo_com_fahrenheit.xml 2014-03-16 22:40:28.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2014-01-25" name="freemeteo.com" search_page="http://freemeteo.com" example_zip="gid=3117735&la=4" unit="F" /> + <xml_file_version type="cwp" version="2014-03-16" name="freemeteo.com" search_page="http://freemeteo.com" example_zip="gid=3117735&la=4" unit="F" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.10.0/data/ilmeteo_it.xml new/cwp-1.10.2/data/ilmeteo_it.xml --- old/cwp-1.10.0/data/ilmeteo_it.xml 2014-01-25 18:01:47.000000000 +0100 +++ new/cwp-1.10.2/data/ilmeteo_it.xml 2014-03-16 22:40:28.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2014-01-25" name="ilmeteo.it" search_page="http://www.ilmeteo.it" example_zip="Roma" unit="C" /> + <xml_file_version type="cwp" version="2014-03-16" name="ilmeteo.it" search_page="http://www.ilmeteo.it" example_zip="Roma" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.10.0/data/in_weather_com.xml new/cwp-1.10.2/data/in_weather_com.xml --- old/cwp-1.10.0/data/in_weather_com.xml 2014-01-25 18:01:47.000000000 +0100 +++ new/cwp-1.10.2/data/in_weather_com.xml 2014-03-16 22:40:28.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2014-01-25" name="in.weather.com" search_page="http://in.weather.com" example_zip="New-Delhi-INXX0096" unit="C" /> + <xml_file_version type="cwp" version="2014-03-16" name="in.weather.com" search_page="http://in.weather.com" example_zip="New-Delhi-INXX0096" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.10.0/data/myforecast_com_celsius.xml new/cwp-1.10.2/data/myforecast_com_celsius.xml --- old/cwp-1.10.0/data/myforecast_com_celsius.xml 2014-01-25 18:01:47.000000000 +0100 +++ new/cwp-1.10.2/data/myforecast_com_celsius.xml 2014-03-16 22:40:28.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2014-01-25" name="www.myforecast.com" search_page="http://www.myforecast.com" example_zip="12844" unit="C" /> + <xml_file_version type="cwp" version="2014-03-16" name="www.myforecast.com" search_page="http://www.myforecast.com" example_zip="12844" unit="C" /> <locale_settings locale="en" encoding="latin1" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.10.0/data/myforecast_com_fahrenheit.xml new/cwp-1.10.2/data/myforecast_com_fahrenheit.xml --- old/cwp-1.10.0/data/myforecast_com_fahrenheit.xml 2014-01-25 18:01:47.000000000 +0100 +++ new/cwp-1.10.2/data/myforecast_com_fahrenheit.xml 2014-03-16 22:40:28.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2014-01-25" name="www.myforecast.com" search_page="http://www.myforecast.com" example_zip="12844" unit="F" /> + <xml_file_version type="cwp" version="2014-03-16" name="www.myforecast.com" search_page="http://www.myforecast.com" example_zip="12844" unit="F" /> <locale_settings locale="en" encoding="latin1" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.10.0/data/openweathermap_org.xml new/cwp-1.10.2/data/openweathermap_org.xml --- old/cwp-1.10.0/data/openweathermap_org.xml 2014-01-25 18:01:47.000000000 +0100 +++ new/cwp-1.10.2/data/openweathermap_org.xml 2014-03-16 22:40:28.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2014-01-25" name="openweathermap.org" search_page="http://www.openweathermap.org" example_zip="id=2643743 or q=London,UK" unit="C" /> + <xml_file_version type="cwp" version="2014-03-16" name="openweathermap.org" search_page="http://www.openweathermap.org" example_zip="id=2643743 or q=London,UK" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> @@ -38,7 +38,7 @@ /> <data_current_wind url="urlc" - wind_code="tr -d '\r' | tr -d '\n' | sed -e "s/.*wind.*\"speed\":\"*$[^\",]*$[^{}]*deg\":\"*$[^\",}]*$.*/\2/" | awk '{print int(($0+11.25)/22.5)}'" + wind_code="tr -d '\r' | tr -d '\n' | sed -e "s/.*wind.*\"speed\":\"*$[^\",]*$[^{}]*deg\":\"*$[^\",}]*$.*/\2/" | awk '{print int((($0+11.25)/22.5)%16)}'" wind_speed="tr -d '\r' | tr -d '\n' | sed -e "s/.*wind.*\"speed\":\"*$[^\",}]*$.*/\1 km\/h/"" wind="tr -d '\r' | tr -d '\n' | sed -e "s/.*wind.*\"speed\":\"*$[^\",]*$[^{}]*deg\":\"*$[^\",}]*$.*/\1 km\/h at \2°/"" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.10.0/data/pogodynka_pl.xml new/cwp-1.10.2/data/pogodynka_pl.xml --- old/cwp-1.10.0/data/pogodynka_pl.xml 2014-01-25 18:01:47.000000000 +0100 +++ new/cwp-1.10.2/data/pogodynka_pl.xml 2014-03-16 22:40:28.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2014-01-25" name="pogodynka.pl" search_page="http://www.pogodynka.pl" example_zip="polska/warszawa_warszawa" unit="C" /> + <xml_file_version type="cwp" version="2014-03-16" name="pogodynka.pl" search_page="http://www.pogodynka.pl" example_zip="polska/warszawa_warszawa" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.10.0/data/satellite_images.xml new/cwp-1.10.2/data/satellite_images.xml --- old/cwp-1.10.0/data/satellite_images.xml 2014-01-25 18:01:47.000000000 +0100 +++ new/cwp-1.10.2/data/satellite_images.xml 2014-03-16 22:40:28.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp_satellite_images" version="2014-01-25" /> + <xml_file_version type="cwp_satellite_images" version="2014-03-16" />  <image name="- - Global - -" url="" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.10.0/data/uk_weather_com.xml new/cwp-1.10.2/data/uk_weather_com.xml --- old/cwp-1.10.0/data/uk_weather_com.xml 2014-01-25 18:01:47.000000000 +0100 +++ new/cwp-1.10.2/data/uk_weather_com.xml 2014-03-16 22:40:28.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2014-01-25" name="uk.weather.com" search_page="http://uk.weather.com" example_zip="London-UKXX0085" unit="C" /> + <xml_file_version type="cwp" version="2014-03-16" name="uk.weather.com" search_page="http://uk.weather.com" example_zip="London-UKXX0085" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.10.0/data/wetter_com.xml new/cwp-1.10.2/data/wetter_com.xml --- old/cwp-1.10.0/data/wetter_com.xml 2014-01-25 18:01:47.000000000 +0100 +++ new/cwp-1.10.2/data/wetter_com.xml 2014-03-16 22:40:28.000000000 +0100 @@ -2,7 +2,7 @@ <custom_weather> - <xml_file_version type="cwp" version="2014-01-25" name="wetter.com" search_page="http://www.wetter.com" example_zip="DE0006515" unit="C" /> + <xml_file_version type="cwp" version="2014-03-16" name="wetter.com" search_page="http://www.wetter.com" example_zip="DE0006515" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> <urlc urlc_prefix="http://www.wetter.com/wetter_aktuell/aktuelles_wetter/deutschland/" urlc_suffix=".html" urlc_follow="" /> @@ -26,7 +26,7 @@ <data_current_temperature url="urlc" update_time="grep -A 4 'Aktueller Stand' | grep : | sed -r 's/[^0-9]*([0-9]{1,2}:[0-9]{2}).*/\1/'" - temperature="grep -A 1 'class="degree"' | grep ° | sed -r 's/^\s*([^ ]+).*$/\1/'" + temperature="grep -A 1 'class="degree[-]*[i]*[n]*"' | grep ° | sed -r 's/^\s*([^ ]+).*$/\1/'" temperature_felt="echo -n" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.10.0/data/www_accuweather_com_us_celsius.xml new/cwp-1.10.2/data/www_accuweather_com_us_celsius.xml --- old/cwp-1.10.0/data/www_accuweather_com_us_celsius.xml 2014-01-25 18:01:47.000000000 +0100 +++ new/cwp-1.10.2/data/www_accuweather_com_us_celsius.xml 2014-03-16 22:40:28.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2014-01-25" name="www.accuweather.com US" search_page="http://www.accuweather.com" example_zip="phoenix-az/85003/weather-forecast/346935" unit="C" /> + <xml_file_version type="cwp" version="2014-03-16" name="www.accuweather.com US" search_page="http://www.accuweather.com" example_zip="phoenix-az/85003/weather-forecast/346935" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.10.0/data/www_accuweather_com_us_fahrenheit.xml new/cwp-1.10.2/data/www_accuweather_com_us_fahrenheit.xml --- old/cwp-1.10.0/data/www_accuweather_com_us_fahrenheit.xml 2014-01-25 18:01:47.000000000 +0100 +++ new/cwp-1.10.2/data/www_accuweather_com_us_fahrenheit.xml 2014-03-16 22:40:28.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2014-01-25" name="www.accuweather.com US" search_page="http://www.accuweather.com" example_zip="phoenix-az/85003/weather-forecast/346935" unit="F" /> + <xml_file_version type="cwp" version="2014-03-16" name="www.accuweather.com US" search_page="http://www.accuweather.com" example_zip="phoenix-az/85003/weather-forecast/346935" unit="F" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.10.0/data/www_accuweather_com_world_celsius.xml new/cwp-1.10.2/data/www_accuweather_com_world_celsius.xml --- old/cwp-1.10.0/data/www_accuweather_com_world_celsius.xml 2014-01-25 18:01:47.000000000 +0100 +++ new/cwp-1.10.2/data/www_accuweather_com_world_celsius.xml 2014-03-16 22:40:28.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2014-01-25" name="www.accuweather.com World" search_page="http://www.accuweather.com" example_zip="za/johannesburg/305448/weather-forecast/305448" unit="C" /> + <xml_file_version type="cwp" version="2014-03-16" name="www.accuweather.com World" search_page="http://www.accuweather.com" example_zip="za/johannesburg/305448/weather-forecast/305448" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.10.0/data/www_accuweather_com_world_fahrenheit.xml new/cwp-1.10.2/data/www_accuweather_com_world_fahrenheit.xml --- old/cwp-1.10.0/data/www_accuweather_com_world_fahrenheit.xml 2014-01-25 18:01:47.000000000 +0100 +++ new/cwp-1.10.2/data/www_accuweather_com_world_fahrenheit.xml 2014-03-16 22:40:28.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2014-01-25" name="www.accuweather.com World" search_page="http://www.accuweather.com" example_zip="za/johannesburg/305448/weather-forecast/305448" unit="F" /> + <xml_file_version type="cwp" version="2014-03-16" name="www.accuweather.com World" search_page="http://www.accuweather.com" example_zip="za/johannesburg/305448/weather-forecast/305448" unit="F" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.10.0/data/www_gismeteo_com.xml new/cwp-1.10.2/data/www_gismeteo_com.xml --- old/cwp-1.10.0/data/www_gismeteo_com.xml 2014-01-25 18:01:47.000000000 +0100 +++ new/cwp-1.10.2/data/www_gismeteo_com.xml 2014-03-16 22:40:28.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2014-01-25" name="www.gismeteo.com" search_page="http://www.gismeteo.ru" example_zip="4944" unit="C" /> + <xml_file_version type="cwp" version="2014-03-16" name="www.gismeteo.com" search_page="http://www.gismeteo.ru" example_zip="4944" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> @@ -22,8 +22,8 @@ <url7 url7_prefix="" url7_suffix="" url7_follow="" /> <data_location url="urlc" - location="grep type[CT] | sed -e "s/<[^>]*>//g"" - country="grep v:title | sed -e "s/.*v:title\">$[^<]*$.*/\1/"" + location="grep v:title | sed -e "s/v:title/\nv:title/g" | grep v:title | head -n 1 | sed -e "s/.*v:title\">$[^<]*$.*/\1/"" + country="grep v:title | sed -e "s/v:title/\nv:title/g" | grep v:title | tail -n 1 | sed -e "s/.*v:title\">$[^<]*$.*/\1/"" /> <data_sun url="urlc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.10.0/data/www_weather_com.cn.xml new/cwp-1.10.2/data/www_weather_com.cn.xml --- old/cwp-1.10.0/data/www_weather_com.cn.xml 2014-01-25 18:01:47.000000000 +0100 +++ new/cwp-1.10.2/data/www_weather_com.cn.xml 2014-03-16 22:40:28.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2014-01-25" name="www.weather.com.cn" search_page="http://www.weather.com.cn" example_zip="101010100" unit="C" /> + <xml_file_version type="cwp" version="2014-03-16" name="www.weather.com.cn" search_page="http://www.weather.com.cn" example_zip="101010100" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.10.0/data/www_weather_com.xml new/cwp-1.10.2/data/www_weather_com.xml --- old/cwp-1.10.0/data/www_weather_com.xml 2014-01-25 18:01:47.000000000 +0100 +++ new/cwp-1.10.2/data/www_weather_com.xml 2014-03-16 22:40:28.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2014-01-25" name="www.weather.com" search_page="http://www.weather.com" example_zip="USDC0001" unit="F" /> + <xml_file_version type="cwp" version="2014-03-16" name="www.weather.com" search_page="http://www.weather.com" example_zip="USDC0001" unit="F" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.10.0/plasma-applet-cwp.desktop new/cwp-1.10.2/plasma-applet-cwp.desktop --- old/cwp-1.10.0/plasma-applet-cwp.desktop 2014-01-25 18:01:47.000000000 +0100 +++ new/cwp-1.10.2/plasma-applet-cwp.desktop 2014-03-16 22:40:28.000000000 +0100 @@ -30,7 +30,7 @@ X-KDE-PluginInfo-Author=Georg Hennig X-KDE-PluginInfo-Email=georg.hennig(a)web.de X-KDE-PluginInfo-Name=plasma_applet_cwp -X-KDE-PluginInfo-Version=1.10.0 +X-KDE-PluginInfo-Version=1.10.2 X-KDE-PluginInfo-Website=http://www.kde-look.org/content/show.php/show.php?… X-KDE-PluginInfo-Category= X-KDE-PluginInfo-Depends= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.10.0/version.h new/cwp-1.10.2/version.h --- old/cwp-1.10.0/version.h 2014-01-25 18:01:47.000000000 +0100 +++ new/cwp-1.10.2/version.h 2014-03-16 22:40:28.000000000 +0100 @@ -20,7 +20,7 @@ #ifndef version_h #define version_h -#define VERSION "1.10.0" +#define VERSION "1.10.2" #define DATE "2009-2014" #define AUTHOR "Georg Hennig" #define NAME "Customizable Weather Plasmoid (CWP)" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit nagios for openSUSE:Factory
by root＠hilbert.suse.de 15 Apr '14

15 Apr '14

Hello community, here is the log from the commit of package nagios for openSUSE:Factory checked in at 2014-04-15 11:46:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nagios (Old) and /work/SRC/openSUSE:Factory/.nagios.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "nagios" Changes: -------- --- /work/SRC/openSUSE:Factory/nagios/nagios.changes 2014-03-30 12:19:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.nagios.new/nagios.changes 2014-04-15 11:46:48.000000000 +0200 @@ -1,0 +2,11 @@ +Sat Apr 12 14:04:27 UTC 2014 - lars(a)linux-schulserver.de + +- update to 4.0.5: + + Fixed bug #595: Nagios 4 security fix + + Fixed bug #594: Nagios 4 fix contactgroups parsing + + Fixed bug #577: Nagios 4 checks stalled when write to socket failed + + Fixed bug #580: Nagios 4 memory leak + + Fixed bug where audio alerts wouldn't work with a 0 height and + width - http://support.nagios.com/forum/viewtopic.php?t=26387 + +------------------------------------------------------------------- Old: ---- nagios-4.0.4.tar.bz2 New: ---- nagios-4.0.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nagios.spec ++++++ --- /var/tmp/diff_new_pack.wOf4rK/_old 2014-04-15 11:46:49.000000000 +0200 +++ /var/tmp/diff_new_pack.wOf4rK/_new 2014-04-15 11:46:49.000000000 +0200 @@ -17,7 +17,7 @@ Name: nagios -Version: 4.0.4 +Version: 4.0.5 Release: 0 Summary: The Nagios Network Monitor License: GPL-2.0+ ++++++ nagios-4.0.4.tar.bz2 -> nagios-4.0.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nagios-4.0.4/Changelog new/nagios-4.0.5/Changelog --- old/nagios-4.0.4/Changelog 2014-03-14 18:24:57.000000000 +0100 +++ new/nagios-4.0.5/Changelog 2014-04-11 20:37:42.000000000 +0200 @@ -2,6 +2,17 @@ Nagios Core 4 Change Log ######################## +4.0.5 - 04/11/2014 +------------------ +* Fixed bug #595: Nagios 4 security fix (Alexey Dvoryanchikov, Eric Stanley) +* Fixed bug #594: Nagios 4 fix contactgroups parsing (Alexey Dvoryanchikov, Eric Stanley) +* Fixed bug #577: Nagios 4 checks stalled when write to socket failed (Alexey Dvoryanchikov) +* Fixed bug #580: Nagios 4 memory leak (Eric Stanley) +* Fixed init script to remove the switching of users when performing configuration verification which was causing failures if nagios user was set to nologin (Scott Wilkerson) +* Fixed auto creation of RAMDISK via environment variables in init script to properly check existence using $RAMDISK_DIR environment variable. (Scott Wilkerson) +* Fixed unreferenced variable NagiosVarDir in daemon-init (Eric Mislivec) +* Fixed bug where audio alerts wouldn't work with a 0 height and width - http://support.nagios.com/forum/viewtopic.php?t=26387 (Scott Wilkerson) + 4.0.4 - 03/14/2014 ------------------ ENHANCEMENTS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nagios-4.0.4/base/checks.c new/nagios-4.0.5/base/checks.c --- old/nagios-4.0.4/base/checks.c 2014-03-14 18:24:57.000000000 +0100 +++ new/nagios-4.0.5/base/checks.c 2014-04-11 20:37:42.000000000 +0200 @@ -308,7 +308,7 @@ my_free(processed_command); clear_volatile_macros_r(&mac); - return OK; + return runchk_result; } @@ -2107,7 +2107,7 @@ clear_volatile_macros_r(&mac); my_free(processed_command); - return OK; + return runchk_result; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nagios-4.0.4/base/notifications.c new/nagios-4.0.5/base/notifications.c --- old/nagios-4.0.4/base/notifications.c 2014-03-14 18:24:57.000000000 +0100 +++ new/nagios-4.0.5/base/notifications.c 2014-04-11 20:37:42.000000000 +0200 @@ -259,9 +259,13 @@ */ clear_summary_macros_r(&mac); clear_contact_macros_r(&mac); + clear_contactgroup_macros_r(&mac); clear_argv_macros_r(&mac); clear_host_macros_r(&mac); + clear_hostgroup_macros_r(&mac); clear_service_macros_r(&mac); + clear_servicegroup_macros_r(&mac); + clear_datetime_macros_r(&mac); if(type == NOTIFICATION_NORMAL) { @@ -1202,8 +1206,11 @@ */ clear_summary_macros_r(&mac); clear_contact_macros_r(&mac); + clear_contactgroup_macros_r(&mac); clear_argv_macros_r(&mac); clear_host_macros_r(&mac); + clear_hostgroup_macros_r(&mac); + clear_datetime_macros_r(&mac); if(type == NOTIFICATION_NORMAL) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nagios-4.0.4/base/workers.c new/nagios-4.0.5/base/workers.c --- old/nagios-4.0.4/base/workers.c 2014-03-14 18:24:57.000000000 +0100 +++ new/nagios-4.0.5/base/workers.c 2014-04-11 20:37:42.000000000 +0200 @@ -683,7 +683,11 @@ if (error_reason) { logit(NSLOG_RUNTIME_ERROR, TRUE, "wproc: %s job %d from worker %s %s", wpjob_type_name(job->type), job->id, wp->name, error_reason); +#ifdef DEBUG + /* The log below could leak sensitive information, such as + passwords, so only enable it if you neally need it */ logit(NSLOG_RUNTIME_ERROR, TRUE, "wproc: command: %s\n", job->command); +#endif if (job->type != WPJOB_CHECK && oj) { logit(NSLOG_RUNTIME_ERROR, TRUE, "wproc: host=%s; service=%s; contact=%s\n", oj->host_name ? oj->host_name : "(none)", @@ -999,7 +1003,8 @@ kvvec_destroy(env_kvvp, KVVEC_FREE_KEYS); } else { - kvvec_addkv(&kvv, "env", env_kvvb->buf); + kvvec_addkv_wlen(&kvv, "env", strlen("env"), env_kvvb->buf, + env_kvvb->buflen); } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nagios-4.0.4/cgi/status.c new/nagios-4.0.5/cgi/status.c --- old/nagios-4.0.4/cgi/status.c 2014-03-14 18:24:57.000000000 +0100 +++ new/nagios-4.0.5/cgi/status.c 2014-04-11 20:37:42.000000000 +0200 @@ -440,7 +440,7 @@ else if(problem_services_unknown == 0 && problem_services_warning == 0 && problem_services_critical == 0 && problem_hosts_down == 0 && problem_hosts_unreachable == 0 && normal_sound != NULL) sound = normal_sound; if(sound != NULL) { - printf("<object type=\"audio/x-wav\" data=\"%s%s\" height=\"0\" width=\"0\">", url_media_path, sound); + printf("<object type=\"audio/x-wav\" data=\"%s%s\" height=\"1\" width=\"1\">", url_media_path, sound); printf("<param name=\"filename\" value=\"%s%s\">", url_media_path, sound); printf("<param name=\"autostart\" value=\"true\">"); printf("<param name=\"playcount\" value=\"1\">"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nagios-4.0.4/cgi/tac.c new/nagios-4.0.5/cgi/tac.c --- old/nagios-4.0.4/cgi/tac.c 2014-03-14 18:24:57.000000000 +0100 +++ new/nagios-4.0.5/cgi/tac.c 2014-04-11 20:37:42.000000000 +0200 @@ -239,7 +239,7 @@ else if(services_unknown_unacknowledged == 0 && services_warning_unacknowledged == 0 && services_critical_unacknowledged == 0 && hosts_down_unacknowledged == 0 && hosts_unreachable_unacknowledged == 0 && normal_sound != NULL) sound = normal_sound; if(sound != NULL) { - printf("<object type=\"audio/x-wav\" data=\"%s%s\" height=\"-\" width=\"0\">", url_media_path, sound); + printf("<object type=\"audio/x-wav\" data=\"%s%s\" height=\"1\" width=\"1\">", url_media_path, sound); printf("<param name=\"filename\" value=\"%s%s\">", url_media_path, sound); printf("<param name=\"autostart\" value=\"true\">"); printf("<param name=\"playcount\" value=\"1\">"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nagios-4.0.4/common/macros.c new/nagios-4.0.5/common/macros.c --- old/nagios-4.0.4/common/macros.c 2014-03-14 18:24:57.000000000 +0100 +++ new/nagios-4.0.5/common/macros.c 2014-04-11 20:37:42.000000000 +0200 @@ -1018,6 +1018,7 @@ case MACRO_SHORTDATETIME: case MACRO_DATE: case MACRO_TIME: + *free_macro = TRUE; case MACRO_TIMET: case MACRO_ISVALIDTIME: case MACRO_NEXTVALIDTIME: @@ -1483,19 +1484,19 @@ break; case MACRO_TIMET: - *output = strdup(mkstr("%lu", (unsigned long)current_time)); + *output = (char *)mkstr("%lu", (unsigned long)current_time); break; #ifdef NSCORE case MACRO_ISVALIDTIME: - *output = strdup(mkstr("%d", (check_time_against_period(test_time, temp_timeperiod) == OK) ? 1 : 0)); + *output = (char *)mkstr("%d", (check_time_against_period(test_time, temp_timeperiod) == OK) ? 1 : 0); break; case MACRO_NEXTVALIDTIME: get_next_valid_time(test_time, &next_valid_time, temp_timeperiod); if(next_valid_time == test_time && check_time_against_period(test_time, temp_timeperiod) == ERROR) next_valid_time = (time_t)0L; - *output = strdup(mkstr("%lu", (unsigned long)next_valid_time)); + *output = (char *)mkstr("%lu", (unsigned long)next_valid_time); break; #endif @@ -1542,66 +1543,66 @@ switch(macro_type) { case MACRO_HOSTNAME: - *output = strdup(temp_host->name); + *output = temp_host->name; break; case MACRO_HOSTDISPLAYNAME: if(temp_host->display_name) - *output = strdup(temp_host->display_name); + *output = temp_host->display_name; break; case MACRO_HOSTALIAS: - *output = strdup(temp_host->alias); + *output = temp_host->alias; break; case MACRO_HOSTADDRESS: - *output = strdup(temp_host->address); + *output = temp_host->address; break; #ifdef NSCORE case MACRO_HOSTSTATE: - *output = strdup(host_state_name(temp_host->current_state)); + *output = (char *)host_state_name(temp_host->current_state); break; case MACRO_HOSTSTATEID: - *output = strdup(mkstr("%d", temp_host->current_state)); + *output = (char *)mkstr("%d", temp_host->current_state); break; case MACRO_LASTHOSTSTATE: - *output = strdup(host_state_name(temp_host->last_state)); + *output = (char *)host_state_name(temp_host->last_state); break; case MACRO_LASTHOSTSTATEID: - *output = strdup(mkstr("%d", temp_host->last_state)); + *output = (char *)mkstr("%d", temp_host->last_state); break; case MACRO_HOSTCHECKTYPE: - *output = strdup(check_type_name(temp_host->check_type)); + *output = (char *)check_type_name(temp_host->check_type); break; case MACRO_HOSTSTATETYPE: - *output = strdup(state_type_name(temp_host->state_type)); + *output = (char *)state_type_name(temp_host->state_type); break; case MACRO_HOSTOUTPUT: if(temp_host->plugin_output) - *output = strdup(temp_host->plugin_output); + *output = temp_host->plugin_output; break; case MACRO_LONGHOSTOUTPUT: if(temp_host->long_plugin_output) - *output = strdup(temp_host->long_plugin_output); + *output = temp_host->long_plugin_output; break; case MACRO_HOSTPERFDATA: if(temp_host->perf_data) - *output = strdup(temp_host->perf_data); + *output = temp_host->perf_data; break; #endif case MACRO_HOSTCHECKCOMMAND: if(temp_host->check_command) - *output = strdup(temp_host->check_command); + *output = temp_host->check_command; break; #ifdef NSCORE case MACRO_HOSTATTEMPT: - *output = strdup(mkstr("%d", temp_host->current_attempt)); + *output = (char *)mkstr("%d", temp_host->current_attempt); break; case MACRO_MAXHOSTATTEMPTS: - *output = strdup(mkstr("%d", temp_host->max_attempts)); + *output = (char *)mkstr("%d", temp_host->max_attempts); break; case MACRO_HOSTDOWNTIME: - *output = strdup(mkstr("%d", temp_host->scheduled_downtime_depth)); + *output = (char *)mkstr("%d", temp_host->scheduled_downtime_depth); break; case MACRO_HOSTPERCENTCHANGE: - *output = strdup(mkstr("%.2f", temp_host->percent_state_change)); + *output = (char *)mkstr("%.2f", temp_host->percent_state_change); break; case MACRO_HOSTDURATIONSEC: case MACRO_HOSTDURATION: @@ -1609,7 +1610,7 @@ duration = (unsigned long)(current_time - temp_host->last_state_change); if(macro_type == MACRO_HOSTDURATIONSEC) - *output = strdup(mkstr("%lu", duration)); + *output = (char *)mkstr("%lu", duration); else { days = duration / 86400; @@ -1619,60 +1620,60 @@ minutes = duration / 60; duration -= (minutes * 60); seconds = duration; - *output = strdup(mkstr("%dd %dh %dm %ds", days, hours, minutes, seconds)); + *output = (char *)mkstr("%dd %dh %dm %ds", days, hours, minutes, seconds); } break; case MACRO_HOSTEXECUTIONTIME: - *output = strdup(mkstr("%.3f", temp_host->execution_time)); + *output = (char *)mkstr("%.3f", temp_host->execution_time); break; case MACRO_HOSTLATENCY: - *output = strdup(mkstr("%.3f", temp_host->latency)); + *output = (char *)mkstr("%.3f", temp_host->latency); break; case MACRO_LASTHOSTCHECK: - *output = strdup(mkstr("%lu", (unsigned long)temp_host->last_check)); + *output = (char *)mkstr("%lu", (unsigned long)temp_host->last_check); break; case MACRO_LASTHOSTSTATECHANGE: - *output = strdup(mkstr("%lu", (unsigned long)temp_host->last_state_change)); + *output = (char *)mkstr("%lu", (unsigned long)temp_host->last_state_change); break; case MACRO_LASTHOSTUP: - *output = strdup(mkstr("%lu", (unsigned long)temp_host->last_time_up)); + *output = (char *)mkstr("%lu", (unsigned long)temp_host->last_time_up); break; case MACRO_LASTHOSTDOWN: - *output = strdup(mkstr("%lu", (unsigned long)temp_host->last_time_down)); + *output = (char *)mkstr("%lu", (unsigned long)temp_host->last_time_down); break; case MACRO_LASTHOSTUNREACHABLE: - *output = strdup(mkstr("%lu", (unsigned long)temp_host->last_time_unreachable)); + *output = (char *)mkstr("%lu", (unsigned long)temp_host->last_time_unreachable); break; case MACRO_HOSTNOTIFICATIONNUMBER: - *output = strdup(mkstr("%d", temp_host->current_notification_number)); + *output = (char *)mkstr("%d", temp_host->current_notification_number); break; case MACRO_HOSTNOTIFICATIONID: - *output = strdup(mkstr("%lu", temp_host->current_notification_id)); + *output = (char *)mkstr("%lu", temp_host->current_notification_id); break; case MACRO_HOSTEVENTID: - *output = strdup(mkstr("%lu", temp_host->current_event_id)); + *output = (char *)mkstr("%lu", temp_host->current_event_id); break; case MACRO_LASTHOSTEVENTID: - *output = strdup(mkstr("%lu", temp_host->last_event_id)); + *output = (char *)mkstr("%lu", temp_host->last_event_id); break; case MACRO_HOSTPROBLEMID: - *output = strdup(mkstr("%lu", temp_host->current_problem_id)); + *output = (char *)mkstr("%lu", temp_host->current_problem_id); break; case MACRO_LASTHOSTPROBLEMID: - *output = strdup(mkstr("%lu", temp_host->last_problem_id)); + *output = (char *)mkstr("%lu", temp_host->last_problem_id); break; #endif case MACRO_HOSTACTIONURL: if(temp_host->action_url) - *output = strdup(temp_host->action_url); + *output = temp_host->action_url; break; case MACRO_HOSTNOTESURL: if(temp_host->notes_url) - *output = strdup(temp_host->notes_url); + *output = temp_host->notes_url; break; case MACRO_HOSTNOTES: if(temp_host->notes) - *output = strdup(temp_host->notes); + *output = temp_host->notes; break; #ifdef NSCORE case MACRO_HOSTGROUPNAMES: @@ -1725,22 +1726,27 @@ } /* these macros are time-intensive to compute, and will likely be used together, so save them all for future use */ - mac->x[MACRO_TOTALHOSTSERVICES] = strdup(mkstr("%d", total_host_services)); - mac->x[MACRO_TOTALHOSTSERVICESOK] = strdup(mkstr("%d", total_host_services_ok)); - mac->x[MACRO_TOTALHOSTSERVICESWARNING] = strdup(mkstr("%d", total_host_services_warning)); - mac->x[MACRO_TOTALHOSTSERVICESUNKNOWN] = strdup(mkstr("%d", total_host_services_unknown)); - mac->x[MACRO_TOTALHOSTSERVICESCRITICAL] = strdup(mkstr("%d", total_host_services_critical)); + mac->x[MACRO_TOTALHOSTSERVICES] = + (char *)mkstr("%d", total_host_services); + mac->x[MACRO_TOTALHOSTSERVICESOK] = + (char *)mkstr("%d", total_host_services_ok); + mac->x[MACRO_TOTALHOSTSERVICESWARNING] = + (char *)mkstr("%d", total_host_services_warning); + mac->x[MACRO_TOTALHOSTSERVICESUNKNOWN] = + (char *)mkstr("%d", total_host_services_unknown); + mac->x[MACRO_TOTALHOSTSERVICESCRITICAL] = + (char *)mkstr("%d", total_host_services_critical); } /* return only the macro the user requested */ *output = mac->x[macro_type]; break; case MACRO_HOSTIMPORTANCE: - *output = strdup(mkstr("%u", temp_host->hourly_value)); + *output = (char *)mkstr("%u", temp_host->hourly_value); break; case MACRO_HOSTANDSERVICESIMPORTANCE: - *output = strdup(mkstr("%u", temp_host->hourly_value + - host_services_value(temp_host))); + *output = (char *)mkstr("%u", temp_host->hourly_value + + host_services_value(temp_host)); break; #endif @@ -1801,11 +1807,11 @@ /* get the macro value */ switch(macro_type) { case MACRO_HOSTGROUPNAME: - *output = strdup(temp_hostgroup->group_name); + *output = temp_hostgroup->group_name; break; case MACRO_HOSTGROUPALIAS: if(temp_hostgroup->alias) - *output = strdup(temp_hostgroup->alias); + *output = temp_hostgroup->alias; break; case MACRO_HOSTGROUPMEMBERS: /* make the calculations for total string length */ @@ -1849,15 +1855,15 @@ break; case MACRO_HOSTGROUPACTIONURL: if(temp_hostgroup->action_url) - *output = strdup(temp_hostgroup->action_url); + *output = temp_hostgroup->action_url; break; case MACRO_HOSTGROUPNOTESURL: if(temp_hostgroup->notes_url) - *output = strdup(temp_hostgroup->notes_url); + *output = temp_hostgroup->notes_url; break; case MACRO_HOSTGROUPNOTES: if(temp_hostgroup->notes) - *output = strdup(temp_hostgroup->notes); + *output = temp_hostgroup->notes; break; default: log_debug_info(DEBUGL_MACROS, 0, "UNHANDLED HOSTGROUP MACRO #%d! THIS IS A BUG!\n", macro_type); @@ -1911,89 +1917,89 @@ /* get the macro value */ switch(macro_type) { case MACRO_SERVICEDESC: - *output = strdup(temp_service->description); + *output = temp_service->description; break; case MACRO_SERVICEDISPLAYNAME: if(temp_service->display_name) - *output = strdup(temp_service->display_name); + *output = temp_service->display_name; break; #ifdef NSCORE case MACRO_SERVICEOUTPUT: if(temp_service->plugin_output) - *output = strdup(temp_service->plugin_output); + *output = temp_service->plugin_output; break; case MACRO_LONGSERVICEOUTPUT: if(temp_service->long_plugin_output) - *output = strdup(temp_service->long_plugin_output); + *output = temp_service->long_plugin_output; break; case MACRO_SERVICEPERFDATA: if(temp_service->perf_data) - *output = strdup(temp_service->perf_data); + *output = temp_service->perf_data; break; #endif case MACRO_SERVICECHECKCOMMAND: if(temp_service->check_command) - *output = strdup(temp_service->check_command); + *output = temp_service->check_command; break; #ifdef NSCORE case MACRO_SERVICECHECKTYPE: - *output = strdup(check_type_name(temp_service->check_type)); + *output = (char *)check_type_name(temp_service->check_type); break; case MACRO_SERVICESTATETYPE: - *output = strdup(state_type_name(temp_service->state_type)); + *output = (char *)state_type_name(temp_service->state_type); break; case MACRO_SERVICESTATE: - *output = strdup(service_state_name(temp_service->current_state)); + *output = (char *)service_state_name(temp_service->current_state); break; case MACRO_SERVICESTATEID: - *output = strdup(mkstr("%d", temp_service->current_state)); + *output = (char *)mkstr("%d", temp_service->current_state); break; case MACRO_LASTSERVICESTATE: - *output = strdup(service_state_name(temp_service->last_state)); + *output = (char *)service_state_name(temp_service->last_state); break; case MACRO_LASTSERVICESTATEID: - *output = strdup(mkstr("%d", temp_service->last_state)); + *output = (char *)mkstr("%d", temp_service->last_state); break; #endif case MACRO_SERVICEISVOLATILE: - *output = strdup(mkstr("%d", temp_service->is_volatile)); + *output = (char *)mkstr("%d", temp_service->is_volatile); break; #ifdef NSCORE case MACRO_SERVICEATTEMPT: - *output = strdup(mkstr("%d", temp_service->current_attempt)); + *output = (char *)mkstr("%d", temp_service->current_attempt); break; case MACRO_MAXSERVICEATTEMPTS: - *output = strdup(mkstr("%d", temp_service->max_attempts)); + *output = (char *)mkstr("%d", temp_service->max_attempts); break; case MACRO_SERVICEEXECUTIONTIME: - *output = strdup(mkstr("%.3f", temp_service->execution_time)); + *output = (char *)mkstr("%.3f", temp_service->execution_time); break; case MACRO_SERVICELATENCY: - *output = strdup(mkstr("%.3f", temp_service->latency)); + *output = (char *)mkstr("%.3f", temp_service->latency); break; case MACRO_LASTSERVICECHECK: - *output = strdup(mkstr("%lu", (unsigned long)temp_service->last_check)); + *output = (char *)mkstr("%lu", (unsigned long)temp_service->last_check); break; case MACRO_LASTSERVICESTATECHANGE: - *output = strdup(mkstr("%lu", (unsigned long)temp_service->last_state_change)); + *output = (char *)mkstr("%lu", (unsigned long)temp_service->last_state_change); break; case MACRO_LASTSERVICEOK: - *output = strdup(mkstr("%lu", (unsigned long)temp_service->last_time_ok)); + *output = (char *)mkstr("%lu", (unsigned long)temp_service->last_time_ok); break; case MACRO_LASTSERVICEWARNING: - *output = strdup(mkstr("%lu", (unsigned long)temp_service->last_time_warning)); + *output = (char *)mkstr("%lu", (unsigned long)temp_service->last_time_warning); break; case MACRO_LASTSERVICEUNKNOWN: - *output = strdup(mkstr("%lu", (unsigned long)temp_service->last_time_unknown)); + *output = (char *)mkstr("%lu", (unsigned long)temp_service->last_time_unknown); break; case MACRO_LASTSERVICECRITICAL: - *output = strdup(mkstr("%lu", (unsigned long)temp_service->last_time_critical)); + *output = (char *)mkstr("%lu", (unsigned long)temp_service->last_time_critical); break; case MACRO_SERVICEDOWNTIME: - *output = strdup(mkstr("%d", temp_service->scheduled_downtime_depth)); + *output = (char *)mkstr("%d", temp_service->scheduled_downtime_depth); break; case MACRO_SERVICEPERCENTCHANGE: - *output = strdup(mkstr("%.2f", temp_service->percent_state_change)); + *output = (char *)mkstr("%.2f", temp_service->percent_state_change); break; case MACRO_SERVICEDURATIONSEC: case MACRO_SERVICEDURATION: @@ -2003,7 +2009,7 @@ /* get the state duration in seconds */ if(macro_type == MACRO_SERVICEDURATIONSEC) - *output = strdup(mkstr("%lu", duration)); + *output = (char *)mkstr("%lu", duration); /* get the state duration */ else { @@ -2014,39 +2020,39 @@ minutes = duration / 60; duration -= (minutes * 60); seconds = duration; - *output = strdup(mkstr("%dd %dh %dm %ds", days, hours, minutes, seconds)); + *output = (char *)mkstr("%dd %dh %dm %ds", days, hours, minutes, seconds); } break; case MACRO_SERVICENOTIFICATIONNUMBER: - *output = strdup(mkstr("%d", temp_service->current_notification_number)); + *output = (char *)mkstr("%d", temp_service->current_notification_number); break; case MACRO_SERVICENOTIFICATIONID: - *output = strdup(mkstr("%lu", temp_service->current_notification_id)); + *output = (char *)mkstr("%lu", temp_service->current_notification_id); break; case MACRO_SERVICEEVENTID: - *output = strdup(mkstr("%lu", temp_service->current_event_id)); + *output = (char *)mkstr("%lu", temp_service->current_event_id); break; case MACRO_LASTSERVICEEVENTID: - *output = strdup(mkstr("%lu", temp_service->last_event_id)); + *output = (char *)mkstr("%lu", temp_service->last_event_id); break; case MACRO_SERVICEPROBLEMID: - *output = strdup(mkstr("%lu", temp_service->current_problem_id)); + *output = (char *)mkstr("%lu", temp_service->current_problem_id); break; case MACRO_LASTSERVICEPROBLEMID: - *output = strdup(mkstr("%lu", temp_service->last_problem_id)); + *output = (char *)mkstr("%lu", temp_service->last_problem_id); break; #endif case MACRO_SERVICEACTIONURL: if(temp_service->action_url) - *output = strdup(temp_service->action_url); + *output = temp_service->action_url; break; case MACRO_SERVICENOTESURL: if(temp_service->notes_url) - *output = strdup(temp_service->notes_url); + *output = temp_service->notes_url; break; case MACRO_SERVICENOTES: if(temp_service->notes) - *output = strdup(temp_service->notes); + *output = temp_service->notes; break; #ifdef NSCORE @@ -2067,7 +2073,7 @@ } break; case MACRO_SERVICEIMPORTANCE: - *output = strdup(mkstr("%u", temp_service->hourly_value)); + *output = (char *)mkstr("%u", temp_service->hourly_value); break; #endif @@ -2127,11 +2133,11 @@ /* get the macro value */ switch(macro_type) { case MACRO_SERVICEGROUPNAME: - *output = strdup(temp_servicegroup->group_name); + *output = temp_servicegroup->group_name; break; case MACRO_SERVICEGROUPALIAS: if(temp_servicegroup->alias) - *output = strdup(temp_servicegroup->alias); + *output = temp_servicegroup->alias; break; case MACRO_SERVICEGROUPMEMBERS: /* make the calculations for total string length */ @@ -2174,15 +2180,15 @@ break; case MACRO_SERVICEGROUPACTIONURL: if(temp_servicegroup->action_url) - *output = strdup(temp_servicegroup->action_url); + *output = temp_servicegroup->action_url; break; case MACRO_SERVICEGROUPNOTESURL: if(temp_servicegroup->notes_url) - *output = strdup(temp_servicegroup->notes_url); + *output = temp_servicegroup->notes_url; break; case MACRO_SERVICEGROUPNOTES: if(temp_servicegroup->notes) - *output = strdup(temp_servicegroup->notes); + *output = temp_servicegroup->notes; break; default: log_debug_info(DEBUGL_MACROS, 0, "UNHANDLED SERVICEGROUP MACRO #%d! THIS IS A BUG!\n", macro_type); @@ -2780,64 +2786,27 @@ int clear_volatile_macros_r(nagios_macros *mac) { register int x = 0; - for(x = 0; x < MACRO_X_COUNT; x++) { - switch(x) { + log_debug_info(DEBUGL_FUNCTIONS, 0, "clear_volatile_macros_r()\n"); - case MACRO_ADMINEMAIL: - case MACRO_ADMINPAGER: - case MACRO_MAINCONFIGFILE: - case MACRO_STATUSDATAFILE: - case MACRO_RETENTIONDATAFILE: - case MACRO_OBJECTCACHEFILE: - case MACRO_TEMPFILE: - case MACRO_LOGFILE: - case MACRO_RESOURCEFILE: - case MACRO_COMMANDFILE: - case MACRO_HOSTPERFDATAFILE: - case MACRO_SERVICEPERFDATAFILE: - case MACRO_PROCESSSTARTTIME: - case MACRO_TEMPPATH: - case MACRO_EVENTSTARTTIME: - case MACRO_TOTALHOSTSERVICES: - case MACRO_TOTALHOSTSERVICESOK: - case MACRO_TOTALHOSTSERVICESWARNING: - case MACRO_TOTALHOSTSERVICESUNKNOWN: - case MACRO_TOTALHOSTSERVICESCRITICAL: - /* these don't change during the course of monitoring, so no need to free them */ - break; - default: - my_free(mac->x[x]); - break; - } - } + clear_host_macros_r(mac); + clear_service_macros_r(mac); + clear_summary_macros_r(mac); + clear_hostgroup_macros_r(mac); + clear_servicegroup_macros_r(mac); + clear_contactgroup_macros_r(mac); + clear_contact_macros_r(mac); + clear_datetime_macros_r(mac); /* contact address macros */ for(x = 0; x < MAX_CONTACT_ADDRESSES; x++) my_free(mac->contactaddress[x]); - /* clear macro pointers */ - mac->host_ptr = NULL; - mac->hostgroup_ptr = NULL; - mac->service_ptr = NULL; - mac->servicegroup_ptr = NULL; - mac->contact_ptr = NULL; - mac->contactgroup_ptr = NULL; - /* clear on-demand macro */ my_free(mac->ondemand); /* clear ARGx macros */ clear_argv_macros_r(mac); - /* clear custom host variables */ - clear_custom_vars(&(mac->custom_host_vars)); - - /* clear custom service variables */ - clear_custom_vars(&(mac->custom_service_vars)); - - /* clear custom contact variables */ - clear_custom_vars(&(mac->custom_contact_vars)); - return OK; } @@ -2847,11 +2816,20 @@ } +/* clear datetime macros */ +int clear_datetime_macros_r(nagios_macros *mac) { + my_free(mac->x[MACRO_LONGDATETIME]); + my_free(mac->x[MACRO_SHORTDATETIME]); + my_free(mac->x[MACRO_DATE]); + my_free(mac->x[MACRO_TIME]); + + return OK; + } + /* clear service macros */ int clear_service_macros_r(nagios_macros *mac) { /* these are recursive but persistent. what to do? */ - my_free(mac->x[MACRO_SERVICECHECKCOMMAND]); my_free(mac->x[MACRO_SERVICEACTIONURL]); my_free(mac->x[MACRO_SERVICENOTESURL]); my_free(mac->x[MACRO_SERVICENOTES]); @@ -2875,7 +2853,6 @@ int clear_host_macros_r(nagios_macros *mac) { /* these are recursive but persistent. what to do? */ - my_free(mac->x[MACRO_HOSTCHECKCOMMAND]); my_free(mac->x[MACRO_HOSTACTIONURL]); my_free(mac->x[MACRO_HOSTNOTESURL]); my_free(mac->x[MACRO_HOSTNOTES]); @@ -2975,7 +2952,6 @@ return clear_contactgroup_macros_r(&global_macros); } - /* clear summary macros */ int clear_summary_macros_r(nagios_macros *mac) { register int x; @@ -3288,6 +3264,7 @@ service *temp_service = NULL; contact *temp_contact = NULL; char *customvarname = NULL; + char *customvarvalue = NULL; log_debug_info(DEBUGL_FUNCTIONS, 1, "add_custom_macro_environment_vars_r()\n"); @@ -3309,12 +3286,18 @@ for(temp_customvariablesmember = mac->custom_host_vars; temp_customvariablesmember != NULL; temp_customvariablesmember = temp_customvariablesmember->next) { - /* Allocate memory for each environment variable name, but not the - values because when kvvec_destroy() is called, it is called with - KVVEC_FREE_KEYS */ - kvvec_addkv(kvvp, strdup(temp_customvariablesmember->variable_name), + customvarvalue = clean_macro_chars(temp_customvariablesmember->variable_value, - STRIP_ILLEGAL_MACRO_CHARS | ESCAPE_MACRO_CHARS)); + STRIP_ILLEGAL_MACRO_CHARS | ESCAPE_MACRO_CHARS); + if(NULL != customvarvalue) { + my_free(temp_customvariablesmember->variable_value); + temp_customvariablesmember->variable_value = customvarvalue; + /* Allocate memory for each environment variable name, but not the + values because when kvvec_destroy() is called, it is called with + KVVEC_FREE_KEYS */ + kvvec_addkv(kvvp, strdup(temp_customvariablesmember->variable_name), + customvarvalue); + } } /***** CUSTOM SERVICE VARIABLES *****/ @@ -3335,12 +3318,18 @@ for(temp_customvariablesmember = mac->custom_service_vars; temp_customvariablesmember != NULL; temp_customvariablesmember = temp_customvariablesmember->next) { - /* Allocate memory for each environment variable name, but not the - values because when kvvec_destroy() is called, it is called with - KVVEC_FREE_KEYS */ - kvvec_addkv(kvvp, strdup(temp_customvariablesmember->variable_name), + customvarvalue = clean_macro_chars(temp_customvariablesmember->variable_value, - STRIP_ILLEGAL_MACRO_CHARS | ESCAPE_MACRO_CHARS)); + STRIP_ILLEGAL_MACRO_CHARS | ESCAPE_MACRO_CHARS); + if(NULL != customvarvalue) { + my_free(temp_customvariablesmember->variable_value); + temp_customvariablesmember->variable_value = customvarvalue; + /* Allocate memory for each environment variable name, but not the + values because when kvvec_destroy() is called, it is called with + KVVEC_FREE_KEYS */ + kvvec_addkv(kvvp, strdup(temp_customvariablesmember->variable_name), + customvarvalue); + } } /***** CUSTOM CONTACT VARIABLES *****/ @@ -3361,12 +3350,18 @@ for(temp_customvariablesmember = mac->custom_contact_vars; temp_customvariablesmember != NULL; temp_customvariablesmember = temp_customvariablesmember->next) { - /* Allocate memory for each environment variable name, but not the - values because when kvvec_destroy() is called, it is called with - KVVEC_FREE_KEYS */ - kvvec_addkv(kvvp, strdup(temp_customvariablesmember->variable_name), + customvarvalue = clean_macro_chars(temp_customvariablesmember->variable_value, - STRIP_ILLEGAL_MACRO_CHARS | ESCAPE_MACRO_CHARS)); + STRIP_ILLEGAL_MACRO_CHARS | ESCAPE_MACRO_CHARS); + if(NULL != customvarvalue) { + my_free(temp_customvariablesmember->variable_value); + temp_customvariablesmember->variable_value = customvarvalue; + /* Allocate memory for each environment variable name, but not the + values because when kvvec_destroy() is called, it is called with + KVVEC_FREE_KEYS */ + kvvec_addkv(kvvp, strdup(temp_customvariablesmember->variable_name), + customvarvalue); + } } return OK; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nagios-4.0.4/configure new/nagios-4.0.5/configure --- old/nagios-4.0.4/configure 2014-03-14 18:24:57.000000000 +0100 +++ new/nagios-4.0.5/configure 2014-04-11 20:37:42.000000000 +0200 @@ -1872,9 +1872,9 @@ PKG_NAME=nagios -PKG_VERSION="4.0.4" +PKG_VERSION="4.0.5" PKG_HOME_URL="http://www.nagios.org/" -PKG_REL_DATE="03-14-2014" +PKG_REL_DATE="04-11-2014" ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nagios-4.0.4/configure.in new/nagios-4.0.5/configure.in --- old/nagios-4.0.4/configure.in 2014-03-14 18:24:57.000000000 +0100 +++ new/nagios-4.0.5/configure.in 2014-04-11 20:37:42.000000000 +0200 @@ -9,9 +9,9 @@ AC_PREFIX_DEFAULT(/usr/local/nagios) PKG_NAME=nagios -PKG_VERSION="4.0.4" +PKG_VERSION="4.0.5" PKG_HOME_URL="http://www.nagios.org/" -PKG_REL_DATE="03-14-2014" +PKG_REL_DATE="04-11-2014" dnl Figure out how to invoke "install" and what install options to use. AC_PROG_INSTALL diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nagios-4.0.4/daemon-init.in new/nagios-4.0.5/daemon-init.in --- old/nagios-4.0.4/daemon-init.in 2014-03-14 18:24:57.000000000 +0100 +++ new/nagios-4.0.5/daemon-init.in 2014-04-11 20:37:42.000000000 +0200 @@ -70,7 +70,7 @@ # Automate addition of RAMDISK based on environment variables USE_RAMDISK=${USE_RAMDISK:-0} if test "$USE_RAMDISK" -ne 0 && test "$RAMDISK_SIZE"X != "X"; then - ramdisk=`mount |grep "$ramdiskdir type tmpfs"` + ramdisk=`mount |grep "${RAMDISK_DIR} type tmpfs"` if [ "$ramdisk"X == "X" ]; then mkdir -p -m 0755 ${RAMDISK_DIR} mount -t tmpfs -o size=${RAMDISK_SIZE}m tmpfs ${RAMDISK_DIR} @@ -81,7 +81,7 @@ check_config() { TMPFILE=$(mktemp /tmp/.configtest.XXXXXXXX) - su - $NagiosUser -c "$NagiosBin -vp $NagiosCfgFile" > "$TMPFILE" + $NagiosBin -vp $NagiosCfgFile > "$TMPFILE" WARN=`grep ^"Total Warnings:" "$TMPFILE" |awk -F: '{print \$2}' |sed s/' '//g` ERR=`grep ^"Total Errors:" "$TMPFILE" |awk -F: '{print \$2}' |sed s/' '//g` @@ -183,10 +183,10 @@ check_config fi if [ $? -eq 0 ]; then - su - $NagiosUser -c "touch $NagiosVarDir/nagios.log $NagiosRetentionFile" + touch $NagiosVarDir/nagios.log $NagiosRetentionFile rm -f $NagiosCommandFile touch $NagiosRunFile - chown $NagiosUser:$NagiosGroup $NagiosRunFile + chown $NagiosUser:$NagiosGroup $NagiosRunFile $NagiosVarDir/nagios.log $NagiosRetentionFile $NagiosBin -d $NagiosCfgFile if [ -d $NagiosLockDir ]; then touch $NagiosLockDir/$NagiosLockFile; fi echo " done." @@ -234,7 +234,7 @@ checkconfig) if test "$checkconfig" = "true"; then - printf "Running configuration check..." + printf "Running configuration check...\n" check_config fi @@ -248,7 +248,7 @@ restart) if test "$checkconfig" = "true"; then - printf "Running configuration check..." + printf "Running configuration check...\n" check_config fi @@ -259,7 +259,7 @@ reload|force-reload) if test "$checkconfig" = "true"; then - printf "Running configuration check..." + printf "Running configuration check...\n" check_config fi @@ -268,7 +268,7 @@ else pid_nagios if status_nagios > /dev/null; then - printf "Reloading nagios configuration..." + printf "Reloading nagios configuration...\n" killproc_nagios nagios -HUP echo "done" else @@ -280,7 +280,7 @@ ;; configtest) - su - $NagiosUser -c "$NagiosBin -vp $NagiosCfgFile" + $NagiosBin -vp $NagiosCfgFile ;; *) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nagios-4.0.4/doxy.conf new/nagios-4.0.5/doxy.conf --- old/nagios-4.0.4/doxy.conf 2014-03-14 18:24:57.000000000 +0100 +++ new/nagios-4.0.5/doxy.conf 2014-04-11 20:37:42.000000000 +0200 @@ -1,5 +1,5 @@ PROJECT_NAME = Nagios -PROJECT_NUMBER = 4.0.4 +PROJECT_NUMBER = 4.0.5 PROJECT_BRIEF = "Dev docs for Nagios core and neb-module hackers" INPUT = lib/ docs/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nagios-4.0.4/html/main.php new/nagios-4.0.5/html/main.php --- old/nagios-4.0.4/html/main.php 2014-03-14 18:24:57.000000000 +0100 +++ new/nagios-4.0.5/html/main.php 2014-04-11 20:37:42.000000000 +0200 @@ -1,7 +1,7 @@ <?php include_once(dirname(__FILE__).'/includes/utils.inc.php'); -$this_version="4.0.4"; +$this_version="4.0.5"; ?> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> @@ -38,9 +38,9 @@ <div id="currentversioninfo"> <div class="product">Nagios<sup><span style="font-size: small;">®</span></sup> Core<sup><span style="font-size: small;">™</span></sup></div> -<div class="version">Version 4.0.4</div> -<div class="releasedate">March 14, 2014</div> -<div class="checkforupdates"><a href="http://www.nagios.org/checkforupdates/?version=4.0.4&product=nagioscore" target="_blank">Check for updates</a></div> +<div class="version">Version 4.0.5</div> +<div class="releasedate">April 11, 2014</div> +<div class="checkforupdates"><a href="http://www.nagios.org/checkforupdates/?version=4.0.5&product=nagioscore" target="_blank">Check for updates</a></div>  </div> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nagios-4.0.4/include/common.h new/nagios-4.0.5/include/common.h --- old/nagios-4.0.4/include/common.h 2014-03-14 18:24:57.000000000 +0100 +++ new/nagios-4.0.5/include/common.h 2014-04-11 20:37:42.000000000 +0200 @@ -24,8 +24,8 @@ #include "shared.h" -#define PROGRAM_VERSION "4.0.4" -#define PROGRAM_MODIFICATION_DATE "03-14-2014" +#define PROGRAM_VERSION "4.0.5" +#define PROGRAM_MODIFICATION_DATE "04-11-2014" NAGIOS_BEGIN_DECL diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nagios-4.0.4/include/macros.h new/nagios-4.0.5/include/macros.h --- old/nagios-4.0.4/include/macros.h 2014-03-14 18:24:57.000000000 +0100 +++ new/nagios-4.0.5/include/macros.h 2014-04-11 20:37:42.000000000 +0200 @@ -316,6 +316,7 @@ int clear_contact_macros_r(nagios_macros *mac); int clear_contactgroup_macros_r(nagios_macros *mac); int clear_summary_macros_r(nagios_macros *mac); +int clear_datetime_macros_r(nagios_macros *mac); #ifndef NSCGI diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nagios-4.0.4/lib/runcmd.c new/nagios-4.0.5/lib/runcmd.c --- old/nagios-4.0.4/lib/runcmd.c 2014-03-14 18:24:57.000000000 +0100 +++ new/nagios-4.0.5/lib/runcmd.c 2014-04-11 20:37:42.000000000 +0200 @@ -423,7 +423,6 @@ if(NULL != env) { char **envpp = env; while(NULL != *envpp && NULL != *(envpp+1)) { - fprintf(stderr, "ENV: '%s'='%s'\n", *envpp, *(envpp+1)); update_environment(*envpp, *(envpp+1), 1); envpp += 2; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nagios-4.0.4/nagios.spec new/nagios-4.0.5/nagios.spec --- old/nagios-4.0.4/nagios.spec 2014-03-14 18:24:57.000000000 +0100 +++ new/nagios-4.0.5/nagios.spec 2014-04-11 20:37:42.000000000 +0200 @@ -21,7 +21,7 @@ Summary: Open Source host, service and network monitoring program Name: nagios -Version: 4.0.4 +Version: 4.0.5 Release: 2%{?dist} License: GPL Group: Applications/System diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nagios-4.0.4/update-version new/nagios-4.0.5/update-version --- old/nagios-4.0.4/update-version 2014-03-14 18:24:57.000000000 +0100 +++ new/nagios-4.0.5/update-version 2014-04-11 20:37:42.000000000 +0200 @@ -10,10 +10,10 @@ fi # Current version number -CURRENTVERSION=4.0.4 +CURRENTVERSION=4.0.5 # Last date -LASTDATE=03-14-2014 +LASTDATE=04-11-2014 if [ "x$1" = "x" ] then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nagios-4.0.4/xdata/xodtemplate.c new/nagios-4.0.5/xdata/xodtemplate.c --- old/nagios-4.0.4/xdata/xodtemplate.c 2014-03-14 18:24:57.000000000 +0100 +++ new/nagios-4.0.5/xdata/xodtemplate.c 2014-04-11 20:37:42.000000000 +0200 @@ -6132,7 +6132,7 @@ for(temp_contactgroup = xodtemplate_contactgroup_list; temp_contactgroup; temp_contactgroup = temp_contactgroup->next) { objectlist *next, *list, *accept = NULL; - if(temp_contactgroup->members == NULL) + if(temp_contactgroup->members == NULL && temp_contactgroup->contactgroup_members == NULL) continue; /* @@ -8702,6 +8702,7 @@ my_free(this_service->template); my_free(this_service->name); + my_free(this_service->parents); my_free(this_service->display_name); my_free(this_service->check_command); my_free(this_service->check_period); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit exiv2 for openSUSE:Factory
by root＠hilbert.suse.de 15 Apr '14

15 Apr '14

Hello community, here is the log from the commit of package exiv2 for openSUSE:Factory checked in at 2014-04-15 11:46:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/exiv2 (Old) and /work/SRC/openSUSE:Factory/.exiv2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "exiv2" Changes: -------- --- /work/SRC/openSUSE:Factory/exiv2/exiv2.changes 2013-07-30 11:29:23.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.exiv2.new/exiv2.changes 2014-04-15 11:46:36.000000000 +0200 @@ -1,0 +2,147 @@ +Mon Apr 14 18:32:06 UTC 2014 - ctrippe(a)opensuse.org + +- Update to version 0.24 + * exiv2 (0.19-1) 00_hyphens_used_as_minus.diff + * (Reported with patch by Mark Purcell, fixed by Niels Kristian Bech Jensen) + * Video metadata support (Abhinav Badola for GSoC 2012) + * Samsung NX100 JPG exports have broken EXIF (Reported by Pascal de Bruijn) + * Warnings while compiling with g++4.5 + * (Reported by Sebastien Gilles, fixed by Robin Mills) + * For TIFF-like images, non-intrusive writing is not used when it should + * (Reported by Thomas Lotze) + * Patch to detect Carl Zeiss Planar T* 50mm f/1.4 ZE on Canon + * (Reported with patch by Stian Grindvoll) + * Exiv2 fails to compile under Linux (Volker Grabsch) + * example1.cpp clang Mac OS X warnings (Reported by Jerry Jacobs) + * Exiv2 crashes on input (Reported by Christian Grothoff) + * Complete Samsung NX lenses portfolio recognition + * (Reported with patch by Jaroslav Stepanek, updates by Pascal de Bruijn) + * Porting the Video Code to MSVC (umbrella) + * (Robin Mills, Abhinav Badola, Shawn Xiong) + * Photoshop doesn't recognize its own EPS files after modification by Exiv2 + * (Volker Grabsch) + * autotools build (make config ; ./configure ; make) is broken + * (Robin Mills) + * Sigma 50mm f/1.4 on Canon not detected correctly + * (Reported by Rick Gabriel, patch by Aakash Goenka) + * PENTAX-DA 18-135mm F3.5-5.6 not detected correctly + * (Reported by S. Verdoold, patch by Pascal de Bruijn) + * Sigma 18-250mm not properly recognised on Pentax + * (Reported by S. Verdoold, patch by Pascal de Bruijn) + * Video code is failing the test suite (on all plaforms) + * (Robin Mills, Abhinav Badola) + * Patches for locale and boost issue (Patches by Mario anyc) + * Support for two lens for sony mount + * (Patch by Michal Babej) + * Exif.OlympusEq.0x0403 tag + * (Christoph Anton Mitterer, Robin Mills) + * New Samsung NX 12-24mm f/4-5.6 ED + * (Jaroslav Stepanek) + * New lens "Tamron SP 24-70mm F/2.8 Di VC USD" + * (Reported by Jean-Pierre Verrue, patch by Niels Kristian Bech Jensen) + * New lens: Canon EF 35mm f/2 IS USM + * (markus kanet, Robin Mills) + * New camera: Canon EOS 6D + * (markus kanet) + * Update list of lenses for Olympus cameras. + * (Niels Kristian Bech Jensen) + * Add another lens for Olympus cameras. + * (Niels Kristian Bech Jensen) + * Another bunch of Olympus lens updates. + * (Niels Kristian Bech Jensen) + * One more Olympus lens - the list is complete. + * (Niels Kristian Bech Jensen) + * Nikon AF-S Nikkor 28mm f/1.8G not recognized + * (Reported by Philip Johnsson, patch by Niels Kristian Bech Jensen) + * Missing lenses reported by Paul Bissonnette + * (Robin Mills) + * Samsung D-Xenon 12-24mm not recognized + * (Reported by Romain Henriet, patch by S. Verdoold) + * (near-)infinite loop in video decoders + * (Reported by Alyssa Milburn, patch by Abhinav Badola) + * ASF: heap overflow + * (Reported by Alyssa Milburn, patch by Abhinav Badola) + * Sigma 30mm f/1.4 on Canon not detected correctly + * (Reported by Christian Roumano, patch by Aakash Goenka) + * User-readable output of Olympus' FocusDistance + * (Patch by Teemu Rytilahti) + * New Compilation Warnings + * New lens: Pentax smc DA 18-135mm f/3.5-5.6 ED AL [IF] DC WR + * (Reported by Matthieu Volat, patch by Pascal de Bruijn) + * New Lens: Canon EF-S 55-250mm f/4-5.6 IS II + * (Patch by Andrew Aylett) + * Exiv2: lensName misreporting for some CR2s + * (Reported by Pascal de Bruijn, patch by Niels Kristian Bech Jensen) + * Mountain Lion Plugin crashes when setxattr called + * (Robin Mills) + * New Lens: Samsung NX 45mm f1.8 + * (Pascal de Bruijn) + * strerror_r gives no error message back + * (Reported by Ákos Szőts, patch by Robin Mills) + * New Lens: Samsung NX 45mm f1.8 2D/3D + * (Pascal de Bruijn) + * New Lens: Sigma 150-500mm f/5-6.3 APO DG OS HSM on Canon (Steve Fosdick) + * Maintenance of Sony Makernote (Patch by Thomas Beutlich) +- Removed patches included in the new release + * 90_changeset_r2743.diff + * 90_changeset_r2744.diff + * 90_changeset_r2756.diff + * 90_changeset_r2818_partial.dif + * 90_changeset_r2860.diff + * 90_changeset_r2889.diff + * 90_changeset_r2958.diff + * 90_changeset_r2959.diff + * 90_changeset_r2961.diff + * 90_changeset_r2963.diff + * 90_changeset_r2968.diff + * 90_changeset_r2969.diff + * 90_changeset_r2970.diff + * 90_changeset_r2975.diff + * 90_changeset_r2978.diff + * 90_changeset_r2981.diff + * 90_changeset_r2982.diff + * 90_changeset_r2984.diff + * 90_changeset_r2985.diff + * 90_changeset_r2986.diff + * 90_changeset_r2988.diff + * 90_changeset_r2989.diff + * 90_changeset_r2990.diff + * 90_changeset_r2991.diff + * 90_changeset_r2992.diff + * 90_changeset_r2993.diff + * 90_changeset_r2994.diff + * 90_changeset_r2995.diff + * 90_changeset_r2998.diff + * 90_changeset_r3002.diff + * 90_changeset_r3003.diff + * 90_changeset_r3004.diff + * 90_changeset_r3005.diff + * 90_changeset_r3006.diff + * 90_changeset_r3011.diff + * 90_changeset_r3016.diff + * 90_changeset_r3017.diff + * 90_changeset_r3023.diff + * 90_changeset_r3026.diff + * 90_changeset_r3036.diff + * 90_changeset_r3037.diff + * 90_changeset_r3038.diff + * 90_changeset_r3039.diff + * 90_changeset_r3047.diff + * 90_changeset_r3048.diff + * 90_changeset_r3051.diff + * 90_changeset_r3052.diff + * 90_changeset_r3053.diff + * 90_changeset_r3054.diff + * 90_changeset_r3055.diff + * 90_changeset_r3060.diff + * 90_changeset_r3061.diff + * 90_changeset_r3062.diff + * 90_changeset_r3063.diff + * 90_changeset_r3066.diff + * 90_changeset_r3067.diff + * 90_changeset_r3068.diff + * 95_post_r3026_cleanup.diff +- Rename libexiv2-12 subpackage to libexiv2-13 following upstream + soversion change. + +------------------------------------------------------------------- Old: ---- 90_changeset_r2743.diff 90_changeset_r2744.diff 90_changeset_r2756.diff 90_changeset_r2818_partial.diff 90_changeset_r2860.diff 90_changeset_r2889.diff 90_changeset_r2958.diff 90_changeset_r2959.diff 90_changeset_r2961.diff 90_changeset_r2963.diff 90_changeset_r2968.diff 90_changeset_r2969.diff 90_changeset_r2970.diff 90_changeset_r2975.diff 90_changeset_r2978.diff 90_changeset_r2981.diff 90_changeset_r2982.diff 90_changeset_r2984.diff 90_changeset_r2985.diff 90_changeset_r2986.diff 90_changeset_r2988.diff 90_changeset_r2989.diff 90_changeset_r2990.diff 90_changeset_r2991.diff 90_changeset_r2992.diff 90_changeset_r2993.diff 90_changeset_r2994.diff 90_changeset_r2995.diff 90_changeset_r2998.diff 90_changeset_r3002.diff 90_changeset_r3003.diff 90_changeset_r3004.diff 90_changeset_r3005.diff 90_changeset_r3006.diff 90_changeset_r3011.diff 90_changeset_r3016.diff 90_changeset_r3017.diff 90_changeset_r3023.diff 90_changeset_r3026.diff 90_changeset_r3036.diff 90_changeset_r3037.diff 90_changeset_r3038.diff 90_changeset_r3039.diff 90_changeset_r3047.diff 90_changeset_r3048.diff 90_changeset_r3051.diff 90_changeset_r3052.diff 90_changeset_r3053.diff 90_changeset_r3054.diff 90_changeset_r3055.diff 90_changeset_r3060.diff 90_changeset_r3061.diff 90_changeset_r3062.diff 90_changeset_r3063.diff 90_changeset_r3066.diff 90_changeset_r3067.diff 90_changeset_r3068.diff 95_post_r3026_cleanup.diff exiv2-0.23.tar.gz New: ---- exiv2-0.24.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ exiv2.spec ++++++ --- /var/tmp/diff_new_pack.x9wk5Z/_old 2014-04-15 11:46:37.000000000 +0200 +++ /var/tmp/diff_new_pack.x9wk5Z/_new 2014-04-15 11:46:37.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package exiv2 # -# 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: exiv2 -Version: 0.23 +Version: 0.24 Release: 0 Summary: Tool to access image Exif metadata License: GPL-2.0+ @@ -25,65 +25,6 @@ Url: http://www.exiv2.org/ Source0: http://www.exiv2.org/%{name}-%{version}.tar.gz Source1: baselibs.conf -# Patches from upstream -Patch0: 90_changeset_r2743.diff -Patch1: 90_changeset_r2744.diff -Patch2: 90_changeset_r2756.diff -Patch3: 90_changeset_r2818_partial.diff -Patch4: 90_changeset_r2860.diff -Patch5: 90_changeset_r2889.diff -Patch6: 90_changeset_r2958.diff -Patch7: 90_changeset_r2959.diff -Patch8: 90_changeset_r2961.diff -Patch9: 90_changeset_r2963.diff -Patch10: 90_changeset_r2968.diff -Patch11: 90_changeset_r2969.diff -Patch12: 90_changeset_r2970.diff -Patch13: 90_changeset_r2975.diff -Patch14: 90_changeset_r2978.diff -Patch15: 90_changeset_r2981.diff -Patch16: 90_changeset_r2982.diff -Patch17: 90_changeset_r2984.diff -Patch18: 90_changeset_r2985.diff -Patch19: 90_changeset_r2986.diff -Patch20: 90_changeset_r2988.diff -Patch21: 90_changeset_r2989.diff -Patch22: 90_changeset_r2990.diff -Patch23: 90_changeset_r2991.diff -Patch24: 90_changeset_r2992.diff -Patch25: 90_changeset_r2993.diff -Patch26: 90_changeset_r2994.diff -Patch27: 90_changeset_r2995.diff -Patch28: 90_changeset_r2998.diff -Patch29: 90_changeset_r3002.diff -Patch30: 90_changeset_r3003.diff -Patch31: 90_changeset_r3004.diff -Patch32: 90_changeset_r3005.diff -Patch33: 90_changeset_r3006.diff -Patch34: 90_changeset_r3011.diff -Patch35: 90_changeset_r3016.diff -Patch36: 90_changeset_r3017.diff -Patch37: 90_changeset_r3023.diff -Patch38: 90_changeset_r3026.diff -Patch39: 95_post_r3026_cleanup.diff -Patch40: 90_changeset_r3036.diff -Patch41: 90_changeset_r3037.diff -Patch42: 90_changeset_r3038.diff -Patch43: 90_changeset_r3039.diff -Patch44: 90_changeset_r3047.diff -Patch45: 90_changeset_r3048.diff -Patch46: 90_changeset_r3051.diff -Patch47: 90_changeset_r3052.diff -Patch48: 90_changeset_r3053.diff -Patch49: 90_changeset_r3054.diff -Patch50: 90_changeset_r3055.diff -Patch51: 90_changeset_r3060.diff -Patch52: 90_changeset_r3061.diff -Patch53: 90_changeset_r3062.diff -Patch54: 90_changeset_r3063.diff -Patch55: 90_changeset_r3066.diff -Patch56: 90_changeset_r3067.diff -Patch57: 90_changeset_r3068.diff BuildRequires: doxygen BuildRequires: fdupes BuildRequires: gcc-c++ @@ -102,18 +43,18 @@ Exiv2 is a command line utility to access image metadata from tags like Exif. -%package -n libexiv2-12 +%package -n libexiv2-13 Summary: Library to access image metadata Group: Development/Libraries/C and C++ -%description -n libexiv2-12 +%description -n libexiv2-13 libexiv2 is a C++ library with a C compatibility interface to access image metadata, esp from Exif tags. %package -n libexiv2-devel Summary: Development Headers for Exiv2 Group: Development/Libraries/C and C++ -Requires: libexiv2-12 = %{version} +Requires: libexiv2-13 = %{version} Requires: libstdc++-devel %description -n libexiv2-devel @@ -123,69 +64,11 @@ %lang_package %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 -%patch14 -p1 -%patch15 -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 -%patch30 -p1 -%patch31 -p1 -%patch32 -p1 -%patch33 -p1 -%patch34 -p1 -%patch35 -p1 -%patch36 -p1 -%patch37 -p1 -%patch38 -p1 -%patch39 -p1 -%patch40 -p1 -%patch41 -p1 -%patch42 -p1 -%patch43 -p1 -%patch44 -p1 -%patch45 -p1 -%patch46 -p1 -%patch47 -p1 -%patch48 -p1 -%patch49 -p1 -%patch50 -p1 -%patch51 -p1 -%patch52 -p1 -%patch53 -p1 -%patch54 -p0 -%patch55 -p1 -%patch56 -p1 -%patch57 -p1 %build %configure --disable-static --with-pic make %{?_smp_mflags} -make doc +make doc -k ||: %install %make_install @@ -193,9 +76,9 @@ %fdupes -s doc/html rm -f %{buildroot}%{_libdir}/*.la -%post -n libexiv2-12 -p /sbin/ldconfig +%post -n libexiv2-13 -p /sbin/ldconfig -%postun -n libexiv2-12 -p /sbin/ldconfig +%postun -n libexiv2-13 -p /sbin/ldconfig %files lang -f exiv2.lang @@ -204,7 +87,7 @@ %doc doc/ChangeLog doc/cmd.txt %{_bindir}/exiv2 -%files -n libexiv2-12 +%files -n libexiv2-13 %defattr(-,root,root) %{_libdir}/libexiv2.so.* ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.x9wk5Z/_old 2014-04-15 11:46:37.000000000 +0200 +++ /var/tmp/diff_new_pack.x9wk5Z/_new 2014-04-15 11:46:37.000000000 +0200 @@ -1 +1 @@ -libexiv2-12 +libexiv2-13 ++++++ exiv2-0.23.tar.gz -> exiv2-0.24.tar.gz ++++++ ++++ 388132 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 zypper for openSUSE:Factory
by root＠hilbert.suse.de 15 Apr '14

15 Apr '14

Hello community, here is the log from the commit of package zypper for openSUSE:Factory checked in at 2014-04-15 11:45:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/zypper (Old) and /work/SRC/openSUSE:Factory/.zypper.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "zypper" Changes: -------- --- /work/SRC/openSUSE:Factory/zypper/zypper.changes 2014-04-13 13:13:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.zypper.new/zypper.changes 2014-04-15 11:45:23.000000000 +0200 @@ -1,0 +2,7 @@ +Sun Apr 13 20:42:58 CEST 2014 - ma(a)suse.de + +- more duplicate short options fixes +- Fix typo in manpage +- version 1.11.3 + +------------------------------------------------------------------- @@ -4 +11 @@ -- packages: Remove conflicting short options (-r repo/reconmmends) +- packages: Remove conflicting short options (-r repo/recommends) Old: ---- zypper-1.11.2.tar.bz2 New: ---- zypper-1.11.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zypper.spec ++++++ --- /var/tmp/diff_new_pack.2QLGAM/_old 2014-04-15 11:45:24.000000000 +0200 +++ /var/tmp/diff_new_pack.2QLGAM/_new 2014-04-15 11:45:24.000000000 +0200 @@ -33,7 +33,7 @@ Summary: Command line software manager using libzypp License: GPL-2.0+ Group: System/Packages -Version: 1.11.2 +Version: 1.11.3 Release: 0 Source: %{name}-%{version}.tar.bz2 Source1: %{name}-rpmlintrc ++++++ zypper-1.11.2.tar.bz2 -> zypper-1.11.3.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/zypper/zypper-1.11.2.tar.bz2 /work/SRC/openSUSE:Factory/.zypper.new/zypper-1.11.3.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit couchdb.2720 for openSUSE:12.3:Update
by root＠hilbert.suse.de 15 Apr '14

15 Apr '14

Hello community, here is the log from the commit of package couchdb.2720 for openSUSE:12.3:Update checked in at 2014-04-15 11:12:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3:Update/couchdb.2720 (Old) and /work/SRC/openSUSE:12.3:Update/.couchdb.2720.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "couchdb.2720" Changes: -------- New Changes file: --- /dev/null 2014-02-13 01:09:38.344032506 +0100 +++ /work/SRC/openSUSE:12.3:Update/.couchdb.2720.new/couchdb.changes 2014-04-15 11:12:05.000000000 +0200 @@ -0,0 +1,367 @@ +------------------------------------------------------------------- +Fri Apr 4 12:52:41 UTC 2014 - nkrinner(a)suse.com + +- Bug 871111 - VUL-1: CVE-2014-2668: couchdb: remote denial of service via /_uuids + Apache CouchDB 1.5.0 and earlier allows remote attackers to cause a denial of + service (CPU and memory consumption) via the count parameter to /_uuids. + Fix from upstream added as bnc-871111-remote-dos-via_uuids.patch + +------------------------------------------------------------------- +Wed Jan 9 16:11:08 CET 2013 - sbrabec(a)suse.cz + +- Fix path to nologin in useradd (bnc#796242). + +------------------------------------------------------------------- +Fri Jan 4 16:15:39 UTC 2013 - vjt(a)openssl.it + +- Fix a futon bug when saving view code of design documents that + do not define the "language" property. The CouchDB server treats + them as "javascript" views, so the same behavior has been added + to the futon. + +------------------------------------------------------------------- +Fri Dec 7 15:21:11 UTC 2012 - rhafer(a)suse.com + +- Fixed LSB headers in init script to make inserv happy. CouchDB + cannot start in runlevel 2 as it requires $network. + +------------------------------------------------------------------- +Thu Nov 22 00:40:42 GMT 2012 - aspiers(a)suse.com + +- Use "su" instead of "sudo" in init script, else couchdb inside + screen session dies when screen terminates. + +------------------------------------------------------------------- +Mon Nov 19 13:38:34 UTC 2012 - vjt(a)openssl.it + +- Re-introduce js-devel BuildRequire for openSUSE-12.2 + +------------------------------------------------------------------- +Thu Nov 8 18:02:16 UTC 2012 - vjt(a)openssl.it + +- Replace js-devel BuildRequire with mozilla-xulrunner192-devel + (already in openSUSE) +- Remove BuildRequire curl-devel as it is not needed anymore + http://www.apache.org/dist/couchdb/notes/1.2.0/apache-couchdb-1.2.0.html + +------------------------------------------------------------------- +Mon Jul 30 14:32:12 UTC 2012 - saschpe(a)suse.de + +- BuildRequire js-devel (already in openSUSE) instead of libjs-devel + (only in server:database) + +------------------------------------------------------------------- +Tue Jul 24 11:17:02 UTC 2012 - saschpe(a)suse.de + +- Set login shell of user couchdb to /bin/false +- Create /var/run/couchdb in %post and %ghost it (tmpfs) + +------------------------------------------------------------------- +Fri Jul 13 14:56:07 UTC 2012 - jatan(a)suse.de + +- Add init and sysconfig scripts from IBS Devel:Cloud, so that CouchDB + actually starts when installed + +------------------------------------------------------------------- +Thu Jul 12 16:14:55 UTC 2012 - dmacvicar(a)suse.de + +- remove all xulrunner support + without the rpath patch was already not working +- add --enable-js-trunk to build with newer libjs + +------------------------------------------------------------------- +Fri Jun 15 04:07:03 UTC 2012 - factory-maintainer(a)kulow.org + +- fix requires for factory + +------------------------------------------------------------------- +Wed Jun 13 15:53:51 UTC 2012 - coolo(a)suse.com + +- update to 1.2.0, plenty of changes - see + http://www.apache.org/dist/couchdb/notes/1.2.0/apache-couchdb-1.2.0.html + +------------------------------------------------------------------- +Thu Dec 15 10:52:45 UTC 2011 - coolo(a)suse.com + +- apache pulled 1.1.0, so update to 1.1.1 + - Support SpiderMonkey 1.8.5 + - Add configurable maximum to the number of bytes returned by _log. + - Allow CommonJS modules to be an empty string. + - Bump minimum Erlang version to R13B02. + - Do not run deleted validate_doc_update functions. + - ETags for views include current sequence if include_docs=true. + - Fix bug where duplicates can appear in _changes feed. + - Fix bug where update handlers break after conflict resolution. + - Fix bug with _replicator where include "filter" could crash couch. + - Fix crashes when compacting large views. + - Fix file descriptor leak in _log + - Fix missing revisions in _changes?style=all_docs. + - Improve handling of compaction at max_dbs_open limit. + - JSONP responses now send "text/javascript" for Content-Type. + - Link to ICU 4.2 on Windows. + - Permit forward slashes in path to update functions. + - Reap couchjs processes that hit reduce_overflow error. + - Status code can be specified in update handlers. + - Support provides() in show functions. + - _view_cleanup when ddoc has no views now removes all index files. + - max_replication_retry_count now supports "infinity". + - Fix replication crash when source database has a document with empty ID. + - Fix deadlock when assigning couchjs processes to serve requests. + - Fixes to the document multipart PUT API. + - Fixes regarding file descriptor leaks for databases with views. + +------------------------------------------------------------------- +Thu Dec 8 12:51:05 UTC 2011 - dmacvicar(a)suse.de + +- create /var/run/couchdb explicitly in the init script + (needed with /var/run as tmpfs) + +------------------------------------------------------------------- +Thu Dec 1 11:20:40 UTC 2011 - coolo(a)suse.com + +- add libtool as buildrequire to avoid implicit dependency + +------------------------------------------------------------------- +Fri Sep 30 00:10:35 UTC 2011 - saschpe(a)suse.de + +- Set license to Apache-2.0 (SPDX style) +- Removed outdated %clean section +- Use %_smp_mflags instead of %jobs macro +- Use %make_install instead of %makeinstall + +------------------------------------------------------------------- +Mon Jun 6 16:44:37 UTC 2011 - mrueckert(a)suse.de + +- update to version 1.1.0 + - Native SSL support. + - Added support for HTTP range requests for attachments. + - Added built-in filters for _changes: _doc_ids and _design. + - Added configuration option for TCP_NODELAY aka “Nagle”. + - Allow wildcards in vhosts definitions. + - More granular ETag support for views. + - More flexible URL rewriter. + - Added OS Process module to manage daemons outside of CouchDB. + - Added HTTP Proxy handler for more scalable externals. + - Added _replicator database to manage replications. + - Multiple micro-optimizations when reading data. + - Added CommonJS support to map functions. + - Added stale=update_after query option that triggers a view + update after returning a stale=ok response. + - More explicit error messages when it’s not possible to access a + file due to lack of permissions. + - Added a “change password”-feature to Futon. + +------------------------------------------------------------------- +Thu Mar 31 16:15:21 UTC 2011 - roosmaa(a)gmail.com + +- update to version 1.0.2 + * Make test suite work with Safari and Chrome. + * Fixed animated progress spinner. + * Fix raw view document link due to overzealous URI encoding. + * Spell javascript correctly in loadScript(uri). + * Fix leaking file handles after compacting databases and views. + * Fix databases forgetting their validation function after + compaction. + * Fix occasional timeout errors after successfully compacting + large databases. + * Fix ocassional error when writing to a database that has just + been compacted. + * Fix occasional timeout errors on systems with slow or heavily + loaded IO. + * Fix for OOME when compactions include documents with many + conflicts. + * Fix for missing attachment compression when MIME types + included parameters. + * Preserve purge metadata during compaction to avoid spurious + view rebuilds. + * Fix spurious conflicts introduced when uploading an attachment + after a doc has been in a conflict. + See COUCHDB-902 for details. + * Fix for frequently edited documents in multi-master deployments + being duplicated in changes and _alldocs. See COUCHDDB-968 for + details on how to repair. + * Significantly higher read and write throughput against database + and view index files. + * Reduce lengthy stack traces. + * Allow logging of native types. + * Allow reduce=false parameter in map-only views. + * Fix parsing of Accept headers. + * Fix for multipart GET APIs when an attachment was created + during a local-local replication. See COUCHDB-1022 for details. + * Updated ibrowse library to 2.1.2 fixing numerous replication + issues. + * Make sure that the replicator respects HTTP settings defined + in the config. + * Fix error when the ibrowse connection closes unexpectedly. + * Fix authenticated replication (with HTTP basic auth) of design + documents with attachments. ++++ 170 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:12.3:Update/.couchdb.2720.new/couchdb.changes New: ---- apache-couchdb-1.2.0.tar.gz bnc-871111-remote-dos-via_uuids.patch couchdb-futon-default-view-language.patch couchdb.changes couchdb.init couchdb.spec couchdb.sysconfig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ couchdb.spec ++++++ # # spec file for package couchdb # # 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/ # # %define couchdb_user couchdb %define couchdb_group couchdb %define couchdb_home %{_localstatedir}/lib/couchdb Name: couchdb Version: 1.2.0 Release: 0 Summary: A document database server, accessible via a RESTful JSON API License: Apache-2.0 Group: Productivity/File utilities Url: http://couchdb.apache.org/ Source0: http://www.apache.org/dist/%{name}/releases/%{version}/apache-couchdb-%{ver… Source1: %{name}.init Source2: %{name}.sysconfig Patch0: couchdb-futon-default-view-language.patch Patch1: bnc-871111-remote-dos-via_uuids.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: automake BuildRequires: erlang BuildRequires: gcc-c++ BuildRequires: help2man BuildRequires: libicu-devel BuildRequires: libtool %if 0%{?suse_version} < 1200 BuildRequires: mozilla-xulrunner192-devel %else BuildRequires: js-devel %endif BuildRequires: pkgconfig Requires: erlang Requires: logrotate Requires(post): aaa_base Requires(preun):aaa_base # Users and groups Requires(pre): pwdutils PreReq: %insserv_prereq %fillup_prereq %description Apache CouchDB is a distributed, fault-tolerant and schema-free document-oriented database accessible via a RESTful HTTP/JSON API. Among other features, it provides robust, incremental replication with bi-directional conflict detection and resolution, and is queryable and indexable using a table-oriented view engine with JavaScript acting as the default view definition language. %prep %setup -q -n apache-couchdb-%{version} %patch0 %patch1 -p1 %build autoreconf -fi # Versions of SpiderMonkey after the js185-1.0.0 release remove the optional # enforcement of preventing anonymous functions in a statement context. This # will most likely break your existing JavaScript code as well as render all # example code invalid. # If you wish to ignore this error pass --enable-js-trunk to ./configure. # # We need to define the use of gnu99 standard. It seems expected in the code, but not passed. export CFLAGS="%{optflags} -std=gnu99" %configure --enable-js-trunk make %{?_smp_mflags} %install %makeinstall ## Install couchdb initscript install -D -m 0755 %{SOURCE1} %{buildroot}%{_initddir}/%{name} install -d %{buildroot}%{_sbindir} ln -s %{_initddir}/couchdb %{buildroot}%{_sbindir}/rccouchdb # Sysconfig template mkdir -p %{buildroot}%{_var}/adm/fillup-templates/ install -p -D -m 644 %{SOURCE2} %{buildroot}%{_var}/adm/fillup-templates/sysconfig.couchdb # Create needed directories install -d %{buildroot}%{_localstatedir}/{log,lib}/couchdb install -d %{buildroot}%{_sysconfdir}/couchdb/{default.d,local.d} # Remove unecessary files rm %{buildroot}%{_sysconfdir}/rc.d/couchdb rm -rf %{buildroot}%{_datadir}/doc/couchdb # clean-up .la archives find %{buildroot} -name '*.la' -delete -print %pre getent group %{couchdb_group} >/dev/null || groupadd -r %{couchdb_group} || : if getent passwd %{couchdb_user} >/dev/null ; then # There was a bad login shell up to openSUSE 12.2 (bnc#796242), SLE11SP2 used /bin/bash. Fix it. usermod -s /usr/sbin/nologin %{couchdb_user} || : else useradd -r -g %{couchdb_group} -d %{couchdb_home} -s /usr/sbin/nologin \ -c "Couchdb Database Server" %{couchdb_user} || : fi %post %{fillup_and_insserv couchdb} mkdir -p %{_localstatedir}/run/couchdb %postun %restart_on_update couchdb %insserv_cleanup %preun %stop_on_removal couchdb %files %defattr(-,root,root,-) %doc AUTHORS BUGS CHANGES LICENSE NEWS NOTICE README THANKS %dir %{_sysconfdir}/couchdb %dir %{_sysconfdir}/couchdb/local.d %dir %{_sysconfdir}/couchdb/default.d %config(noreplace) %attr(0644, %{couchdb_user}, root) %{_sysconfdir}/couchdb/default.ini %config(noreplace) %attr(0644, %{couchdb_user}, root) %{_sysconfdir}/couchdb/local.ini %config(noreplace) %{_sysconfdir}/default/couchdb %config(noreplace) %{_sysconfdir}/logrotate.d/couchdb %{_initddir}/couchdb %{_var}/adm/fillup-templates/sysconfig.couchdb %{_sbindir}/rccouchdb %{_bindir}/* %{_libdir}/couchdb %{_datadir}/couchdb %{_mandir}/man1/* %dir %attr(0755, %{couchdb_user}, root) %{_localstatedir}/log/couchdb %ghost %dir %attr(0755, %{couchdb_user}, root) %{_localstatedir}/run/couchdb %dir %attr(0755, %{couchdb_user}, root) %{_localstatedir}/lib/couchdb %changelog ++++++ bnc-871111-remote-dos-via_uuids.patch ++++++ From: Robert Newson <rnewson(a)apache.org> Date: Tue, 25 Mar 2014 15:02:50 +0000 (+0000) Subject: Configurable upper bound to _uuids count parameter X-Git-Url: http://git-wip-us.apache.org/repos/asf?p=couchdb.git;a=commitdiff_plain;h=0… Configurable upper bound to _uuids count parameter --- diff --git a/etc/couchdb/default.ini.tpl.in b/etc/couchdb/default.ini.tpl.in index fd953c2..32537e0 100644 --- a/etc/couchdb/default.ini.tpl.in +++ b/etc/couchdb/default.ini.tpl.in @@ -169,6 +169,8 @@ algorithm = sequential ; utc_random - Time since Jan 1, 1970 UTC with microseconds ; First 14 characters are the time in hex. Last 18 are random. algorithm = sequential +# Maximum number of UUIDs retrievable from /_uuids in a single request +max_count = 1000 [stats] ; rate is in milliseconds diff --git a/share/www/script/test/uuids.js b/share/www/script/test/uuids.js index 6f5d223..0f141a9 100644 --- a/share/www/script/test/uuids.js +++ b/share/www/script/test/uuids.js @@ -80,6 +80,10 @@ couchTests.uuids = function(debug) { } }; + // test max_uuid_count + var xhr = CouchDB.request("GET", "/_uuids?count=1001"); + TEquals(401, xhr.status, "should error when count > max_count"); + run_on_modified_server([{ "section": "uuids", "key": "algorithm", diff --git a/src/couchdb/couch_httpd_misc_handlers.erl b/src/couchdb/couch_httpd_misc_handlers.erl index 96a05c6..67e3a12 100644 --- a/src/couchdb/couch_httpd_misc_handlers.erl +++ b/src/couchdb/couch_httpd_misc_handlers.erl @@ -105,7 +105,12 @@ handle_restart_req(Req) -> handle_uuids_req(#httpd{method='GET'}=Req) -> + Max = list_to_integer(couch_config:get("uuids","max","1000")), Count = list_to_integer(couch_httpd:qs_value(Req, "count", "1")), + case Count > Max of + true -> throw({forbidden, <<"count parameter too large">>}); + false -> ok + end, UUIDs = [couch_uuids:new() || _ <- lists:seq(1, Count)], Etag = couch_httpd:make_etag(UUIDs), couch_httpd:etag_respond(Req, Etag, fun() -> ++++++ couchdb-futon-default-view-language.patch ++++++ --- share/www/script/futon.browse.js.orig 2013-01-04 16:45:45.000000000 +0100 +++ share/www/script/futon.browse.js 2013-01-04 17:06:24.000000000 +0100 @@ -567,6 +567,9 @@ for (var viewName in (doc.views || {})) { if (viewName != localViewName) numViews++; } + if (doc.language === undefined) { + doc.language = 'javascript'; + } if (numViews > 0 && page.viewLanguage != doc.language) { alert("Cannot save view because the design document language " + "is \"" + doc.language + "\", not \"" + ++++++ couchdb.init ++++++ #!/bin/sh # # couchdb This is the init script for starting up the CouchDB server # # chkconfig: - 20 80 # description: Starts and stops the CouchDB daemon that handles \ # all database requests. ### BEGIN INIT INFO # Provides: couchdb # Required-Start: $local_fs $network # Required-Stop: $local_fs $network # Should-Start: $remote_fs # Should-Stop: $remote_fs # Default-Start: 3 5 # Default-Stop: 0 1 2 6 # Short-Description: start and stop CouchDB database server # Description: Apache CouchDB is a distributed, fault-tolerant and # schema-free document-oriented database accessible # via a RESTful HTTP/JSON API ### END INIT INFO # Source function library. . /etc/rc.status rc_reset COUCHDB_BIN="/usr/bin/couchdb" COUCHDB_USER="couchdb" COUCHDB_INIT_FILE="/var/log/couchdb/couchdb.init" COUCHDB_STDOUT_FILE="/dev/null" COUCHDB_STDERR_FILE="/var/log/couchdb/couchdb.stderr" COUCHDB_RESPAWN_TIMEOUT=5 export HOME=/var/lib/couchdb config="/etc/sysconfig/couchdb" [ -e $config ] && . $config lockfile=/var/lock/subsys/couchdb mkdir -m 755 -p /var/run/couchdb chown couchdb /var/run/couchdb case "$1" in start) echo -n "Starting CouchDB" [ -n "$COUCHDB_RESPAWN_TIMEOUT" ] && respawn="-r $COUCHDB_RESPAWN_TIMEOUT" startproc -s -u $COUCHDB_USER $COUCHDB_BIN -b \ -o $COUCHDB_STDOUT_FILE \ -e $COUCHDB_STDERR_FILE \ $respawn \ $COUCHDB_OPTIONS >> $COUCHDB_INIT_FILE 2>&1 rc_status -v ;; stop) echo -n "Stopping CouchDB" sudo -u $COUCHDB_USER $COUCHDB_BIN -d >> $COUCHDB_INIT_FILE 2>&1 rc_status -v ;; restart|force-reload) $0 stop $0 start rc_status ;; status) echo -n "Checking for CouchDB" su $COUCHDB_USER -c "$COUCHDB_BIN -s" >> $COUCHDB_INIT_FILE 2>&1 || rc_failed 3 rc_status -v ;; condrestart|try-restart) ;; *) echo $"Usage: $0 {start|stop|status|restart}" exit 1 esac rc_exit ++++++ couchdb.sysconfig ++++++ ## Type: string ## Default: "couchdb" # # User the process runs as. # Don't change this unless you know what you are doing # COUCHDB_USER=couchdb ## Type: string ## Default: "/var/log/couchdb/couchdb.init" # # Standard output/error for the CouchDb init script # Don't change this unless you know what you are doing # COUCHDB_INIT_FILE=/var/log/couchdb/couchdb.init ## Type: string ## Default: "/dev/null" # # Standard output for the CouchDb process # Don't change this unless you know what you are doing # COUCHDB_STDOUT_FILE=/dev/null ## Type: string ## Default: "/var/log/couchdb/couchdb.stderr" # # Standard error for the CouchDb process # Don't change this unless you know what you are doing # COUCHDB_STDERR_FILE=/var/log/couchdb/couchdb.stderr ## Type: integer(0:) ## Default: 5 # # Respawn timeout # COUCHDB_RESPAWN_TIMEOUT=5 ## Type: string ## Default: "" # # Other options to pass to the server process # COUCHDB_OPTIONS= -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit jakarta-commons-fileupload for openSUSE:13.1:Update
by root＠hilbert.suse.de 15 Apr '14

15 Apr '14

Hello community, here is the log from the commit of package jakarta-commons-fileupload for openSUSE:13.1:Update checked in at 2014-04-15 11:11:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/jakarta-commons-fileupload (Old) and /work/SRC/openSUSE:13.1:Update/.jakarta-commons-fileupload.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "jakarta-commons-fileupload" Changes: -------- New Changes file: NO CHANGES FILE!!! New: ---- _link ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ <link package='jakarta-commons-fileupload.2713' 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 jakarta-commons-fileupload for openSUSE:12.3:Update
by root＠hilbert.suse.de 15 Apr '14

15 Apr '14

Hello community, here is the log from the commit of package jakarta-commons-fileupload for openSUSE:12.3:Update checked in at 2014-04-15 11:11:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3:Update/jakarta-commons-fileupload (Old) and /work/SRC/openSUSE:12.3:Update/.jakarta-commons-fileupload.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "jakarta-commons-fileupload" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.fcXDJe/_old 2014-04-15 11:11:51.000000000 +0200 +++ /var/tmp/diff_new_pack.fcXDJe/_new 2014-04-15 11:11:51.000000000 +0200 @@ -1 +1 @@ -<link package='jakarta-commons-fileupload.2086' cicount='copy' /> +<link package='jakarta-commons-fileupload.2712' 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 rubygem-actionpack-3_2 for openSUSE:Factory
by root＠hilbert.suse.de 15 Apr '14

15 Apr '14

Hello community, here is the log from the commit of package rubygem-actionpack-3_2 for openSUSE:Factory checked in at 2014-04-15 07:37:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-actionpack-3_2 (Old) and /work/SRC/openSUSE:Factory/.rubygem-actionpack-3_2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-actionpack-3_2" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-actionpack-3_2/rubygem-actionpack-3_2.changes 2013-03-20 09:53:49.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rubygem-actionpack-3_2.new/rubygem-actionpack-3_2.changes 2014-04-15 07:37:12.000000000 +0200 @@ -1,0 +2,12 @@ +Thu Apr 3 14:34:54 UTC 2014 - jmassaguerpla(a)suse.com + +- update to version 3.2.17. It includes among other things fixes for: + CVE-2013-4389 (bnc#846239) + CVE-2013-4491 (bnc#853625) + CVE-2013-6414 (bnc#853633) + CVE-2013-6415 (bnc#853632) + CVE-2013-6417 (bnc#853627) + CVE-2014-0081 (bnc#864433) + CVE-2014-0082 (bnc#864431) + +------------------------------------------------------------------- Old: ---- actionpack-3.2.13.gem New: ---- actionpack-3.2.17.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-actionpack-3_2.spec ++++++ --- /var/tmp/diff_new_pack.BW6z9b/_old 2014-04-15 07:37:12.000000000 +0200 +++ /var/tmp/diff_new_pack.BW6z9b/_new 2014-04-15 07:37:12.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package rubygem-actionpack-3_2 # -# 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: rubygem-actionpack-3_2 -Version: 3.2.13 +Version: 3.2.17 Release: 0 %define mod_name actionpack %define mod_full_name %{mod_name}-%{version} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit apache-commons-httpclient for openSUSE:Factory
by root＠hilbert.suse.de 15 Apr '14

15 Apr '14

Hello community, here is the log from the commit of package apache-commons-httpclient for openSUSE:Factory checked in at 2014-04-15 07:37:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apache-commons-httpclient (Old) and /work/SRC/openSUSE:Factory/.apache-commons-httpclient.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "apache-commons-httpclient" Changes: -------- --- /work/SRC/openSUSE:Factory/apache-commons-httpclient/apache-commons-httpclient.changes 2013-10-25 18:52:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.apache-commons-httpclient.new/apache-commons-httpclient.changes 2014-04-15 07:37:06.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Apr 14 17:24:13 UTC 2014 - darin(a)darins.net + +- disable bytecode test on SLES + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apache-commons-httpclient.spec ++++++ --- /var/tmp/diff_new_pack.JjGNkP/_old 2014-04-15 07:37:07.000000000 +0200 +++ /var/tmp/diff_new_pack.JjGNkP/_new 2014-04-15 07:37:07.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package apache-commons-httpclient # -# 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 @@ -141,6 +141,11 @@ dist test %install +# suppress on SLES +%if 0%{?suse_version} == 1110 +export NO_BRP_CHECK_BYTECODE_VERSION=true +%endif + # jars mkdir -p $RPM_BUILD_ROOT%{_javadir} cp -p dist/commons-httpclient.jar \ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit installation-images-openSUSE for openSUSE:Factory
by root＠hilbert.suse.de 15 Apr '14

15 Apr '14

Hello community, here is the log from the commit of package installation-images-openSUSE for openSUSE:Factory checked in at 2014-04-15 07:35:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/installation-images-openSUSE (Old) and /work/SRC/openSUSE:Factory/.installation-images-openSUSE.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "installation-images-openSUSE" Changes: -------- --- /work/SRC/openSUSE:Factory/installation-images-openSUSE/installation-images-openSUSE.changes 2014-04-13 13:13:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.installation-images-openSUSE.new/installation-images-openSUSE.changes 2014-04-15 07:35:33.000000000 +0200 @@ -1,0 +2,10 @@ +Mon Apr 14 14:59:13 CEST 2014 - snwint(a)suse.de + +- deal with unnecessary links to /usr/sbin/service + +------------------------------------------------------------------- +Mon Apr 14 11:47:44 CEST 2014 - snwint(a)suse.de + +- added haveged to BuildRequires + +------------------------------------------------------------------- Old: ---- installation-images-14.76.tar.bz2 New: ---- installation-images-14.77.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ installation-images-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.NEWRBl/_old 2014-04-15 07:35:34.000000000 +0200 +++ /var/tmp/diff_new_pack.NEWRBl/_new 2014-04-15 07:35:35.000000000 +0200 @@ -45,6 +45,7 @@ BuildRequires: openSUSE-release BuildRequires: openSUSE-release-mini %endif +BuildRequires: haveged BuildRequires: raleway-fonts BuildRequires: kdump BuildRequires: Mesa @@ -355,10 +356,10 @@ Summary: Installation Image Files for %theme License: GPL-2.0+ Group: Metapackages -Version: 14.76 +Version: 14.77 Release: 0 Provides: installation-images = %version-%release -Source: installation-images-14.76.tar.bz2 +Source: installation-images-14.77.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %define _binary_payload w.ufdio ++++++ installation-images-14.76.tar.bz2 -> installation-images-14.77.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.76/VERSION new/installation-images-14.77/VERSION --- old/installation-images-14.76/VERSION 2014-04-10 11:32:49.000000000 +0200 +++ new/installation-images-14.77/VERSION 2014-04-14 14:59:03.000000000 +0200 @@ -1 +1 @@ -14.76 +14.77 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.76/changelog new/installation-images-14.77/changelog --- old/installation-images-14.76/changelog 2014-04-10 11:32:54.000000000 +0200 +++ new/installation-images-14.77/changelog 2014-04-14 14:59:08.000000000 +0200 @@ -1,4 +1,7 @@ -2014-04-08: HEAD +2014-04-14: HEAD + - deal with unnecessary links to /usr/sbin/service + +2014-04-08: 14.76 - added raleway-fonts (used by new yast theme) 2014-04-07: 14.75 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.76/data/base/base.file_list new/installation-images-14.77/data/base/base.file_list --- old/installation-images-14.76/data/base/base.file_list 2014-04-03 11:13:33.000000000 +0200 +++ new/installation-images-14.77/data/base/base.file_list 2014-04-14 14:55:03.000000000 +0200 @@ -128,6 +128,9 @@ # remove things we don't need r /usr/share/doc /usr/share/info /usr/share/man /var/adm/fillup-templates +# remove compat service links +E rm -f `find usr/sbin -lname service` + # add our own scripts x save_cfg bin/save_cfg x restore_cfg bin/restore_cfg -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libdrm for openSUSE:Factory
by root＠hilbert.suse.de 15 Apr '14

15 Apr '14

Hello community, here is the log from the commit of package libdrm for openSUSE:Factory checked in at 2014-04-15 07:35:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libdrm (Old) and /work/SRC/openSUSE:Factory/.libdrm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libdrm" Changes: -------- --- /work/SRC/openSUSE:Factory/libdrm/libdrm.changes 2014-02-19 11:36:16.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libdrm.new/libdrm.changes 2014-04-15 07:35:32.000000000 +0200 @@ -1,0 +2,17 @@ +Sat Apr 12 01:28:02 UTC 2014 - tobias.johannes.klausmann(a)mni.thm.de + +- Update to version 2.4.53: + + drm: Implement drmCheckModesettingSupported() for FreeBSD + + Enable libkms by default on DragonFly + + freedreno: do not leak drmVersion + + freedreno: fix license + + freedreno: some msm-ring reset/flush fixes + + freedreno: simplify device creation + + freedreno: fix null ptr in error path + + freedreno/kgsl: don't even bother trying CREATE_FD + + freedreno: zero out unused field + + modeprint: pretty print connector names + + radeon: sync with radeon_drm.h from kernel headers +- Remove upstream patch: Patch3: U_freedreno_license_fix.patch + +------------------------------------------------------------------- Old: ---- U_freedreno_license_fix.patch libdrm-2.4.52.tar.bz2 New: ---- libdrm-2.4.53.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libdrm.spec ++++++ --- /var/tmp/diff_new_pack.4o2QsC/_old 2014-04-15 07:35:32.000000000 +0200 +++ /var/tmp/diff_new_pack.4o2QsC/_new 2014-04-15 07:35:32.000000000 +0200 @@ -18,7 +18,7 @@ Name: libdrm Url: http://dri.freedesktop.org/ -Version: 2.4.52 +Version: 2.4.53 Release: 0 Provides: libdrm23 = %{version} Obsoletes: libdrm23 < %{version} @@ -34,12 +34,12 @@ #Git-Clone: git://anongit.freedesktop.org/git/mesa/drm #Git-Web: http://cgit.freedesktop.org/mesa/drm/ -Source: http://dri.freedesktop.org/libdrm/%{name}-%{version}.tar.bz2 +# Source URL: http://dri.freedesktop.org/libdrm/ +Source: %{name}-%{version}.tar.bz2 Source2: baselibs.conf # PATCH-FIX-UPSTREAM libdrm-implicit-defs.diff fdo#48599 -- Fix compiler warnings in tests/radeon/radeon_ttm.c Patch1: libdrm-implicit-defs.diff Patch2: u_Fix-compilation-on-systems-that-don-t-provide-O_CLOE.patch -Patch3: U_freedreno_license_fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf >= 2.63 @@ -165,7 +165,6 @@ %setup -q %patch1 -p1 %patch2 -p1 -%patch3 -p1 %build export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" ++++++ libdrm-2.4.52.tar.bz2 -> libdrm-2.4.53.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.52/Makefile.in new/libdrm-2.4.53/Makefile.in --- old/libdrm-2.4.52/Makefile.in 2014-01-20 20:04:47.000000000 +0100 +++ new/libdrm-2.4.53/Makefile.in 2014-04-10 21:10:48.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.13.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.52/aclocal.m4 new/libdrm-2.4.53/aclocal.m4 --- old/libdrm-2.4.52/aclocal.m4 2014-01-20 20:04:45.000000000 +0100 +++ new/libdrm-2.4.53/aclocal.m4 2014-04-10 21:10:47.000000000 +0200 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.13.4 -*- Autoconf -*- +# generated automatically by aclocal 1.13.3 -*- Autoconf -*- # Copyright (C) 1996-2013 Free Software Foundation, Inc. @@ -180,61 +180,6 @@ fi[]dnl ])# PKG_CHECK_MODULES - -# PKG_INSTALLDIR(DIRECTORY) -# ------------------------- -# Substitutes the variable pkgconfigdir as the location where a module -# should install pkg-config .pc files. By default the directory is -# $libdir/pkgconfig, but the default can be changed by passing -# DIRECTORY. The user can override through the --with-pkgconfigdir -# parameter. -AC_DEFUN([PKG_INSTALLDIR], -[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) -m4_pushdef([pkg_description], - [pkg-config installation directory @<:@]pkg_default[@:>@]) -AC_ARG_WITH([pkgconfigdir], - [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, - [with_pkgconfigdir=]pkg_default) -AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) -m4_popdef([pkg_default]) -m4_popdef([pkg_description]) -]) dnl PKG_INSTALLDIR - - -# PKG_NOARCH_INSTALLDIR(DIRECTORY) -# ------------------------- -# Substitutes the variable noarch_pkgconfigdir as the location where a -# module should install arch-independent pkg-config .pc files. By -# default the directory is $datadir/pkgconfig, but the default can be -# changed by passing DIRECTORY. The user can override through the -# --with-noarch-pkgconfigdir parameter. -AC_DEFUN([PKG_NOARCH_INSTALLDIR], -[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) -m4_pushdef([pkg_description], - [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) -AC_ARG_WITH([noarch-pkgconfigdir], - [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, - [with_noarch_pkgconfigdir=]pkg_default) -AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) -m4_popdef([pkg_default]) -m4_popdef([pkg_description]) -]) dnl PKG_NOARCH_INSTALLDIR - - -# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, -# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# ------------------------------------------- -# Retrieves the value of the pkg-config variable for the given module. -AC_DEFUN([PKG_CHECK_VAR], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl - -_PKG_CONFIG([$1], [variable="][$3]["], [$2]) -AS_VAR_COPY([$1], [pkg_cv_][$1]) - -AS_VAR_IF([$1], [""], [$5], [$4])dnl -])# PKG_CHECK_VAR - # Copyright (C) 2002-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation @@ -250,7 +195,7 @@ [am__api_version='1.13' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.13.4], [], +m4_if([$1], [1.13.3], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -266,7 +211,7 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.13.4])dnl +[AM_AUTOMAKE_VERSION([1.13.3])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.52/build-aux/config.guess new/libdrm-2.4.53/build-aux/config.guess --- old/libdrm-2.4.52/build-aux/config.guess 2014-01-20 20:04:47.000000000 +0100 +++ new/libdrm-2.4.53/build-aux/config.guess 2014-04-10 21:10:48.000000000 +0200 @@ -2,7 +2,7 @@ # Attempt to guess a canonical system name. # Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2013-05-16' +timestamp='2013-06-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -995,6 +995,12 @@ ppc:Linux:*:*) echo powerpc-unknown-linux-${LIBC} exit ;; + ppc64le:Linux:*:*) + echo powerpc64le-unknown-linux-${LIBC} + exit ;; + ppcle:Linux:*:*) + echo powerpcle-unknown-linux-${LIBC} + exit ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.52/build-aux/config.sub new/libdrm-2.4.53/build-aux/config.sub --- old/libdrm-2.4.52/build-aux/config.sub 2014-01-20 20:04:47.000000000 +0100 +++ new/libdrm-2.4.53/build-aux/config.sub 2014-04-10 21:10:48.000000000 +0200 @@ -2,7 +2,7 @@ # Configuration validation subroutine script. # Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2013-04-24' +timestamp='2013-08-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -257,8 +257,8 @@ | avr | avr32 \ | be32 | be64 \ | bfin \ - | c4x | clipper \ - | d10v | d30v | dlx | dsp16xx | dvp \ + | c4x | c8051 | clipper \ + | d10v | d30v | dlx | dsp16xx \ | epiphany \ | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ @@ -372,7 +372,7 @@ | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | clipper-* | craynv-* | cydra-* \ + | c8051-* | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ @@ -794,7 +794,7 @@ os=-mingw64 ;; mingw32) - basic_machine=i386-pc + basic_machine=i686-pc os=-mingw32 ;; mingw32ce) @@ -808,24 +808,6 @@ basic_machine=m68k-atari os=-mint ;; - mipsEE* | ee | ps2) - basic_machine=mips64r5900el-scei - case $os in - -linux*) - ;; - *) - os=-elf - ;; - esac - ;; - iop) - basic_machine=mipsel-scei - os=-irx - ;; - dvp) - basic_machine=dvp-scei - os=-elf - ;; mips3*-*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` ;; @@ -848,7 +830,7 @@ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; msys) - basic_machine=i386-pc + basic_machine=i686-pc os=-msys ;; mvs) @@ -1388,7 +1370,7 @@ | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -irx* \ + | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ @@ -1564,6 +1546,9 @@ c4x-* | tic4x-*) os=-coff ;; + c8051-*) + os=-elf + ;; hexagon-*) os=-elf ;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.52/build-aux/ltmain.sh new/libdrm-2.4.53/build-aux/ltmain.sh --- old/libdrm-2.4.52/build-aux/ltmain.sh 2014-01-20 20:04:42.000000000 +0100 +++ new/libdrm-2.4.53/build-aux/ltmain.sh 2014-04-10 21:10:45.000000000 +0200 @@ -70,7 +70,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4.2 +# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.3ubuntu1 # automake: $automake_version # autoconf: $autoconf_version # @@ -80,7 +80,7 @@ PROGRAM=libtool PACKAGE=libtool -VERSION=2.4.2 +VERSION="2.4.2 Debian-2.4.2-1.3ubuntu1" TIMESTAMP="" package_revision=1.3337 @@ -6124,7 +6124,10 @@ case $pass in dlopen) libs="$dlfiles" ;; dlpreopen) libs="$dlprefiles" ;; - link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; + link) + libs="$deplibs %DEPLIBS%" + test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" + ;; esac fi if test "$linkmode,$pass" = "lib,dlpreopen"; then @@ -6444,19 +6447,19 @@ # It is a libtool convenience library, so add in its objects. func_append convenience " $ladir/$objdir/$old_library" func_append old_convenience " $ladir/$objdir/$old_library" + tmp_libs= + for deplib in $dependency_libs; do + deplibs="$deplib $deplibs" + if $opt_preserve_dup_deps ; then + case "$tmp_libs " in + *" $deplib "*) func_append specialdeplibs " $deplib" ;; + esac + fi + func_append tmp_libs " $deplib" + done elif test "$linkmode" != prog && test "$linkmode" != lib; then func_fatal_error "\`$lib' is not a convenience library" fi - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" - if $opt_preserve_dup_deps ; then - case "$tmp_libs " in - *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi - func_append tmp_libs " $deplib" - done continue fi # $pass = conv @@ -7349,6 +7352,9 @@ revision="$number_minor" lt_irix_increment=no ;; + *) + func_fatal_configuration "$modename: unknown library version type \`$version_type'" + ;; esac ;; no) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.52/configure new/libdrm-2.4.53/configure --- old/libdrm-2.4.52/configure 2014-01-20 20:04:46.000000000 +0100 +++ new/libdrm-2.4.53/configure 2014-04-10 21:10:47.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libdrm 2.4.52. +# Generated by GNU Autoconf 2.69 for libdrm 2.4.53. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=DRI>. # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='libdrm' PACKAGE_TARNAME='libdrm' -PACKAGE_VERSION='2.4.52' -PACKAGE_STRING='libdrm 2.4.52' +PACKAGE_VERSION='2.4.53' +PACKAGE_STRING='libdrm 2.4.53' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=DRI' PACKAGE_URL='' @@ -1388,7 +1388,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 libdrm 2.4.52 to adapt to many kinds of systems. +\`configure' configures libdrm 2.4.53 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1458,7 +1458,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libdrm 2.4.52:";; + short | recursive ) echo "Configuration of libdrm 2.4.53:";; esac cat <<\_ACEOF @@ -1613,7 +1613,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libdrm configure 2.4.52 +libdrm configure 2.4.53 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2036,7 +2036,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libdrm $as_me 2.4.52, which was +It was created by libdrm $as_me 2.4.53, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2905,7 +2905,7 @@ # Define the identity of the package. PACKAGE='libdrm' - VERSION='2.4.52' + VERSION='2.4.53' cat >>confdefs.h <<_ACEOF @@ -5617,7 +5617,8 @@ ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else @@ -6018,10 +6019,6 @@ fi ;; -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -6060,11 +6057,11 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' else @@ -7157,7 +7154,14 @@ LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - LD="${LD-ld} -m elf_i386" + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac ;; ppc64-*linux*|powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" @@ -8718,7 +8722,7 @@ lt_prog_compiler_static='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -9196,6 +9200,9 @@ openbsd*) with_gnu_ld=no ;; + linux* | k*bsd*-gnu | gnu*) + link_all_deplibs=no + ;; esac ld_shlibs=yes @@ -9417,7 +9424,7 @@ fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -9594,6 +9601,7 @@ if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi + link_all_deplibs=no else # not using gcc if test "$host_cpu" = ia64; then @@ -10047,7 +10055,7 @@ link_all_deplibs=yes ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -10851,14 +10859,7 @@ *) objformat=elf ;; esac fi - # Handle Gentoo/FreeBSD as it was Linux - case $host_vendor in - gentoo) - version_type=linux ;; - *) - version_type=freebsd-$objformat ;; - esac - + version_type=freebsd-$objformat case $version_type in freebsd-elf*) library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' @@ -10869,12 +10870,6 @@ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' need_version=yes ;; - linux) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - need_lib_prefix=no - need_version=no - ;; esac shlibpath_var=LD_LIBRARY_PATH case $host_os in @@ -10897,17 +10892,6 @@ esac ;; -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no @@ -11024,7 +11008,7 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no @@ -11088,6 +11072,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -12513,6 +12509,9 @@ if test "x$LIBKMS" = xauto ; then case $host_os in linux*) LIBKMS="yes" ;; + freebsd* | kfreebsd*-gnu) + LIBKMS="yes" ;; + dragonfly*) LIBKMS="yes" ;; *) LIBKMS="no" ;; esac fi @@ -13814,7 +13813,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libdrm $as_me 2.4.52, which was +This file was extended by libdrm $as_me 2.4.53, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13880,7 +13879,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libdrm config.status 2.4.52 +libdrm config.status 2.4.53 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.52/configure.ac new/libdrm-2.4.53/configure.ac --- old/libdrm-2.4.52/configure.ac 2014-01-20 19:58:15.000000000 +0100 +++ new/libdrm-2.4.53/configure.ac 2014-04-10 21:10:03.000000000 +0200 @@ -20,7 +20,7 @@ AC_PREREQ([2.63]) AC_INIT([libdrm], - [2.4.52], + [2.4.53], [https://bugs.freedesktop.org/enter_bug.cgi?product=DRI] [libdrm]) @@ -185,6 +185,9 @@ if test "x$LIBKMS" = xauto ; then case $host_os in linux*) LIBKMS="yes" ;; + freebsd* | kfreebsd*-gnu) + LIBKMS="yes" ;; + dragonfly*) LIBKMS="yes" ;; *) LIBKMS="no" ;; esac fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.52/exynos/Makefile.in new/libdrm-2.4.53/exynos/Makefile.in --- old/libdrm-2.4.52/exynos/Makefile.in 2014-01-20 20:04:47.000000000 +0100 +++ new/libdrm-2.4.53/exynos/Makefile.in 2014-04-10 21:10:48.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.13.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.52/freedreno/Makefile.in new/libdrm-2.4.53/freedreno/Makefile.in --- old/libdrm-2.4.52/freedreno/Makefile.in 2014-01-20 20:04:47.000000000 +0100 +++ new/libdrm-2.4.53/freedreno/Makefile.in 2014-04-10 21:10:48.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.13.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.52/freedreno/freedreno_device.c new/libdrm-2.4.53/freedreno/freedreno_device.c --- old/libdrm-2.4.52/freedreno/freedreno_device.c 2014-01-13 22:41:23.000000000 +0100 +++ new/libdrm-2.4.53/freedreno/freedreno_device.c 2014-04-10 21:08:54.000000000 +0200 @@ -34,7 +34,6 @@ #include "freedreno_priv.h" static pthread_mutex_t table_lock = PTHREAD_MUTEX_INITIALIZER; -static void * dev_table; struct fd_device * kgsl_device_new(int fd); struct fd_device * msm_device_new(int fd); @@ -77,7 +76,7 @@ } } -static struct fd_device * fd_device_new_impl(int fd) +struct fd_device * fd_device_new(int fd) { struct fd_device *dev; drmVersionPtr version; @@ -99,6 +98,7 @@ ERROR_MSG("unknown device: %s", version->name); dev = NULL; } + drmFreeVersion(version); if (!dev) return NULL; @@ -112,36 +112,14 @@ return dev; } -struct fd_device * fd_device_new(int fd) -{ - struct fd_device *dev = NULL; - int key = fd; - - pthread_mutex_lock(&table_lock); - - if (!dev_table) - dev_table = drmHashCreate(); - - if (drmHashLookup(dev_table, key, (void **)&dev)) { - dev = fd_device_new_impl(fd); - if (dev) - drmHashInsert(dev_table, key, dev); - } else { - dev = fd_device_ref(dev); - } - - pthread_mutex_unlock(&table_lock); - - return dev; -} - /* like fd_device_new() but creates it's own private dup() of the fd * which is close()d when the device is finalized. */ struct fd_device * fd_device_new_dup(int fd) { struct fd_device *dev = fd_device_new(dup(fd)); - dev->closefd = 1; + if (dev) + dev->closefd = 1; return dev; } @@ -156,7 +134,6 @@ fd_cleanup_bo_cache(dev, 0); drmHashDestroy(dev->handle_table); drmHashDestroy(dev->name_table); - drmHashDelete(dev_table, dev->fd); if (dev->closefd) close(dev->fd); dev->funcs->destroy(dev); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.52/freedreno/freedreno_priv.h new/libdrm-2.4.53/freedreno/freedreno_priv.h --- old/libdrm-2.4.52/freedreno/freedreno_priv.h 2014-01-13 22:41:23.000000000 +0100 +++ new/libdrm-2.4.53/freedreno/freedreno_priv.h 2014-04-04 18:45:41.000000000 +0200 @@ -114,6 +114,7 @@ struct fd_ringbuffer_funcs { void * (*hostptr)(struct fd_ringbuffer *ring); int (*flush)(struct fd_ringbuffer *ring, uint32_t *last_start); + void (*reset)(struct fd_ringbuffer *ring); void (*emit_reloc)(struct fd_ringbuffer *ring, const struct fd_reloc *reloc); void (*emit_reloc_ring)(struct fd_ringbuffer *ring, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.52/freedreno/freedreno_ringbuffer.c new/libdrm-2.4.53/freedreno/freedreno_ringbuffer.c --- old/libdrm-2.4.52/freedreno/freedreno_ringbuffer.c 2014-01-13 22:41:23.000000000 +0100 +++ new/libdrm-2.4.53/freedreno/freedreno_ringbuffer.c 2014-04-04 18:45:41.000000000 +0200 @@ -72,6 +72,8 @@ if (ring->pipe->id == FD_PIPE_2D) start = &ring->start[0x140]; ring->cur = ring->last_start = start; + if (ring->funcs->reset) + ring->funcs->reset(ring); } /* maybe get rid of this and use fd_ringmarker_flush() from DDX too? */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.52/freedreno/kgsl/kgsl_bo.c new/libdrm-2.4.53/freedreno/kgsl/kgsl_bo.c --- old/libdrm-2.4.52/freedreno/kgsl/kgsl_bo.c 2014-01-13 22:41:23.000000000 +0100 +++ new/libdrm-2.4.53/freedreno/kgsl/kgsl_bo.c 2014-04-04 18:45:41.000000000 +0200 @@ -174,28 +174,18 @@ struct fd_bo * fd_bo_from_fbdev(struct fd_pipe *pipe, int fbfd, uint32_t size) { - struct drm_kgsl_gem_create_fd req = { - .fd = fbfd, - }; struct fd_bo *bo; - struct kgsl_bo *kgsl_bo; if (!is_kgsl_pipe(pipe)) return NULL; - if (drmCommandWriteRead(pipe->dev->fd, DRM_KGSL_GEM_CREATE_FD, - &req, sizeof(req))) { - return NULL; - } - - bo = fd_bo_from_handle(pipe->dev, req.handle, size); - kgsl_bo = to_kgsl_bo(bo); + bo = fd_bo_new(pipe->dev, 1, 0); /* this is fugly, but works around a bug in the kernel.. * priv->memdesc.size never gets set, so getbufinfo ioctl * thinks the buffer hasn't be allocate and fails */ - if (bo && !kgsl_bo_gpuaddr(kgsl_bo, 0)) { + if (bo) { void *fbmem = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, fbfd, 0); struct kgsl_map_user_mem req = { @@ -204,7 +194,9 @@ .offset = 0, .hostptr = (unsigned long)fbmem, }; + struct kgsl_bo *kgsl_bo = to_kgsl_bo(bo); int ret; + ret = ioctl(to_kgsl_pipe(pipe)->fd, IOCTL_KGSL_MAP_USER_MEM, &req); if (ret) { ERROR_MSG("mapping user mem failed: %s", @@ -222,7 +214,6 @@ return NULL; } - uint32_t kgsl_bo_gpuaddr(struct kgsl_bo *kgsl_bo, uint32_t offset) { struct fd_bo *bo = &kgsl_bo->base; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.52/freedreno/msm/msm_drm.h new/libdrm-2.4.53/freedreno/msm/msm_drm.h --- old/libdrm-2.4.52/freedreno/msm/msm_drm.h 2013-09-28 01:17:25.000000000 +0200 +++ new/libdrm-2.4.53/freedreno/msm/msm_drm.h 2014-02-07 17:58:41.000000000 +0100 @@ -2,17 +2,24 @@ * Copyright (C) 2013 Red Hat * Author: Rob Clark <robdclark(a)gmail.com> * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 as published by - * the Free Software Foundation. + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. * - * You should have received a copy of the GNU General Public License along with - * this program. If not, see <http://www.gnu.org/licenses/>. + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. */ #ifndef __MSM_DRM_H__ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.52/freedreno/msm/msm_ringbuffer.c new/libdrm-2.4.53/freedreno/msm/msm_ringbuffer.c --- old/libdrm-2.4.52/freedreno/msm/msm_ringbuffer.c 2014-01-13 22:41:23.000000000 +0100 +++ new/libdrm-2.4.53/freedreno/msm/msm_ringbuffer.c 2014-04-10 21:08:54.000000000 +0200 @@ -143,6 +143,7 @@ cmd->submit_idx = bo2idx(ring, target_bo, FD_RELOC_READ); cmd->submit_offset = submit_offset; cmd->size = size; + cmd->pad = 0; } return cmd; @@ -169,6 +170,22 @@ return i; } +static void flush_reset(struct fd_ringbuffer *ring) +{ + struct msm_ringbuffer *msm_ring = to_msm_ringbuffer(ring); + unsigned i; + + /* for each of the cmd buffers, clear their reloc's: */ + for (i = 0; i < msm_ring->nr_cmds; i++) { + struct msm_ringbuffer *target_ring = to_msm_ringbuffer(msm_ring->rings[i]); + target_ring->nr_relocs = 0; + } + + msm_ring->nr_relocs = 0; + msm_ring->nr_cmds = 0; + msm_ring->nr_bos = 0; +} + static int msm_ringbuffer_flush(struct fd_ringbuffer *ring, uint32_t *last_start) { struct msm_ringbuffer *msm_ring = to_msm_ringbuffer(ring); @@ -205,8 +222,16 @@ ret = drmCommandWriteRead(ring->pipe->dev->fd, DRM_MSM_GEM_SUBMIT, &req, sizeof(req)); - if (ret) + if (ret) { ERROR_MSG("submit failed: %d (%s)", ret, strerror(errno)); + } else { + /* update timestamp on all rings associated with submit: */ + for (i = 0; i < msm_ring->nr_cmds; i++) { + struct fd_ringbuffer *target_ring = msm_ring->rings[i]; + if (!ret) + target_ring->last_timestamp = req.fence; + } + } LIST_FOR_EACH_ENTRY_SAFE(msm_bo, tmp, &msm_ring->submit_list, list[id]) { struct list_head *list = &msm_bo->list[id]; @@ -215,18 +240,16 @@ fd_bo_del(&msm_bo->base); } - /* for each of the cmd buffers, clear their reloc's: */ - for (i = 0; i < msm_ring->nr_cmds; i++) { - struct msm_ringbuffer *target_ring = to_msm_ringbuffer(msm_ring->rings[i]); - target_ring->nr_relocs = 0; - } - - msm_ring->nr_cmds = 0; - msm_ring->nr_bos = 0; + flush_reset(ring); return ret; } +static void msm_ringbuffer_reset(struct fd_ringbuffer *ring) +{ + flush_reset(ring); +} + static void msm_ringbuffer_emit_reloc(struct fd_ringbuffer *ring, const struct fd_reloc *r) { @@ -285,6 +308,7 @@ static struct fd_ringbuffer_funcs funcs = { .hostptr = msm_ringbuffer_hostptr, .flush = msm_ringbuffer_flush, + .reset = msm_ringbuffer_reset, .emit_reloc = msm_ringbuffer_emit_reloc, .emit_reloc_ring = msm_ringbuffer_emit_reloc_ring, .destroy = msm_ringbuffer_destroy, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.52/include/Makefile.in new/libdrm-2.4.53/include/Makefile.in --- old/libdrm-2.4.52/include/Makefile.in 2014-01-20 20:04:47.000000000 +0100 +++ new/libdrm-2.4.53/include/Makefile.in 2014-04-10 21:10:48.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.13.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.52/include/drm/Makefile new/libdrm-2.4.53/include/drm/Makefile --- old/libdrm-2.4.52/include/drm/Makefile 2014-01-20 20:04:49.000000000 +0100 +++ new/libdrm-2.4.53/include/drm/Makefile 2014-04-10 21:10:51.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.13.3 from Makefile.am. # include/drm/Makefile. Generated from Makefile.in by configure. # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -100,8 +100,8 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -build_triplet = x86_64-unknown-linux-gnu -host_triplet = x86_64-unknown-linux-gnu +build_triplet = i686-pc-linux-gnu +host_triplet = i686-pc-linux-gnu am__append_1 = vmwgfx_drm.h subdir = include/drm DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ @@ -189,17 +189,17 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /home/kwg/Projects/drm/build-aux/missing aclocal-1.13 +ACLOCAL = ${SHELL} /home/marek/dev/drm/build-aux/missing aclocal-1.13 ALLOCA = AMTAR = $${TAR-tar} AM_DEFAULT_VERBOSITY = 0 AR = ar -AUTOCONF = ${SHELL} /home/kwg/Projects/drm/build-aux/missing autoconf -AUTOHEADER = ${SHELL} /home/kwg/Projects/drm/build-aux/missing autoheader -AUTOMAKE = ${SHELL} /home/kwg/Projects/drm/build-aux/missing automake-1.13 +AUTOCONF = ${SHELL} /home/marek/dev/drm/build-aux/missing autoconf +AUTOHEADER = ${SHELL} /home/marek/dev/drm/build-aux/missing autoheader +AUTOMAKE = ${SHELL} /home/marek/dev/drm/build-aux/missing automake-1.13 AWK = gawk -CAIRO_CFLAGS = -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/freetype2 -I/usr/include/libdrm -I/usr/include/libpng16 -CAIRO_LIBS = -lcairo +CAIRO_CFLAGS = -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib/i386-linux-gnu/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 +CAIRO_LIBS = -lcairo CC = gcc CCDEPMODE = depmode=gcc3 CFLAGS = -g -O2 @@ -224,18 +224,18 @@ INSTALL_PROGRAM = ${INSTALL} INSTALL_SCRIPT = ${INSTALL} INSTALL_STRIP_PROGRAM = $(install_sh) -c -s -LD = /usr/x86_64-pc-linux-gnu/bin/ld -m elf_x86_64 +LD = /usr/bin/ld LDFLAGS = LIBOBJS = LIBS = LIBTOOL = $(SHELL) $(top_builddir)/libtool -LIBUDEV_CFLAGS = -LIBUDEV_LIBS = -ludev +LIBUDEV_CFLAGS = +LIBUDEV_LIBS = -ludev LIPO = LN_S = ln -s LTLIBOBJS = MAINT = -MAKEINFO = ${SHELL} /home/kwg/Projects/drm/build-aux/missing makeinfo +MAKEINFO = ${SHELL} /home/marek/dev/drm/build-aux/missing makeinfo MANIFEST_TOOL = : MANPAGES_STYLESHEET = http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl MKDIR_P = /bin/mkdir -p @@ -248,32 +248,32 @@ PACKAGE = libdrm PACKAGE_BUGREPORT = https://bugs.freedesktop.org/enter_bug.cgi?product=DRI PACKAGE_NAME = libdrm -PACKAGE_STRING = libdrm 2.4.52 +PACKAGE_STRING = libdrm 2.4.53 PACKAGE_TARNAME = libdrm PACKAGE_URL = -PACKAGE_VERSION = 2.4.52 +PACKAGE_VERSION = 2.4.53 PATH_SEPARATOR = : -PCIACCESS_CFLAGS = -PCIACCESS_LIBS = -lpciaccess +PCIACCESS_CFLAGS = +PCIACCESS_LIBS = -lpciaccess PKG_CONFIG = /usr/bin/pkg-config PKG_CONFIG_LIBDIR = PKG_CONFIG_PATH = -PTHREADSTUBS_CFLAGS = -PTHREADSTUBS_LIBS = +PTHREADSTUBS_CFLAGS = +PTHREADSTUBS_LIBS = RANLIB = ranlib SED = /bin/sed SET_MAKE = -SHELL = /bin/sh +SHELL = /bin/bash STRIP = strip -VALGRIND_CFLAGS = -I/usr/include/valgrind -VALGRIND_LIBS = -L/usr/lib64/valgrind -lcoregrind-amd64-linux -lvex-amd64-linux -lgcc -VERSION = 2.4.52 +VALGRIND_CFLAGS = -I/usr/include/valgrind +VALGRIND_LIBS = -L/usr/lib/valgrind -lcoregrind-x86-linux -lvex-x86-linux -lgcc +VERSION = 2.4.53 WARN_CFLAGS = -Wall -Wextra -Wsign-compare -Werror-implicit-function-declaration -Wpointer-arith -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Wpacked -Wswitch-enum -Wmissing-format-attribute -Wstrict-aliasing=2 -Winit-self -Wdeclaration-after-statement -Wold-style-definition -Wno-missing-field-initializers -Wno-unused-parameter -Wno-attributes -Wno-long-long -Winline XSLTPROC = /usr/bin/xsltproc -abs_builddir = /home/kwg/Projects/drm/include/drm -abs_srcdir = /home/kwg/Projects/drm/include/drm -abs_top_builddir = /home/kwg/Projects/drm -abs_top_srcdir = /home/kwg/Projects/drm +abs_builddir = /home/marek/dev/drm/include/drm +abs_srcdir = /home/marek/dev/drm/include/drm +abs_top_builddir = /home/marek/dev/drm +abs_top_srcdir = /home/marek/dev/drm ac_ct_AR = ar ac_ct_CC = gcc ac_ct_DUMPBIN = @@ -283,28 +283,28 @@ am__tar = $${TAR-tar} chof - "$$tardir" am__untar = $${TAR-tar} xf - bindir = ${exec_prefix}/bin -build = x86_64-unknown-linux-gnu +build = i686-pc-linux-gnu build_alias = -build_cpu = x86_64 +build_cpu = i686 build_os = linux-gnu -build_vendor = unknown +build_vendor = pc builddir = . datadir = ${datarootdir} datarootdir = ${prefix}/share docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} dvidir = ${docdir} exec_prefix = ${prefix} -host = x86_64-unknown-linux-gnu +host = i686-pc-linux-gnu host_alias = -host_cpu = x86_64 +host_cpu = i686 host_os = linux-gnu -host_vendor = unknown +host_vendor = pc htmldir = ${docdir} includedir = ${prefix}/include infodir = ${datarootdir}/info -install_sh = ${SHELL} /home/kwg/Projects/drm/build-aux/install-sh +install_sh = ${SHELL} /home/marek/dev/drm/build-aux/install-sh kernel_source = -libdir = /usr/lib64 +libdir = /usr/lib/i386-linux-gnu libexecdir = ${exec_prefix}/libexec localedir = ${datarootdir}/locale localstatedir = ${prefix}/var @@ -312,14 +312,14 @@ mkdir_p = $(MKDIR_P) oldincludedir = /usr/include pdfdir = ${docdir} -pkgconfigdir = /usr/lib64/pkgconfig +pkgconfigdir = /usr/lib/i386-linux-gnu/pkgconfig prefix = /usr program_transform_name = s,x,x, psdir = ${docdir} sbindir = ${exec_prefix}/sbin sharedstatedir = ${prefix}/com srcdir = . -sysconfdir = /etc +sysconfdir = ${prefix}/etc target_alias = top_build_prefix = ../../ top_builddir = ../.. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.52/include/drm/Makefile.in new/libdrm-2.4.53/include/drm/Makefile.in --- old/libdrm-2.4.52/include/drm/Makefile.in 2014-01-20 20:04:47.000000000 +0100 +++ new/libdrm-2.4.53/include/drm/Makefile.in 2014-04-10 21:10:48.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.13.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.52/include/drm/radeon_drm.h new/libdrm-2.4.53/include/drm/radeon_drm.h --- old/libdrm-2.4.52/include/drm/radeon_drm.h 2013-12-29 07:05:33.000000000 +0100 +++ new/libdrm-2.4.53/include/drm/radeon_drm.h 2014-04-08 21:32:08.000000000 +0200 @@ -510,6 +510,7 @@ #define DRM_RADEON_GEM_GET_TILING 0x29 #define DRM_RADEON_GEM_BUSY 0x2a #define DRM_RADEON_GEM_VA 0x2b +#define DRM_RADEON_GEM_OP 0x2c #define DRM_IOCTL_RADEON_CP_INIT DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_CP_INIT, drm_radeon_init_t) #define DRM_IOCTL_RADEON_CP_START DRM_IO( DRM_COMMAND_BASE + DRM_RADEON_CP_START) @@ -548,10 +549,11 @@ #define DRM_IOCTL_RADEON_GEM_WAIT_IDLE DRM_IOW(DRM_COMMAND_BASE + DRM_RADEON_GEM_WAIT_IDLE, struct drm_radeon_gem_wait_idle) #define DRM_IOCTL_RADEON_CS DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_CS, struct drm_radeon_cs) #define DRM_IOCTL_RADEON_INFO DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_INFO, struct drm_radeon_info) -#define DRM_IOCTL_RADEON_SET_TILING DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_SET_TILING, struct drm_radeon_gem_set_tiling) -#define DRM_IOCTL_RADEON_GET_TILING DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_GET_TILING, struct drm_radeon_gem_get_tiling) +#define DRM_IOCTL_RADEON_GEM_SET_TILING DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_SET_TILING, struct drm_radeon_gem_set_tiling) +#define DRM_IOCTL_RADEON_GEM_GET_TILING DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_GET_TILING, struct drm_radeon_gem_get_tiling) #define DRM_IOCTL_RADEON_GEM_BUSY DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_BUSY, struct drm_radeon_gem_busy) #define DRM_IOCTL_RADEON_GEM_VA DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_VA, struct drm_radeon_gem_va) +#define DRM_IOCTL_RADEON_GEM_OP DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_OP, struct drm_radeon_gem_op) typedef struct drm_radeon_init { enum { @@ -643,7 +645,7 @@ } drm_radeon_vertex2_t; /* v1.3 - obsoletes drm_radeon_vertex2 - * - allows arbitarily large cliprect list + * - allows arbitrarily large cliprect list * - allows updating of tcl packet, vector and scalar state * - allows memory-efficient description of state updates * - allows state to be emitted without a primitive @@ -885,6 +887,16 @@ uint64_t data_ptr; }; +/* Sets or returns a value associated with a buffer. */ +struct drm_radeon_gem_op { + uint32_t handle; /* buffer */ + uint32_t op; /* RADEON_GEM_OP_* */ + uint64_t value; /* input or return value */ +}; + +#define RADEON_GEM_OP_GET_INITIAL_DOMAIN 0 +#define RADEON_GEM_OP_SET_INITIAL_DOMAIN 1 + #define RADEON_VA_MAP 1 #define RADEON_VA_UNMAP 2 @@ -920,6 +932,7 @@ #define RADEON_CS_RING_COMPUTE 1 #define RADEON_CS_RING_DMA 2 #define RADEON_CS_RING_UVD 3 +#define RADEON_CS_RING_VCE 4 /* The third dword of RADEON_CHUNK_ID_FLAGS is a sint32 that sets the priority */ /* 0 = normal, + = higher priority, - = lower priority */ @@ -984,6 +997,18 @@ #define RADEON_INFO_SI_CP_DMA_COMPUTE 0x17 /* CIK macrotile mode array */ #define RADEON_INFO_CIK_MACROTILE_MODE_ARRAY 0x18 +/* query the number of render backends */ +#define RADEON_INFO_SI_BACKEND_ENABLED_MASK 0x19 +/* max engine clock - needed for OpenCL */ +#define RADEON_INFO_MAX_SCLK 0x1a +/* version of VCE firmware */ +#define RADEON_INFO_VCE_FW_VERSION 0x1b +/* version of VCE feedback */ +#define RADEON_INFO_VCE_FB_VERSION 0x1c +#define RADEON_INFO_NUM_BYTES_MOVED 0x1d +#define RADEON_INFO_VRAM_USAGE 0x1e +#define RADEON_INFO_GTT_USAGE 0x1f + struct drm_radeon_info { uint32_t request; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.52/intel/Makefile.in new/libdrm-2.4.53/intel/Makefile.in --- old/libdrm-2.4.52/intel/Makefile.in 2014-01-20 20:04:47.000000000 +0100 +++ new/libdrm-2.4.53/intel/Makefile.in 2014-04-10 21:10:48.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.13.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.52/libkms/Makefile.in new/libdrm-2.4.53/libkms/Makefile.in --- old/libdrm-2.4.52/libkms/Makefile.in 2014-01-20 20:04:47.000000000 +0100 +++ new/libdrm-2.4.53/libkms/Makefile.in 2014-04-10 21:10:48.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.13.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.52/m4/libtool.m4 new/libdrm-2.4.53/m4/libtool.m4 --- old/libdrm-2.4.52/m4/libtool.m4 2014-01-20 20:04:43.000000000 +0100 +++ new/libdrm-2.4.53/m4/libtool.m4 2014-04-10 21:10:45.000000000 +0200 @@ -1324,7 +1324,14 @@ LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - LD="${LD-ld} -m elf_i386" + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac ;; ppc64-*linux*|powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" @@ -1688,7 +1695,8 @@ ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else @@ -2479,14 +2487,7 @@ *) objformat=elf ;; esac fi - # Handle Gentoo/FreeBSD as it was Linux - case $host_vendor in - gentoo) - version_type=linux ;; - *) - version_type=freebsd-$objformat ;; - esac - + version_type=freebsd-$objformat case $version_type in freebsd-elf*) library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' @@ -2497,12 +2498,6 @@ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' need_version=yes ;; - linux) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - need_lib_prefix=no - need_version=no - ;; esac shlibpath_var=LD_LIBRARY_PATH case $host_os in @@ -2525,17 +2520,6 @@ esac ;; -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no @@ -2652,7 +2636,7 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no @@ -2697,6 +2681,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -3256,10 +3252,6 @@ fi ;; -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -3298,11 +3290,11 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' else @@ -4050,7 +4042,7 @@ ;; esac ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # KAI C++ Compiler @@ -4114,7 +4106,7 @@ ;; esac ;; - netbsd*) + netbsd* | netbsdelf*-gnu) ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise @@ -4349,7 +4341,7 @@ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -4591,6 +4583,9 @@ ;; esac ;; + linux* | k*bsd*-gnu | gnu*) + _LT_TAGVAR(link_all_deplibs, $1)=no + ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; @@ -4653,6 +4648,9 @@ openbsd*) with_gnu_ld=no ;; + linux* | k*bsd*-gnu | gnu*) + _LT_TAGVAR(link_all_deplibs, $1)=no + ;; esac _LT_TAGVAR(ld_shlibs, $1)=yes @@ -4874,7 +4872,7 @@ fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -5051,6 +5049,7 @@ if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi + _LT_TAGVAR(link_all_deplibs, $1)=no else # not using gcc if test "$host_cpu" = ia64; then @@ -5355,7 +5354,7 @@ _LT_TAGVAR(link_all_deplibs, $1)=yes ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -6235,9 +6234,6 @@ _LT_TAGVAR(ld_shlibs, $1)=yes ;; - gnu*) - ;; - haiku*) _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' _LT_TAGVAR(link_all_deplibs, $1)=yes @@ -6399,7 +6395,7 @@ _LT_TAGVAR(inherit_rpath, $1)=yes ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.52/man/Makefile.in new/libdrm-2.4.53/man/Makefile.in --- old/libdrm-2.4.52/man/Makefile.in 2014-01-20 20:04:47.000000000 +0100 +++ new/libdrm-2.4.53/man/Makefile.in 2014-04-10 21:10:48.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.13.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.52/nouveau/Makefile.in new/libdrm-2.4.53/nouveau/Makefile.in --- old/libdrm-2.4.52/nouveau/Makefile.in 2014-01-20 20:04:47.000000000 +0100 +++ new/libdrm-2.4.53/nouveau/Makefile.in 2014-04-10 21:10:48.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.13.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.52/omap/Makefile.in new/libdrm-2.4.53/omap/Makefile.in --- old/libdrm-2.4.52/omap/Makefile.in 2014-01-20 20:04:47.000000000 +0100 +++ new/libdrm-2.4.53/omap/Makefile.in 2014-04-10 21:10:48.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.13.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.52/radeon/Makefile.in new/libdrm-2.4.53/radeon/Makefile.in --- old/libdrm-2.4.52/radeon/Makefile.in 2014-01-20 20:04:47.000000000 +0100 +++ new/libdrm-2.4.53/radeon/Makefile.in 2014-04-10 21:10:48.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.13.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.52/tests/Makefile.in new/libdrm-2.4.53/tests/Makefile.in --- old/libdrm-2.4.52/tests/Makefile.in 2014-01-20 20:04:47.000000000 +0100 +++ new/libdrm-2.4.53/tests/Makefile.in 2014-04-10 21:10:49.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.13.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.52/tests/exynos/Makefile.in new/libdrm-2.4.53/tests/exynos/Makefile.in --- old/libdrm-2.4.52/tests/exynos/Makefile.in 2014-01-20 20:04:47.000000000 +0100 +++ new/libdrm-2.4.53/tests/exynos/Makefile.in 2014-04-10 21:10:49.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.13.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.52/tests/kmstest/Makefile.in new/libdrm-2.4.53/tests/kmstest/Makefile.in --- old/libdrm-2.4.52/tests/kmstest/Makefile.in 2014-01-20 20:04:47.000000000 +0100 +++ new/libdrm-2.4.53/tests/kmstest/Makefile.in 2014-04-10 21:10:49.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.13.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.52/tests/modeprint/Makefile.in new/libdrm-2.4.53/tests/modeprint/Makefile.in --- old/libdrm-2.4.52/tests/modeprint/Makefile.in 2014-01-20 20:04:47.000000000 +0100 +++ new/libdrm-2.4.53/tests/modeprint/Makefile.in 2014-04-10 21:10:49.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.13.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.52/tests/modeprint/modeprint.c new/libdrm-2.4.53/tests/modeprint/modeprint.c --- old/libdrm-2.4.52/tests/modeprint/modeprint.c 2011-10-27 22:37:25.000000000 +0200 +++ new/libdrm-2.4.53/tests/modeprint/modeprint.c 2014-02-07 17:58:41.000000000 +0100 @@ -41,6 +41,8 @@ #include "xf86drm.h" #include "xf86drmMode.h" +#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0])) + int connectors; int full_props; int edid; @@ -140,13 +142,37 @@ return 0; } +static const char * const output_names[] = { "None", + "VGA", + "DVI-I", + "DVI-D", + "DVI-A", + "Composite", + "SVIDEO", + "LVDS", + "Component", + "DIN", + "DP", + "HDMI-A", + "HDMI-B", + "TV", + "eDP", + "Virtual", + "DSI", +}; + int printConnector(int fd, drmModeResPtr res, drmModeConnectorPtr connector, uint32_t id) { int i = 0; struct drm_mode_modeinfo *mode = NULL; drmModePropertyPtr props; - printf("Connector: %d-%d\n", connector->connector_type, connector->connector_type_id); + if (connector->connector_type < ARRAY_SIZE(output_names)) + printf("Connector: %s-%d\n", output_names[connector->connector_type], + connector->connector_type_id); + else + printf("Connector: %d-%d\n", connector->connector_type, + connector->connector_type_id); printf("\tid : %i\n", id); printf("\tencoder id : %i\n", connector->encoder_id); printf("\tconn : %s\n", getConnectionText(connector->connection)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.52/tests/modetest/Makefile.in new/libdrm-2.4.53/tests/modetest/Makefile.in --- old/libdrm-2.4.52/tests/modetest/Makefile.in 2014-01-20 20:04:47.000000000 +0100 +++ new/libdrm-2.4.53/tests/modetest/Makefile.in 2014-04-10 21:10:49.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.13.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.52/tests/radeon/Makefile.in new/libdrm-2.4.53/tests/radeon/Makefile.in --- old/libdrm-2.4.52/tests/radeon/Makefile.in 2014-01-20 20:04:47.000000000 +0100 +++ new/libdrm-2.4.53/tests/radeon/Makefile.in 2014-04-10 21:10:49.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.13.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.52/tests/vbltest/Makefile.in new/libdrm-2.4.53/tests/vbltest/Makefile.in --- old/libdrm-2.4.52/tests/vbltest/Makefile.in 2014-01-20 20:04:47.000000000 +0100 +++ new/libdrm-2.4.53/tests/vbltest/Makefile.in 2014-04-10 21:10:49.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.13.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.52/xf86drmMode.c new/libdrm-2.4.53/xf86drmMode.c --- old/libdrm-2.4.52/xf86drmMode.c 2014-01-20 19:58:05.000000000 +0100 +++ new/libdrm-2.4.53/xf86drmMode.c 2014-02-07 17:58:41.000000000 +0100 @@ -723,7 +723,7 @@ */ int drmCheckModesettingSupported(const char *busid) { -#ifdef __linux__ +#if defined (__linux__) char pci_dev_dir[1024]; int domain, bus, dev, func; DIR *sysdir; @@ -773,6 +773,39 @@ closedir(sysdir); if (found) return 0; +#elif defined (__FreeBSD__) || defined (__FreeBSD_kernel__) + char kbusid[1024], sbusid[1024]; + char oid[128]; + int domain, bus, dev, func; + int i, modesetting, ret; + size_t len; + + ret = sscanf(busid, "pci:%04x:%02x:%02x.%d", &domain, &bus, &dev, + &func); + if (ret != 4) + return -EINVAL; + snprintf(kbusid, sizeof(kbusid), "pci:%04x:%02x:%02x.%d", domain, bus, + dev, func); + + /* How many GPUs do we expect in the machine ? */ + for (i = 0; i < 16; i++) { + snprintf(oid, sizeof(oid), "hw.dri.%d.busid", i); + len = sizeof(sbusid); + ret = sysctlbyname(oid, sbusid, &len, NULL, 0); + if (ret == -1) { + if (errno == ENOENT) + continue; + return -EINVAL; + } + if (strcmp(sbusid, kbusid) != 0) + continue; + snprintf(oid, sizeof(oid), "hw.dri.%d.modesetting", i); + len = sizeof(modesetting); + ret = sysctlbyname(oid, &modesetting, &len, NULL, 0); + if (ret == -1 || len != sizeof(modesetting)) + return -EINVAL; + return (modesetting ? 0 : -ENOSYS); + } #endif return -ENOSYS; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-fcoe-client for openSUSE:Factory
by root＠hilbert.suse.de 15 Apr '14

15 Apr '14

Hello community, here is the log from the commit of package yast2-fcoe-client for openSUSE:Factory checked in at 2014-04-15 07:35:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-fcoe-client (Old) and /work/SRC/openSUSE:Factory/.yast2-fcoe-client.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-fcoe-client" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-fcoe-client/yast2-fcoe-client.changes 2014-04-05 14:42:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-fcoe-client.new/yast2-fcoe-client.changes 2014-04-15 07:35:30.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Apr 9 13:09:19 CEST 2014 - gs(a)suse.de + +- Don't show interfaces not available for network +- 3.1.5 + +------------------------------------------------------------------- Old: ---- yast2-fcoe-client-3.1.4.tar.bz2 New: ---- yast2-fcoe-client-3.1.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-fcoe-client.spec ++++++ --- /var/tmp/diff_new_pack.4t1Qr9/_old 2014-04-15 07:35:31.000000000 +0200 +++ /var/tmp/diff_new_pack.4t1Qr9/_new 2014-04-15 07:35:31.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-fcoe-client -Version: 3.1.4 +Version: 3.1.5 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-fcoe-client-3.1.4.tar.bz2 -> yast2-fcoe-client-3.1.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-fcoe-client-3.1.4/package/yast2-fcoe-client.changes new/yast2-fcoe-client-3.1.5/package/yast2-fcoe-client.changes --- old/yast2-fcoe-client-3.1.4/package/yast2-fcoe-client.changes 2014-03-28 13:55:54.000000000 +0100 +++ new/yast2-fcoe-client-3.1.5/package/yast2-fcoe-client.changes 2014-04-14 10:35:37.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Apr 9 13:09:19 CEST 2014 - gs(a)suse.de + +- Don't show interfaces not available for network +- 3.1.5 + +------------------------------------------------------------------- Fri Mar 28 13:14:21 CET 2014 - gs(a)suse.de - Adapt start of services (resp. sockets) to systemd diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-fcoe-client-3.1.4/package/yast2-fcoe-client.spec new/yast2-fcoe-client-3.1.5/package/yast2-fcoe-client.spec --- old/yast2-fcoe-client-3.1.4/package/yast2-fcoe-client.spec 2014-03-28 13:55:54.000000000 +0100 +++ new/yast2-fcoe-client-3.1.5/package/yast2-fcoe-client.spec 2014-04-14 10:35:37.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-fcoe-client -Version: 3.1.4 +Version: 3.1.5 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-fcoe-client-3.1.4/src/modules/FcoeClient.rb new/yast2-fcoe-client-3.1.5/src/modules/FcoeClient.rb --- old/yast2-fcoe-client-3.1.4/src/modules/FcoeClient.rb 2014-03-27 11:25:03.000000000 +0100 +++ new/yast2-fcoe-client-3.1.5/src/modules/FcoeClient.rb 2014-04-14 10:35:37.000000000 +0200 @@ -876,6 +876,7 @@ end # start sockets in installed system + # throw exception if sockets not found @fcoemon_socket = SystemdSocket.find!("fcoemon") @lldpad_socket = SystemdSocket.find!("lldpad") @@ -977,7 +978,7 @@ end Builtins.y2milestone("Detected netcards: %1", netcards) - netcards + netcards.delete_if {|card| card["dev_name"] == nil} end # list <map> network_interfaces -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kmod for openSUSE:Factory
by root＠hilbert.suse.de 15 Apr '14

15 Apr '14

Hello community, here is the log from the commit of package kmod for openSUSE:Factory checked in at 2014-04-15 07:35:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kmod (Old) and /work/SRC/openSUSE:Factory/.kmod.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kmod" Changes: -------- --- /work/SRC/openSUSE:Factory/kmod/kmod.changes 2014-03-01 14:38:44.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kmod.new/kmod.changes 2014-04-15 07:35:28.000000000 +0200 @@ -1,0 +2,48 @@ +Sat Apr 12 12:33:16 UTC 2014 - matwey.kornilov(a)gmail.com + +- Add 0001-Fix-recursion-loop-in-mod_count_all_dependencies-whe.patch +* Fix segfault at cycled deps (bnc#872715) + +------------------------------------------------------------------- +Tue Apr 8 08:36:22 UTC 2014 - mmarek(a)suse.cz + +- Remove the now obsolete test-files.tar.xz tarball + +------------------------------------------------------------------- +Mon Apr 7 19:07:17 UTC 2014 - mmarek(a)suse.com + +- Updated to kmod 17 +* Do not require xsltproc for build +* Parse softdeps stored in kernel modules +* Add experimental python bindings (not enabled in the package yet) +* Misc bugfixes +- Deleted patches that went upstream. Only the unsupported modules + feature remains: + 0002-modprobe-Recognize-allow-unsupported-modules-on-comm.patch + 0003-libkmod-config-Recognize-allow_unsupported_modules-i.patch + 0009-libkmod-Implement-filtering-of-unsupported-modules-o.patch + 0010-modprobe-Implement-allow-unsupported-modules.patch + +------------------------------------------------------------------- +Tue Mar 11 13:38:23 UTC 2014 - mmarek(a)suse.cz + +- Provide and obsolete module-init-tools (bnc#867442) + +------------------------------------------------------------------- +Fri Mar 7 09:25:02 UTC 2014 - mmarek(a)suse.cz + +- testsuite: Fix uname() during glibc startup + +------------------------------------------------------------------- +Wed Mar 5 14:50:34 UTC 2014 - mmarek(a)suse.cz + +- testsuite: Check the list of loaded modules after a test +- testsuite: Add test for modprobe --force +- testsuite: Do not provide finit_module(2) on older kernels +- Add some tests for kernels without finit_module(2) +- libkmod-module: Simplify kmod_module_insert_module() +- libkmod: Implement filtering of unsupported modules (fate#316971) +- modprobe: Implement --allow-unsupported-modules (fate#316971) +- make the %check section fatal + +------------------------------------------------------------------- Old: ---- 0001-Remove-rmmod-w-documentation-and-getopt-entry.patch kmod-16.tar.sign kmod-16.tar.xz New: ---- 0001-Fix-recursion-loop-in-mod_count_all_dependencies-whe.patch 0009-libkmod-Implement-filtering-of-unsupported-modules-o.patch 0010-modprobe-Implement-allow-unsupported-modules.patch kmod-17.tar.sign kmod-17.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kmod.spec ++++++ --- /var/tmp/diff_new_pack.A8Ytz4/_old 2014-04-15 07:35:29.000000000 +0200 +++ /var/tmp/diff_new_pack.A8Ytz4/_new 2014-04-15 07:35:29.000000000 +0200 @@ -21,7 +21,7 @@ Summary: Utilities to load modules into the kernel License: LGPL-2.1+ and GPL-2.0+ Group: System/Kernel -Version: 16 +Version: 17 Release: 0 Url: http://www.jonmasters.org/blog/2011/12/20/libkmod-replaces-module-init-tool… #Announce: https://lwn.net/Articles/577962/ @@ -30,18 +30,15 @@ #Git-Clone: git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/kmod/%name-%version.tar.xz Source2: ftp://ftp.kernel.org/pub/linux/utils/kernel/kmod/%name-%version.tar.sign -Patch1: 0001-Remove-rmmod-w-documentation-and-getopt-entry.patch +Patch1: 0001-Fix-recursion-loop-in-mod_count_all_dependencies-whe.patch Patch2: 0002-modprobe-Recognize-allow-unsupported-modules-on-comm.patch Patch3: 0003-libkmod-config-Recognize-allow_unsupported_modules-i.patch +Patch9: 0009-libkmod-Implement-filtering-of-unsupported-modules-o.patch +Patch10: 0010-modprobe-Implement-allow-unsupported-modules.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool -%if 0%{?suse_version} >= 1220 -BuildRequires: libxslt-tools -%else -BuildRequires: libxslt -%endif BuildRequires: pkgconfig >= 0.21 BuildRequires: xz %if 0%{?sles_version} @@ -67,8 +64,9 @@ License: GPL-2.0+ Group: System/Kernel Requires: kmod +Obsoletes: module-init-tools < 3.16 +Provides: module-init-tools = 3.16 Provides: modutils -Conflicts: module-init-tools %description compat kmod is a set of tools to handle common tasks with Linux kernel @@ -103,9 +101,10 @@ %{?gpg_verify: xz -dk "%{S:0}"; %gpg_verify %{S:2}} %setup -q %patch1 -p1 -touch man/rmmod.8 %patch2 -p1 %patch3 -p1 +%patch9 -p1 +%patch10 -p1 %build autoreconf -fi @@ -155,11 +154,11 @@ ln -s "%_bindir/kmod" "$b/bin/"; %if "%_libdir" != "/%_lib" ln -s "%_libdir/libkmod.so.2" "$b/%_lib/"; -ln -s "%_libdir/libkmod.so.2.2.6" "$b/%_lib/"; +ln -s "%_libdir/libkmod.so.2.2.7" "$b/%_lib/"; %endif %check -make check V=1 || :; +make check %post -n %lname -p /sbin/ldconfig ++++++ 0001-Fix-recursion-loop-in-mod_count_all_dependencies-whe.patch ++++++ >From 48d4d7ba1acbb5c0955f75c6bdda9cf0935240fd Mon Sep 17 00:00:00 2001 From: "Matwey V. Kornilov" <matwey.kornilov(a)gmail.com> Date: Fri, 11 Apr 2014 19:43:18 +0400 Subject: [PATCH] Fix recursion loop in mod_count_all_dependencies() when subgraph has a cycle. When cycle is detected in mod_count_all_dependencies, use total count of modules as an upper bound of needed memory. Correct number of nodes is determined by subsequent call of mod_fill_all_unique_dependencies(). --- tools/depmod.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/tools/depmod.c b/tools/depmod.c index 1aedaaf..c83dee1 100644 --- a/tools/depmod.c +++ b/tools/depmod.c @@ -1682,12 +1682,20 @@ static int depmod_load(struct depmod *depmod) return 0; } -static size_t mod_count_all_dependencies(const struct mod *mod) +static size_t mod_count_all_dependencies(const struct mod *mod, size_t upper_bound) { size_t i, count = 0; + /* cycle is detected */ + if (mod->dep_loop) + return upper_bound; + for (i = 0; i < mod->deps.count; i++) { const struct mod *d = mod->deps.array[i]; - count += 1 + mod_count_all_dependencies(d); + const size_t child = mod_count_all_dependencies(d, upper_bound); + if(child == upper_bound) + return child; + + count += 1 + child; } return count; } @@ -1722,12 +1730,12 @@ static int mod_fill_all_unique_dependencies(const struct mod *mod, const struct return err; } -static const struct mod **mod_get_all_sorted_dependencies(const struct mod *mod, size_t *n_deps) +static const struct mod **mod_get_all_sorted_dependencies(const struct mod *mod, size_t *n_deps, size_t count) { const struct mod **deps; size_t last = 0; - *n_deps = mod_count_all_dependencies(mod); + *n_deps = mod_count_all_dependencies(mod, count); if (*n_deps == 0) return NULL; @@ -1771,7 +1779,7 @@ static int output_deps(struct depmod *depmod, FILE *out) if (mod->deps.count == 0) goto end; - deps = mod_get_all_sorted_dependencies(mod, &n_deps); + deps = mod_get_all_sorted_dependencies(mod, &n_deps, depmod->modules.count); if (deps == NULL) { ERR("could not get all sorted dependencies of %s\n", p); goto end; @@ -1819,7 +1827,7 @@ static int output_deps_bin(struct depmod *depmod, FILE *out) continue; } - deps = mod_get_all_sorted_dependencies(mod, &n_deps); + deps = mod_get_all_sorted_dependencies(mod, &n_deps, depmod->modules.count); if (deps == NULL && n_deps > 0) { ERR("could not get all sorted dependencies of %s\n", p); continue; -- 1.8.1.4 ++++++ 0002-modprobe-Recognize-allow-unsupported-modules-on-comm.patch ++++++ --- /var/tmp/diff_new_pack.A8Ytz4/_old 2014-04-15 07:35:29.000000000 +0200 +++ /var/tmp/diff_new_pack.A8Ytz4/_new 2014-04-15 07:35:29.000000000 +0200 @@ -1,13 +1,14 @@ -From 472b40d53f6a9121ade7b969151b5b14268d1172 Mon Sep 17 00:00:00 2001 +From 820ce4a006eeb230ee597e7565b17cec464ef15d Mon Sep 17 00:00:00 2001 From: Michal Marek <mmarek(a)suse.cz> Date: Wed, 26 Feb 2014 13:48:55 +0100 -Subject: [PATCH 2/3] modprobe: Recognize --allow-unsupported-modules on +Subject: [PATCH 02/10] modprobe: Recognize --allow-unsupported-modules on commandline The option does not do anything yet, but it does not return error either. References: fate#316971 +Patch-mainline: never --- tools/modprobe.c | 5 +++++ 1 file changed, 5 insertions(+) ++++++ 0003-libkmod-config-Recognize-allow_unsupported_modules-i.patch ++++++ --- /var/tmp/diff_new_pack.A8Ytz4/_old 2014-04-15 07:35:29.000000000 +0200 +++ /var/tmp/diff_new_pack.A8Ytz4/_new 2014-04-15 07:35:29.000000000 +0200 @@ -1,10 +1,11 @@ -From da1cb1dd16edb2533ac431793e5bb3d01b243cae Mon Sep 17 00:00:00 2001 +From 717e10547654bceebbcb84144be72a40d78e577a Mon Sep 17 00:00:00 2001 From: Michal Marek <mmarek(a)suse.cz> Date: Wed, 26 Feb 2014 13:53:38 +0100 -Subject: [PATCH 3/3] libkmod-config: Recognize allow_unsupported_modules in +Subject: [PATCH 03/10] libkmod-config: Recognize allow_unsupported_modules in the configuration References: fate#316971 +Patch-mainline: never --- libkmod/libkmod-config.c | 3 +++ 1 file changed, 3 insertions(+) ++++++ 0009-libkmod-Implement-filtering-of-unsupported-modules-o.patch ++++++ >From 36bb8bc7f4100d7ffc4d6d0436e36e48fa7c075f Mon Sep 17 00:00:00 2001 From: Michal Marek <mmarek(a)suse.cz> Date: Wed, 5 Mar 2014 14:40:14 +0100 Subject: [PATCH 09/10] libkmod: Implement filtering of unsupported modules (off by default) References: fate#316971 Patch-mainline: never --- libkmod/libkmod-config.c | 12 ++++++++++-- libkmod/libkmod-internal.h | 1 + libkmod/libkmod-module.c | 31 +++++++++++++++++++++++++++++++ 3 files changed, 42 insertions(+), 2 deletions(-) diff --git a/libkmod/libkmod-config.c b/libkmod/libkmod-config.c index 3950923..385a224 100644 --- a/libkmod/libkmod-config.c +++ b/libkmod/libkmod-config.c @@ -663,8 +663,16 @@ static int kmod_config_parse(struct kmod_config *config, int fd, ERR(ctx, "%s: command %s is deprecated and not parsed anymore\n", filename, cmd); } else if (streq(cmd, "allow_unsupported_modules")) { - /* dummy option for now */ - ; + char *param = strtok_r(NULL, "\t ", &saveptr); + + if (param == NULL) + goto syntax_error; + if (streq(param, "yes") || streq(param, "1")) + config->block_unsupported = 0; + else if (streq(param, "no") || streq(param, "0")) + config->block_unsupported = 1; + else + goto syntax_error; } else { syntax_error: ERR(ctx, "%s line %u: ignoring bad line starting with '%s'\n", diff --git a/libkmod/libkmod-internal.h b/libkmod/libkmod-internal.h index 0180124..596db5d 100644 --- a/libkmod/libkmod-internal.h +++ b/libkmod/libkmod-internal.h @@ -118,6 +118,7 @@ struct kmod_config { struct kmod_list *softdeps; struct kmod_list *paths; + int block_unsupported; }; int kmod_config_new(struct kmod_ctx *ctx, struct kmod_config **config, const char * const *config_paths) __attribute__((nonnull(1, 2,3))); diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c index b94abd4..ee52b97 100644 --- a/libkmod/libkmod-module.c +++ b/libkmod/libkmod-module.c @@ -769,6 +769,24 @@ KMOD_EXPORT int kmod_module_remove_module(struct kmod_module *mod, extern long init_module(const void *mem, unsigned long len, const char *args); +static int check_module_supported(struct kmod_module *mod) +{ + char **strings; + int i, count; + struct kmod_elf *elf; + + elf = kmod_file_get_elf(mod->file); + count = kmod_elf_get_strings(elf, ".modinfo", &strings); + if (count < 0) + return count; + for (i = 0; i < count; i++) + if (streq(strings[i], "supported=yes") || + streq(strings[i], "supported=external")) { + return 1; + } + return 0; +} + /** * kmod_module_insert_module: * @mod: kmod module @@ -794,6 +812,7 @@ KMOD_EXPORT int kmod_module_insert_module(struct kmod_module *mod, struct kmod_elf *elf; const char *path; const char *args = options ? options : ""; + const struct kmod_config *config = kmod_get_config(mod->ctx); if (mod == NULL) return -ENOENT; @@ -810,6 +829,18 @@ KMOD_EXPORT int kmod_module_insert_module(struct kmod_module *mod, return err; } + if (config->block_unsupported) { + err = check_module_supported(mod); + if (err < 0) + return err; + else if (err == 0) { + ERR(mod->ctx, "module '%s' is unsupported\n", mod->name); + ERR(mod->ctx, "Use --allow-unsupported or set allow_unsupported_modules 1 in\n"); + ERR(mod->ctx, "/etc/modprobe.d/10-unsupported-modules.conf\n"); + return -EPERM; + } + } + if (kmod_file_get_direct(mod->file)) { unsigned int kernel_flags = 0; -- 1.8.4.5 ++++++ 0010-modprobe-Implement-allow-unsupported-modules.patch ++++++ >From 714b9b5241f5fc6120c74f35d6a374e032bad6df Mon Sep 17 00:00:00 2001 From: Michal Marek <mmarek(a)suse.cz> Date: Wed, 5 Mar 2014 15:02:44 +0100 Subject: [PATCH 10/10] modprobe: Implement --allow-unsupported-modules References: fate#316971 Patch-mainline: never --- Makefile.am | 4 +++- libkmod/libkmod-unsupported.c | 9 +++++++++ libkmod/libkmod-unsupported.h | 8 ++++++++ tools/modprobe.c | 7 ++++++- 4 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 libkmod/libkmod-unsupported.c create mode 100644 libkmod/libkmod-unsupported.h diff --git a/Makefile.am b/Makefile.am index 46b7652..9986730 100644 --- a/Makefile.am +++ b/Makefile.am @@ -78,7 +78,9 @@ libkmod_libkmod_la_LIBADD = libkmod/libkmod-util.la \ ${liblzma_LIBS} ${zlib_LIBS} noinst_LTLIBRARIES += libkmod/libkmod-internal.la -libkmod_libkmod_internal_la_SOURCES = $(libkmod_libkmod_la_SOURCES) +libkmod_libkmod_internal_la_SOURCES = $(libkmod_libkmod_la_SOURCES) \ + libkmod/libkmod-unsupported.c \ + libkmod/libkmod-unsupported.h libkmod_libkmod_internal_la_LDFLAGS = $(AM_LDFLAGS) \ -Wl,--version-script=$(top_srcdir)/libkmod/libkmod.sym libkmod_libkmod_internal_la_DEPENDENCIES = $(libkmod_libkmod_la_DEPENDENCIES) diff --git a/libkmod/libkmod-unsupported.c b/libkmod/libkmod-unsupported.c new file mode 100644 index 0000000..7ef9fc8 --- /dev/null +++ b/libkmod/libkmod-unsupported.c @@ -0,0 +1,9 @@ +#include "libkmod-internal.h" +#include "libkmod-unsupported.h" + +void kmod_internal_allow_unsupported(struct kmod_ctx *ctx) +{ + struct kmod_config *config = (struct kmod_config *)kmod_get_config(ctx); + + config->block_unsupported = 0; +} diff --git a/libkmod/libkmod-unsupported.h b/libkmod/libkmod-unsupported.h new file mode 100644 index 0000000..a95b4a2 --- /dev/null +++ b/libkmod/libkmod-unsupported.h @@ -0,0 +1,8 @@ +#pragma once + +/* + * This function implements the --allow-unsupported-modules modprobe + * option. It is not part of the kmod API and not exported by the shared + * library + */ +void kmod_internal_allow_unsupported(struct kmod_ctx *ctx); diff --git a/tools/modprobe.c b/tools/modprobe.c index 589cc07..7d0949d 100644 --- a/tools/modprobe.c +++ b/tools/modprobe.c @@ -33,6 +33,7 @@ #include "libkmod.h" #include "libkmod-array.h" +#include "libkmod-unsupported.h" #include "macro.h" #include "kmod.h" @@ -755,6 +756,7 @@ static int do_modprobe(int argc, char **orig_argv) int do_remove = 0; int do_show_config = 0; int do_show_modversions = 0; + int allow_unsupported = 0; int err; argv = prepend_options_from_env(&argc, orig_argv); @@ -838,7 +840,7 @@ static int do_modprobe(int argc, char **orig_argv) kversion = optarg; break; case 128: - /* --allow-unsupported-modules does nothing for now */ + allow_unsupported = 1; break; case 's': env_modprobe_options_append("-s"); @@ -910,6 +912,9 @@ static int do_modprobe(int argc, char **orig_argv) log_setup_kmod_log(ctx, verbose); + if (allow_unsupported) + kmod_internal_allow_unsupported(ctx); + kmod_load_resources(ctx); if (do_show_config) -- 1.8.4.5 ++++++ kmod-16.tar.xz -> kmod-17.tar.xz ++++++ ++++ 25045 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 libcamgm for openSUSE:Factory
by root＠hilbert.suse.de 15 Apr '14

15 Apr '14

Hello community, here is the log from the commit of package libcamgm for openSUSE:Factory checked in at 2014-04-15 07:35:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libcamgm (Old) and /work/SRC/openSUSE:Factory/.libcamgm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libcamgm" Changes: -------- --- /work/SRC/openSUSE:Factory/libcamgm/libcamgm.changes 2014-03-20 06:53:35.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libcamgm.new/libcamgm.changes 2014-04-15 07:35:25.000000000 +0200 @@ -1,0 +2,10 @@ +Sun Apr 13 13:13:01 UTC 2014 - mc(a)suse.com + +- version 1.0.3 +- support digest sha224, sha256, sha384 and sha512 +- make MD sha256 default +- add tests for new message digest algorithms +- update translation files +- remove libcamgm-1.0.2.patch - integrated upstream + +------------------------------------------------------------------- Old: ---- libcamgm-1.0.2.patch libcamgm-1.0.2.tar.bz2 New: ---- libcamgm-1.0.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libcamgm.spec ++++++ --- /var/tmp/diff_new_pack.2LBLCK/_old 2014-04-15 07:35:25.000000000 +0200 +++ /var/tmp/diff_new_pack.2LBLCK/_new 2014-04-15 07:35:25.000000000 +0200 @@ -19,15 +19,13 @@ %define ruby_archdir %(ruby -r rbconfig -e "print RbConfig::CONFIG['vendorarchdir']") Name: libcamgm -Version: 1.0.2 +Version: 1.0.3 Release: 0 Url: https://github.com/openSUSE/libcamgm BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: libcamgm-%{version}.tar.bz2 Source1: baselibs.conf -# Call C++ from Python with correct types, kwk(a)suse.de -Patch: %{name}-%{version}.patch Prefix: /usr BuildRequires: autoconf @@ -127,7 +125,6 @@ %prep %setup translation-update-upstream -%patch %build autoreconf --force --install --verbose ++++++ libcamgm-1.0.2.tar.bz2 -> libcamgm-1.0.3.tar.bz2 ++++++ ++++ 11315 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 yast2-ca-management for openSUSE:Factory
by root＠hilbert.suse.de 15 Apr '14

15 Apr '14

Hello community, here is the log from the commit of package yast2-ca-management for openSUSE:Factory checked in at 2014-04-15 07:35:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-ca-management (Old) and /work/SRC/openSUSE:Factory/.yast2-ca-management.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-ca-management" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-ca-management/yast2-ca-management.changes 2013-11-15 14:23:58.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-ca-management.new/yast2-ca-management.changes 2014-04-15 07:35:27.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Apr 14 08:01:14 CEST 2014 - mc(a)suse.de + +- version 3.1.2 +- add new signature algorithems SHA224RSA, SHA256RSA, + SHA384RSA and SHA512RSA + +------------------------------------------------------------------- Old: ---- yast2-ca-management-3.1.1.tar.bz2 New: ---- yast2-ca-management-3.1.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ca-management.spec ++++++ --- /var/tmp/diff_new_pack.4FJEFN/_old 2014-04-15 07:35:27.000000000 +0200 +++ /var/tmp/diff_new_pack.4FJEFN/_new 2014-04-15 07:35:27.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package yast2-ca-management # -# 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: yast2-ca-management -Version: 3.1.1 +Version: 3.1.2 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -36,7 +36,7 @@ BuildRequires: update-desktop-files BuildRequires: yast2 BuildRequires: yast2-core -BuildRequires: yast2-devtools >= 3.0.6 +BuildRequires: yast2-devtools >= 3.1.10 Requires: perl Requires: perl-Config-IniFiles Requires: perl-Date-Calc ++++++ yast2-ca-management-3.1.1.tar.bz2 -> yast2-ca-management-3.1.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ca-management-3.1.1/VERSION new/yast2-ca-management-3.1.2/VERSION --- old/yast2-ca-management-3.1.1/VERSION 2013-11-15 12:55:36.000000000 +0100 +++ new/yast2-ca-management-3.1.2/VERSION 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -3.1.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ca-management-3.1.1/package/yast2-ca-management.changes new/yast2-ca-management-3.1.2/package/yast2-ca-management.changes --- old/yast2-ca-management-3.1.1/package/yast2-ca-management.changes 2013-11-15 12:55:36.000000000 +0100 +++ new/yast2-ca-management-3.1.2/package/yast2-ca-management.changes 2014-04-14 09:29:37.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Apr 14 08:01:14 CEST 2014 - mc(a)suse.de + +- version 3.1.2 +- add new signature algorithems SHA224RSA, SHA256RSA, + SHA384RSA and SHA512RSA + +------------------------------------------------------------------- Wed Nov 13 15:56:18 UTC 2013 - jreidinger(a)suse.com - Add explicit COPYING file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ca-management-3.1.1/package/yast2-ca-management.spec new/yast2-ca-management-3.1.2/package/yast2-ca-management.spec --- old/yast2-ca-management-3.1.1/package/yast2-ca-management.spec 2013-11-15 12:55:36.000000000 +0100 +++ new/yast2-ca-management-3.1.2/package/yast2-ca-management.spec 2014-04-14 09:29:37.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-ca-management -Version: 3.1.1 +Version: 3.1.2 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -38,7 +38,7 @@ BuildRequires: update-desktop-files BuildRequires: yast2 BuildRequires: yast2-core -BuildRequires: yast2-devtools >= 3.0.6 +BuildRequires: yast2-devtools >= 3.1.10 Requires: perl Requires: perl-Config-IniFiles Requires: perl-Date-Calc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ca-management-3.1.1/src/modules/YaST/caUtils.pm new/yast2-ca-management-3.1.2/src/modules/YaST/caUtils.pm --- old/yast2-ca-management-3.1.1/src/modules/YaST/caUtils.pm 2013-11-15 12:55:36.000000000 +0100 +++ new/yast2-ca-management-3.1.2/src/modules/YaST/caUtils.pm 2014-04-14 09:29:37.000000000 +0200 @@ -1375,6 +1375,22 @@ $ret->{SIGNATURE_ALGORITHM} = "sha1WithDSAEncryption"; + } elsif($cert->getSignatureAlgorithm() == $CaMgm::E_SHA224RSA) { + + $ret->{SIGNATURE_ALGORITHM} = "sha224WithRSAEncryption"; + + } elsif($cert->getSignatureAlgorithm() == $CaMgm::E_SHA256RSA) { + + $ret->{SIGNATURE_ALGORITHM} = "sha265WithRSAEncryption"; + + } elsif($cert->getSignatureAlgorithm() == $CaMgm::E_SHA384RSA) { + + $ret->{SIGNATURE_ALGORITHM} = "sha384WithRSAEncryption"; + + } elsif($cert->getSignatureAlgorithm() == $CaMgm::E_SHA512RSA) { + + $ret->{SIGNATURE_ALGORITHM} = "sha512WithRSAEncryption"; + } $ret->{SERIAL} = $cert->getSerial(); @@ -1461,6 +1477,22 @@ $ret->{SIGNATURE_ALGORITHM} = "sha1WithDSAEncryption"; + } elsif($crl->getSignatureAlgorithm() == $CaMgm::E_SHA224RSA) { + + $ret->{SIGNATURE_ALGORITHM} = "sha224WithRSAEncryption"; + + } elsif($crl->getSignatureAlgorithm() == $CaMgm::E_SHA256RSA) { + + $ret->{SIGNATURE_ALGORITHM} = "sha265WithRSAEncryption"; + + } elsif($crl->getSignatureAlgorithm() == $CaMgm::E_SHA384RSA) { + + $ret->{SIGNATURE_ALGORITHM} = "sha384WithRSAEncryption"; + + } elsif($crl->getSignatureAlgorithm() == $CaMgm::E_SHA512RSA) { + + $ret->{SIGNATURE_ALGORITHM} = "sha512WithRSAEncryption"; + } $ret->{VERSION} = $crl->getVersion(); @@ -1585,6 +1617,22 @@ $ret->{SIGNATURE_ALGORITHM} = "sha1WithDSAEncryption"; + } elsif($req->getSignatureAlgorithm() == $CaMgm::E_SHA224RSA) { + + $ret->{SIGNATURE_ALGORITHM} = "sha224WithRSAEncryption"; + + } elsif($req->getSignatureAlgorithm() == $CaMgm::E_SHA256RSA) { + + $ret->{SIGNATURE_ALGORITHM} = "sha265WithRSAEncryption"; + + } elsif($req->getSignatureAlgorithm() == $CaMgm::E_SHA384RSA) { + + $ret->{SIGNATURE_ALGORITHM} = "sha384WithRSAEncryption"; + + } elsif($req->getSignatureAlgorithm() == $CaMgm::E_SHA512RSA) { + + $ret->{SIGNATURE_ALGORITHM} = "sha512WithRSAEncryption"; + } if($req->getExtensions()->getBasicConstraints()->isPresent()) { -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit corosync for openSUSE:Factory
by root＠hilbert.suse.de 15 Apr '14

15 Apr '14

Hello community, here is the log from the commit of package corosync for openSUSE:Factory checked in at 2014-04-15 07:35:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/corosync (Old) and /work/SRC/openSUSE:Factory/.corosync.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "corosync" Changes: -------- --- /work/SRC/openSUSE:Factory/corosync/corosync.changes 2014-03-18 16:21:35.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.corosync.new/corosync.changes 2014-04-15 07:35:24.000000000 +0200 @@ -0,0 +1,6 @@ +Fri Apr 11 06:50:17 UTC 2014 - lzhong(a)suse.com + +- Fix `systemctl stop pacemaker` leaves corosync running + + bnc#872651-stop-cluster.patch +- Ensure that libopenais3 is removed on update of corosync(bnc#872122) + New: ---- bnc#872651-stop-cluster.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ corosync.spec ++++++ --- /var/tmp/diff_new_pack.J7TX4w/_old 2014-04-15 07:35:25.000000000 +0200 +++ /var/tmp/diff_new_pack.J7TX4w/_new 2014-04-15 07:35:25.000000000 +0200 @@ -53,8 +53,9 @@ Patch2: corosync-cts-api-error.patch Patch3: corosync-conf-example.patch Patch4: bnc#867767-add-version.patch +Patch5: bnc#872651-stop-cluster.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -# openais is indeed gone and should be uninstalled. No, we do not +# openais is indeed gone and should be uninstalled. Yes, we do not # provide openais on purpose, the package has been deleted. Obsoletes: openais Conflicts: openais @@ -63,7 +64,6 @@ #Requires(pre): /usr/sbin/useradd #Requires(post): /sbin/chkconfig #Requires(preun): /sbin/chkconfig -#Conflicts: openais <= 0.89, openais-devel <= 0.89 BuildRequires: libqb-devel BuildRequires: mozilla-nss @@ -102,6 +102,7 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build #%if 0%{?buildtrunk} == 1 @@ -154,15 +155,6 @@ mkdir -p -m 0700 %{buildroot}/%{_sysconfdir}/dbus-1/system.d install -m 644 %{_builddir}/%{name}-%{version}/conf/corosync-signals.conf %{buildroot}/%{_sysconfdir}/dbus-1/system.d/corosync-signals.conf %endif -# removed to discourage use of init.d/corosync (openais should be -# used instead) -#%if 0%{?suse_version} -#ln -sf ../../etc/init.d/corosync %{buildroot}%{_sbindir}/rccorosync -#%endif -#rm -f %{buildroot}%{_initrddir}/corosync -#rm -f %{buildroot}%{_initrddir}/corosync-notifyd -#rm -f %{buildroot}/usr/sbin/corosync-notifyd -#rm -f %{buildroot}/usr/share/man/man8/corosync-notifyd.8 %if %{with_systemd} ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rccorosync %endif @@ -311,6 +303,9 @@ %package -n libcorosync4 Summary: The Corosync Cluster Engine Libraries Group: Productivity/Clustering/HA +# openais is indeed gone and should be uninstalled. Yes, we do not +# provide openais on purpose, the package has been deleted. +Obsoletes: libopenais3 #Requires: %{name} = %{version}-%{release} %description -n libcorosync4 ++++++ bnc#872651-stop-cluster.patch ++++++ Index: corosync-2.3.3/init/corosync.service.in =================================================================== --- corosync-2.3.3.orig/init/corosync.service.in +++ corosync-2.3.3/init/corosync.service.in @@ -3,6 +3,7 @@ Description=Corosync Cluster Engine ConditionKernelCommandLine=!nocluster Requires=network-online.target After=network-online.target +StopWhenUnneeded=yes [Service] ExecStart=@INITWRAPPERSDIR@/corosync start -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit shared-mime-info for openSUSE:Factory
by root＠hilbert.suse.de 15 Apr '14

15 Apr '14

Hello community, here is the log from the commit of package shared-mime-info for openSUSE:Factory checked in at 2014-04-15 07:35:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/shared-mime-info (Old) and /work/SRC/openSUSE:Factory/.shared-mime-info.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "shared-mime-info" Changes: -------- --- /work/SRC/openSUSE:Factory/shared-mime-info/shared-mime-info.changes 2014-02-13 06:51:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.shared-mime-info.new/shared-mime-info.changes 2014-04-15 07:35:22.000000000 +0200 @@ -1,0 +2,25 @@ +Tue Apr 8 23:10:43 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Update to version 1.3: + + Mime-type changes: + - Add Aliases for OpenOffice Base and StarWriter. + - Add Apple Keynote 5 mime-type. + - Add mimetype for compressed FictionBook2. + - Don't recognize all .asc files as application/pgp-encrypted. + - Add tree magic for the Kindle e-book reader. + - Add LZ4 archive type. + - Add PC Engine, GameCube and Wii "ROM" types. + - Add audio/x-opus+ogg mime-type. + - Add image/webp mime-type. + - Prefer application/vnd.ms-asf to video/x-ms-asf. + - Add application/x-riff mime-type. + - Add JSON mime-type. + - Add *.jsm glob for Javascript. + - Add magic and glob patterns for compressed x-spss-sav files. + - JavaScript and CSS are not subclasses of text/x-csrc. + - Remove *.CSSL glob for CSS files. + + Call g_type_init() only with older glib. + + Fix failures on NetBSD. + + Store MEDIA/SUBTYPE.xml files in lowercase. + +------------------------------------------------------------------- Old: ---- shared-mime-info-1.2.tar.xz New: ---- shared-mime-info-1.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ shared-mime-info.spec ++++++ --- /var/tmp/diff_new_pack.7Sm8aC/_old 2014-04-15 07:35:23.000000000 +0200 +++ /var/tmp/diff_new_pack.7Sm8aC/_new 2014-04-15 07:35:23.000000000 +0200 @@ -17,7 +17,7 @@ Name: shared-mime-info -Version: 1.2 +Version: 1.3 Release: 0 # FIXME: Remove workaround for fdo#70366 once fixed Url: http://freedesktop.org/wiki/Software/shared-mime-info ++++++ shared-mime-info-1.2.tar.xz -> shared-mime-info-1.3.tar.xz ++++++ ++++ 5466 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/shared-mime-info-1.2/ChangeLog new/shared-mime-info-1.3/ChangeLog --- old/shared-mime-info-1.2/ChangeLog 2013-09-30 12:17:17.000000000 +0200 +++ new/shared-mime-info-1.3/ChangeLog 2014-04-08 14:51:00.000000000 +0200 @@ -1,3 +1,328 @@ +commit 9e46e73c60d129a2367eb715ae55d9f503c26074 +Author: Bastien Nocera <hadess(a)hadess.net> +Date: Tue Apr 8 14:50:50 2014 +0200 + + 1.3 + + NEWS | 23 +++++++++++++++++++++++ + configure.ac | 2 +- + 2 files changed, 24 insertions(+), 1 deletion(-) + +commit bbc47d00112526c2c409e72e9f4d38cc3a311bf8 +Author: Bastien Nocera <hadess(a)hadess.net> +Date: Wed Apr 2 11:41:42 2014 +0200 + + Add missing *.jsm test case file + + Was missing from the earlier commit. + + tests/Utils.jsm | 498 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 498 insertions(+) + +commit 8ecd4d643abc915d70db6fab46b17d32dfe64360 +Author: Bastien Nocera <hadess(a)hadess.net> +Date: Wed Apr 2 11:38:01 2014 +0200 + + Remove *.CSSL glob for CSS files + + It was probably meant to be *.CSS1 (one, not "L") which got badly + transposed when the KDE and GNOME databases were merged more than + 10 years ago. + + As nobody seems to have missed *.CSS1 and *.CSSL is wrong, remove it. + + https://bugs.freedesktop.org/show_bug.cgi?id=76940 + + freedesktop.org.xml.in | 1 - + 1 file changed, 1 deletion(-) + +commit 1c302e1cf2db02c4262bcb6501b337a2c9ea09fd +Author: Gordon P. Hemsley <me(a)gphemsley.org> +Date: Wed Jan 15 00:56:55 2014 -0500 + + JavaScript and CSS are not subclasses of text/x-csrc + + and add test files for CSS. + + https://bugs.freedesktop.org/show_bug.cgi?id=73648 + + freedesktop.org.xml.in | 4 +- + tests/html4.css | 78 ++++++++ + tests/html5.css | 507 +++++++++++++++++++++++++++++++++++++++++++++++++ + tests/list | 4 + + 4 files changed, 591 insertions(+), 2 deletions(-) + +commit 7f0731f461cbdd980c6b9312d60a515f29ae23d2 +Author: Ben Pfaff <blp(a)cs.stanford.edu> +Date: Fri Nov 15 07:13:00 2013 +0000 + + Add magic and glob patterns for compressed x-spss-sav files + + https://bugs.freedesktop.org/show_bug.cgi?id=71632 + + freedesktop.org.xml.in | 2 ++ + 1 file changed, 2 insertions(+) + +commit a6d00cedc6eafe9af825f3f4267f27abfff65baa +Author: Bastien Nocera <hadess(a)hadess.net> +Date: Tue Apr 1 10:11:32 2014 +0200 + + Add *.jsm glob for Javascript + + As used in Gecko/Firefox related projects. + + https://bugs.freedesktop.org/show_bug.cgi?id=75031 + + freedesktop.org.xml.in | 1 + + tests/list | 2 ++ + 2 files changed, 3 insertions(+) + +commit 3805d0bcf22b6344fb4a4a36ad4e15e30d17b624 +Author: Bastien Nocera <hadess(a)hadess.net> +Date: Mon Mar 31 16:22:33 2014 +0200 + + Store MEDIA/SUBTYPE.xml files in lowercase + + RFC 2045 says that MIME type names (e.g. text/plain) are + case-insensitive. Most are written by convention in lowercase, although + there are a few exceptions currently in the freedesktop.org.xml + database. + + Store the separate mime files as lower-case to make them easily findable + (eg. the synonymous application/vnd.*macroEnabled* and *macroenabled* + mime-type should have the same filename). + + https://bugs.freedesktop.org/show_bug.cgi?id=62473 + + update-mime-database.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +commit acb7222ada2ad165a84d0bd33f2af1a93b43d3a8 +Author: Gordon P. Hemsley <me(a)gphemsley.org> +Date: Tue Jan 14 23:18:50 2014 -0500 + + Add JSON mime-type + + As application/json. + + https://bugs.freedesktop.org/show_bug.cgi?id=73646 + + freedesktop.org.xml.in | 8 ++++++++ + tests/json_array.json | 22 ++++++++++++++++++++++ + tests/json_object.json | 13 +++++++++++++ + tests/list | 3 +++ + 4 files changed, 46 insertions(+) + +commit ffbe705bb4035c8511df341005125933cb91b9ee +Author: Bastien Nocera <hadess(a)hadess.net> +Date: Mon Mar 31 15:54:19 2014 +0200 + + Add application/x-riff mime-type + + And make it steal audio/x-riff magic. RIFF is a container format, + not an audio format, so any type of data could be contained in RIFF. + + See also http://en.wikipedia.org/wiki/Resource_Interchange_File_Format + + freedesktop.org.xml.in | 3 +++ + 1 file changed, 3 insertions(+) + +commit 2143958c0ddcbaf0e4c68c2c49106399cdd60625 +Author: Bastien Nocera <hadess(a)hadess.net> +Date: Mon Mar 31 15:38:10 2014 +0200 + + Remove image/x-webp alias + + It was only defined for a couple of weeks, and only within + shared-mime-info, no need to keep it. + + freedesktop.org.xml.in | 1 - + 1 file changed, 1 deletion(-) + +commit 721c7e33cfdfe35d85de44bc68e1f1c8629fec4f +Author: Bastien Nocera <hadess(a)hadess.net> +Date: Mon Mar 31 15:36:40 2014 +0200 + + Switch WebP mime-type and alias around + + The request for a WebP mime-type was made with the IANA, but still + not processed to this day. It's unlikely that the mime-type ever + be rejected, so add image/webp as the main mime-type. + + freedesktop.org.xml.in | 4 ++-- + tests/list | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit e89ec55272a45500ce99361d1aeda83de1ba4c79 +Author: Alex Henrie <alexhenrie24(a)gmail.com> +Date: Tue Jan 14 01:48:20 2014 -0700 + + Prefer application/vnd.ms-asf to video/x-ms-asf + + https://bugs.freedesktop.org/show_bug.cgi?id=73597 + + freedesktop.org.xml.in | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit 7612a110f9a42db4730a8c6d1fff6d78c899d53d +Author: Igor Murzov <e-mail(a)date.by> +Date: Sun Mar 31 02:54:27 2013 +0400 + + Add image/x-webp mime-type + + Magic information from: + https://developers.google.com/speed/webp/docs/riff_container#webp-file-head… + + https://bugs.freedesktop.org/show_bug.cgi?id=41155 + + freedesktop.org.xml.in | 10 ++++++++++ + tests/list | 1 + + tests/test.webp | Bin 0 -> 244 bytes + 3 files changed, 11 insertions(+) + +commit b067788e51cd5498944e85f707300fee9f2d1b32 +Author: Igor Murzov <e-mail(a)date.by> +Date: Sun Mar 31 11:30:11 2013 +0400 + + Add audio/x-opus+ogg mime-type + + https://bugs.freedesktop.org/show_bug.cgi?id=63106 + + freedesktop.org.xml.in | 11 +++++++++++ + tests/list | 1 + + tests/test.opus | Bin 0 -> 7174 bytes + 3 files changed, 12 insertions(+) + +commit 4b0bc62b3e50f25d0ef42950e0b715274637c548 +Author: Bastien Nocera <hadess(a)hadess.net> +Date: Sun Jan 19 15:48:58 2014 +0100 + + Add PC Engine, GameCube and Wii "ROM" types + + The different types of Wii disc images are merged into one, as + there's likely no difference between support one and all for the + majority of applications. + + Magic for Wii and GameCube images from: + http://wit.wiimm.de/download/magic.txt + + freedesktop.org.xml.in | 27 +++++++++++++++++++++++++++ + 1 file changed, 27 insertions(+) + +commit 0412d9ceda5ff94a7eb2159b6d5eaa31a1c81426 +Author: Bastien Nocera <hadess(a)hadess.net> +Date: Sun Jan 19 15:47:54 2014 +0100 + + tests: Make iso-file.iso a real ISO file + + Instead of an empty one. That's the first 1k of a Fedora 20 + nightly image. + + tests/iso-file.iso | Bin 0 -> 1024 bytes + 1 file changed, 0 insertions(+), 0 deletions(-) + +commit 62345c56c9e2e582dbe00cc1b19e86930fe00863 +Author: Ville Skyttä <ville.skytta(a)iki.fi> +Date: Sun Jan 5 15:18:34 2014 +0200 + + Add LZ4 archive type + + http://fastcompression.blogspot.com/2013/04/lz4-streaming-format-final.html + + freedesktop.org.xml.in | 9 +++++++++ + tests/list | 2 ++ + tests/test.lz4 | Bin 0 -> 25 bytes + 3 files changed, 11 insertions(+) + +commit e4d7715f3c3b77b4eec4e89299f0235202ecd0d4 +Author: Bastien Nocera <hadess(a)hadess.net> +Date: Sun Dec 22 17:19:40 2013 +0100 + + Add magic for the Kindle e-book reader + + freedesktop.org.xml.in | 1 + + 1 file changed, 1 insertion(+) + +commit 4f33cfd52a4a794f9dfeb2e53b788780d5d3f1c5 +Author: Jérémy Bobbio <lunar(a)debian.org> +Date: Wed Oct 16 11:12:28 2013 +0200 + + Do not recognize all .asc files as application/pgp-encrypted + + The change introduced in 2c3438c had the unfortunate effect of having all .asc + be identified as application/pgp-encrypted. As this should only happen when + we can identify armor headers, we now give a lower weight than text/plain to + the *.asc glob for OpenPGP MIME types. + + https://bugs.freedesktop.org/show_bug.cgi?id=70539 + + freedesktop.org.xml.in | 6 +++--- + tests/list | 3 ++- + 2 files changed, 5 insertions(+), 4 deletions(-) + +commit fe0ce0f210bdd39bcba1d6301e535ab29fc94b91 +Author: David Tardon <dtardon(a)redhat.com> +Date: Wed Dec 11 14:07:39 2013 +0100 + + add mimetype for compressed FictionBook2 + + https://bugs.freedesktop.org/show_bug.cgi?id=45795 + + freedesktop.org.xml.in | 11 +++++++++++ + tests/Stallman_Richard_-_The_GNU_Manifesto.fb2.zip | Bin 0 -> 38810 bytes + tests/list | 1 + + 3 files changed, 12 insertions(+) + +commit e8d528ac1c500c3a47fdad308952c377c7439f6a +Author: David Tardon <dtardon(a)redhat.com> +Date: Wed Nov 20 11:23:40 2013 +0100 + + add Apple Keynote 5 mime-type + + https://bugs.freedesktop.org/show_bug.cgi?id=71827 + + freedesktop.org.xml.in | 13 +++++++++++++ + tests/list | 1 + + tests/test.key | Bin 0 -> 2210138 bytes + 3 files changed, 14 insertions(+) + +commit 41f1d5ff2672c30d7f86759e2398b75c88673516 +Author: Thomas Klausner <tk(a)giga.or.at> +Date: Thu Oct 17 04:35:00 2013 +0000 + + Open the fdatasync() fd read/write + + Otherwise it will fail for stricter OSes like NetBSD. + + https://bugs.freedesktop.org/show_bug.cgi?id=70559 + + update-mime-database.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2397314542265405498ea8c82121c174ed9011a5 +Author: Bastien Nocera <hadess(a)hadess.net> +Date: Wed Oct 9 22:09:56 2013 +0200 + + test: Call g_type_init() with older glib + + Only call g_type_init() when compiling against an older glib. + + https://bugs.freedesktop.org/show_bug.cgi?id=70255 + + test-tree-magic.c | 3 +++ + 1 file changed, 3 insertions(+) + +commit 01e9a5a924a9f382f5e75acd5980a2e058c6ce08 +Author: Samuel Mehrbrodt <s.mehrbrodt(a)gmail.com> +Date: Sun Oct 6 22:43:08 2013 +0200 + + Add Aliases for OpenOffice Base and StarWriter + + https://bugs.freedesktop.org/show_bug.cgi?id=70016 + + freedesktop.org.xml.in | 2 ++ + 1 file changed, 2 insertions(+) + commit 8176c639e18ab5a66a691a3f78a4b9e1077b2c9d Author: Bastien Nocera <hadess(a)hadess.net> Date: Mon Sep 30 12:17:09 2013 +0200 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/shared-mime-info-1.2/NEWS new/shared-mime-info-1.3/NEWS --- old/shared-mime-info-1.2/NEWS 2013-09-30 12:17:02.000000000 +0200 +++ new/shared-mime-info-1.3/NEWS 2014-04-08 14:50:39.000000000 +0200 @@ -1,3 +1,26 @@ +shared-mime-info 1.3 (2014-04-08) +* Mime-type changes: +- Add Aliases for OpenOffice Base and StarWriter +- Add Apple Keynote 5 mime-type +- Add mimetype for compressed FictionBook2 +- Don't recognize all .asc files as application/pgp-encrypted +- Add tree magic for the Kindle e-book reader +- Add LZ4 archive type +- Add PC Engine, GameCube and Wii "ROM" types +- Add audio/x-opus+ogg mime-type +- Add image/webp mime-type +- Prefer application/vnd.ms-asf to video/x-ms-asf +- Add application/x-riff mime-type +- Add JSON mime-type +- Add *.jsm glob for Javascript +- Add magic and glob patterns for compressed x-spss-sav files +- JavaScript and CSS are not subclasses of text/x-csrc +- Remove *.CSSL glob for CSS files + +* Call g_type_init() only with older glib +* Fix failures on NetBSD +* Store MEDIA/SUBTYPE.xml files in lowercase + shared-mime-info 1.2 (2013-09-30) * Mime-type changes: - Use IANA registered application/sql type for SQL diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/shared-mime-info-1.2/configure.ac new/shared-mime-info-1.3/configure.ac --- old/shared-mime-info-1.2/configure.ac 2013-09-30 12:09:12.000000000 +0200 +++ new/shared-mime-info-1.3/configure.ac 2014-04-08 14:50:47.000000000 +0200 @@ -1,4 +1,4 @@ -AC_INIT([shared-mime-info],[1.2],[https://bugs.freedesktop.org/enter_bug.cgi?product=shared-mime-info]) +AC_INIT([shared-mime-info],[1.3],[https://bugs.freedesktop.org/enter_bug.cgi?product=shared-mime-info]) AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-xz check-news]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/shared-mime-info-1.2/freedesktop.org.xml new/shared-mime-info-1.3/freedesktop.org.xml --- old/shared-mime-info-1.2/freedesktop.org.xml 2013-09-30 12:01:36.000000000 +0200 +++ new/shared-mime-info-1.3/freedesktop.org.xml 2014-04-08 14:51:03.000000000 +0200 @@ -967,7 +967,7 @@ </magic> <glob pattern="*.pgp"/> <glob pattern="*.gpg"/> - <glob pattern="*.asc"/> + <glob weight="10" pattern="*.asc"/> <alias type="application/pgp"/> </mime-type> <mime-type type="application/pgp-keys"> @@ -1033,7 +1033,7 @@ </magic> <glob pattern="*.skr"/> <glob pattern="*.pkr"/> - <glob pattern="*.asc"/> + <glob weight="10" pattern="*.asc"/> <glob pattern="*.pgp"/> <glob pattern="*.gpg"/> </mime-type> @@ -1089,7 +1089,7 @@ <magic priority="50"> <match value="-----BEGIN PGP SIGNATURE-----" type="string" offset="0"/> </magic> - <glob pattern="*.asc"/> + <glob weight="10" pattern="*.asc"/> <glob pattern="*.sig"/> <glob pattern="*.pgp"/> <glob pattern="*.gpg"/> @@ -3681,6 +3681,7 @@ <magic priority="90"> <match value="StarWriter" type="string" offset="2089"/> </magic> + <alias type="application/vnd.stardivision.writer-global"/> </mime-type> <mime-type type="application/vnd.sun.xml.calc"> <comment>OpenOffice Calc spreadsheet</comment> @@ -5260,6 +5261,7 @@ <sub-class-of type="application/zip"/> <generic-icon name="x-office-document"/> <glob pattern="*.odb"/> + <alias type="application/vnd.sun.xml.base"/> </mime-type> <mime-type type="application/vnd.oasis.opendocument.image"> <comment>ODI image</comment> @@ -5693,8 +5695,10 @@ <alias type="application/x-spss-savefile"/> <magic priority="50"> <match value="$FL2" type="string" offset="0"/> + <match value="$FL3" type="string" offset="0"/> </magic> <glob pattern="*.sav"/> + <glob pattern="*.zsav"/> </mime-type> <mime-type type="application/x-xbel"> <comment>XBEL bookmarks</comment> @@ -7939,6 +7943,33 @@ <generic-icon name="application-x-executable"/> <glob pattern="*.nds"/> </mime-type> + <mime-type type="application/x-pc-engine-rom"> + <comment>PC Engine ROM</comment> + <generic-icon name="application-x-executable"/> + <glob pattern="*.pce"/> + </mime-type> + <mime-type type="application/x-wii-rom"> + <comment>Wii disc image</comment> + <alias type="application/x-wii-iso-image"/> + <alias type="application/x-wbfs"/> + <alias type="application/x-wia"/> + <generic-icon name="application-x-executable"/> + <glob pattern="*.iso"/> + <magic priority="50"> + <match value="0x5d1c9ea3" type="big32" offset="24"/> + <match value="WBFS" type="string" offset="0"/> + <match value="WII\001DISC" type="string" offset="0"/> + </magic> + </mime-type> + <mime-type type="application/x-gamecube-rom"> + <comment>GameCube disc image</comment> + <generic-icon name="application-x-executable"/> + <alias type="application/x-gamecube-iso-image"/> + <glob pattern="*.iso"/> + <magic priority="50"> + <match value="0xc2339f3d" type="big32" offset="28"/> + </magic> + </mime-type> <mime-type type="application/x-deb"> <comment>Debian package</comment> <comment xml:lang="ar">حزمة ديبيان</comment> @@ -8196,6 +8227,17 @@ <alias type="application/x-fictionbook"/> <root-XML namespaceURI="http://www.gribuser.ru/xml/fictionbook/2.0" localName="FictionBook"/> </mime-type> + <mime-type type="application/x-zip-compressed-fb2"> + <comment>Compressed FictionBook document</comment> + <sub-class-of type="application/zip"/> + <glob pattern="*.fb2.zip"/> + <magic priority="80"> + <match value="PK\003\004" type="string" offset="0"> + + <match value=".fb2" type="string" offset="30:256"/> + </match> + </magic> + </mime-type> <mime-type type="application/x-dia-diagram"> <comment>Dia diagram</comment> <comment xml:lang="ar">خطاطة Dia</comment> @@ -10874,9 +10916,18 @@ <comment xml:lang="zh_TW">JavaScript 程式</comment> <alias type="application/x-javascript"/> <alias type="text/javascript"/> - <sub-class-of type="text/x-csrc"/> + <sub-class-of type="application/ecmascript"/> <generic-icon name="text-x-script"/> <glob pattern="*.js"/> + <glob pattern="*.jsm"/> + </mime-type> + <mime-type type="application/json"> + <comment>JSON document</comment> + <acronym>JSON</acronym> + <expanded-acronym>JavaScript Object Notation</expanded-acronym> + <sub-class-of type="application/javascript"/> + <generic-icon name="text-x-script"/> + <glob pattern="*.json"/> </mime-type> <mime-type type="application/x-jbuilder-project"> <comment>JBuilder project</comment> @@ -12192,6 +12243,15 @@ <glob pattern="*.lyx"/> <alias type="text/x-lyx"/> </mime-type> + <mime-type type="application/x-lz4"> + <comment>LZ4 archive</comment> + <generic-icon name="package-x-generic"/> + <magic priority="50"> + <match value="0x184d2204" type="little32" offset="0"/> + <match value="0x184c2102" type="little32" offset="0"/> + </magic> + <glob pattern="*.lz4"/> + </mime-type> <mime-type type="application/x-lzip"> <comment>Lzip archive</comment> <comment xml:lang="ar">أرشيف Lzip</comment> @@ -13849,6 +13909,7 @@ </magic> <glob pattern="*.oga"/> <glob pattern="*.ogg"/> + <glob pattern="*.opus"/> <alias type="audio/x-ogg"/> </mime-type> <mime-type type="video/ogg"> @@ -14018,6 +14079,16 @@ <glob pattern="*.oga"/> <glob pattern="*.ogg"/> </mime-type> + <mime-type type="audio/x-opus+ogg"> + <comment>Opus audio</comment> + <sub-class-of type="audio/ogg"/> + <magic priority="80"> + <match value="OggS" type="string" offset="0"> + <match value="OpusHead" type="string" offset="28"/> + </match> + </magic> + <glob pattern="*.opus"/> + </mime-type> <mime-type type="audio/x-speex+ogg"> <comment>Ogg Speex audio</comment> <comment xml:lang="ar">Ogg Speex سمعي</comment> @@ -19822,7 +19893,7 @@ <comment xml:lang="vi">Âm thanh Windows Media</comment> <comment xml:lang="zh_CN">Windows Media 音频</comment> <comment xml:lang="zh_TW">Windows Media 音訊</comment> - <sub-class-of type="video/x-ms-asf"/> + <sub-class-of type="application/vnd.ms-asf"/> <glob pattern="*.wma"/> <alias type="audio/wma"/> </mime-type> @@ -20213,6 +20284,9 @@ <comment xml:lang="vi">Âm thanh RIFF</comment> <comment xml:lang="zh_CN">RIFF 音频</comment> <comment xml:lang="zh_TW">RIFF 音訊</comment> + </mime-type> + <mime-type type="application/x-riff"> + <comment>RIFF container</comment> <magic priority="45"> <match value="RIFF" type="string" offset="0"/> @@ -22743,6 +22817,15 @@ <match value="\x45\x50\x2A\x00" type="string" offset="0"/> </magic> </mime-type> + <mime-type type="image/webp"> + <comment>WebP image</comment> + <magic priority="50"> + <match value="RIFF" type="string" offset="0"> + <match value="WEBP" type="string" offset="8"/> + </match> + </magic> + <glob pattern="*.webp"/> + </mime-type> <mime-type type="image/x-3ds"> <comment>3D Studio image</comment> <comment xml:lang="ar">صورة استديو ثلاثية الأبعاد</comment> @@ -26386,9 +26469,8 @@ <comment xml:lang="zh_TW">CSS 樣式表</comment> <acronym>CSS</acronym> <expanded-acronym>Cascading Style Sheets</expanded-acronym> - <sub-class-of type="text/x-csrc"/> + <sub-class-of type="text/plain"/> <glob pattern="*.css"/> - <glob pattern="*.CSSL"/> </mime-type> <mime-type type="text/vcard"> <comment>electronic business card</comment> @@ -31967,7 +32049,7 @@ </magic> <glob pattern="*.mng"/> </mime-type> - <mime-type type="video/x-ms-asf"> + <mime-type type="application/vnd.ms-asf"> <comment>ASF video</comment> <comment xml:lang="ar">ASF مرئي</comment> <comment xml:lang="be@latin">Videa ASF</comment> @@ -32015,7 +32097,7 @@ <acronym>ASF</acronym> <expanded-acronym>Advanced Streaming Format</expanded-acronym> <alias type="video/x-ms-wm"/> - <alias type="application/vnd.ms-asf"/> + <alias type="video/x-ms-asf"/> <glob pattern="*.asf"/> <magic priority="50"> <match value="0x3026b275" type="big32" offset="0"/> @@ -32065,7 +32147,7 @@ <comment xml:lang="vi">Tập tin Windows Media Station</comment> <comment xml:lang="zh_CN">Windows 媒体工作站文件</comment> <comment xml:lang="zh_TW">Windows Media Station 檔</comment> - <sub-class-of type="video/x-ms-asf"/> + <sub-class-of type="application/vnd.ms-asf"/> <generic-icon name="video-x-generic"/> <glob pattern="*.nsc"/> <magic priority="50"> @@ -32115,7 +32197,7 @@ <comment xml:lang="vi">Ảnh động Windows Media</comment> <comment xml:lang="zh_CN">Windows Media 视频</comment> <comment xml:lang="zh_TW">Windows Media 視訊</comment> - <sub-class-of type="video/x-ms-asf"/> + <sub-class-of type="application/vnd.ms-asf"/> <glob pattern="*.wmv"/> </mime-type> <mime-type type="video/x-msvideo"> @@ -33751,6 +33833,7 @@ <comment xml:lang="zh_TW">e-book 閱讀器</comment> <treemagic> <treematch type="directory" path=".kobo" non-empty="true"/> + <treematch path="system/com.amazon.ebook.booklet.reader" non-empty="false"/> </treemagic> </mime-type> @@ -33996,4 +34079,17 @@ <glob pattern="*.trig"/> </mime-type> + <mime-type type="application/x-iwork-keynote-sffkey"> + <comment>Apple Keynote 5 presentation</comment> + <sub-class-of type="application/zip"/> + <generic-icon name="x-office-presentation"/> + <magic priority="50"> + <match value="PK\003\004" type="string" offset="0"> + <match value="index.apxl" type="string" offset="30"/> + </match> + </magic> + <glob pattern="*.key"/> + <alias type="application/vnd.apple.keynote"/> + </mime-type> + </mime-info> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/shared-mime-info-1.2/freedesktop.org.xml.in new/shared-mime-info-1.3/freedesktop.org.xml.in --- old/shared-mime-info-1.2/freedesktop.org.xml.in 2013-09-30 12:01:23.000000000 +0200 +++ new/shared-mime-info-1.3/freedesktop.org.xml.in 2014-04-08 14:46:11.000000000 +0200 @@ -238,7 +238,7 @@ </magic> <glob pattern="*.pgp"/> <glob pattern="*.gpg"/> - <glob pattern="*.asc"/> + <glob pattern="*.asc" weight="10"/> <alias type="application/pgp"/> </mime-type> <mime-type type="application/pgp-keys"> @@ -257,7 +257,7 @@ </magic> <glob pattern="*.skr"/> <glob pattern="*.pkr"/> - <glob pattern="*.asc"/> + <glob pattern="*.asc" weight="10"/> <glob pattern="*.pgp"/> <glob pattern="*.gpg"/> </mime-type> @@ -268,7 +268,7 @@ <magic priority="50"> <match type="string" value="-----BEGIN PGP SIGNATURE-----" offset="0"/> </magic> - <glob pattern="*.asc"/> + <glob pattern="*.asc" weight="10"/> <glob pattern="*.sig"/> <glob pattern="*.pgp"/> <glob pattern="*.gpg"/> @@ -770,6 +770,7 @@ <magic priority="90"> <match type="string" value="StarWriter" offset="2089" /> </magic> + <alias type="application/vnd.stardivision.writer-global"/> </mime-type> <mime-type type="application/vnd.sun.xml.calc"> <_comment>OpenOffice Calc spreadsheet</_comment> @@ -1150,6 +1151,7 @@ <sub-class-of type="application/zip"/> <generic-icon name="x-office-document"/> <glob pattern="*.odb"/> + <alias type="application/vnd.sun.xml.base"/> </mime-type> <mime-type type="application/vnd.oasis.opendocument.image"> <_comment>ODI image</_comment> @@ -1237,8 +1239,10 @@ <alias type="application/x-spss-savefile"/> <magic priority="50"> <match type="string" offset="0" value="$FL2"/> + <match type="string" offset="0" value="$FL3"/> </magic> <glob pattern="*.sav"/> + <glob pattern="*.zsav"/> </mime-type> <mime-type type="application/x-xbel"> <_comment>XBEL bookmarks</_comment> @@ -1622,6 +1626,33 @@ <generic-icon name="application-x-executable"/> <glob pattern="*.nds"/> </mime-type> + <mime-type type="application/x-pc-engine-rom"> + <_comment>PC Engine ROM</_comment> + <generic-icon name="application-x-executable"/> + <glob pattern="*.pce"/> + </mime-type> + <mime-type type="application/x-wii-rom"> + <_comment>Wii disc image</_comment> + <alias type="application/x-wii-iso-image"/> + <alias type="application/x-wbfs"/> + <alias type="application/x-wia"/> + <generic-icon name="application-x-executable"/> + <glob pattern="*.iso"/> + <magic priority="50"> + <match offset="24" type="big32" value="0x5d1c9ea3"/> + <match offset="0" type="string" value="WBFS"/> + <match offset="0" type="string" value="WII\001DISC"/> + </magic> + </mime-type> + <mime-type type="application/x-gamecube-rom"> + <_comment>GameCube disc image</_comment> + <generic-icon name="application-x-executable"/> + <alias type="application/x-gamecube-iso-image"/> + <glob pattern="*.iso"/> + <magic priority="50"> + <match offset="28" type="big32" value="0xc2339f3d"/> + </magic> + </mime-type> <mime-type type="application/x-deb"> <_comment>Debian package</_comment> <alias type="application/x-debian-package"/> @@ -1675,6 +1706,17 @@ <alias type="application/x-fictionbook"/> <root-XML namespaceURI="http://www.gribuser.ru/xml/fictionbook/2.0" localName="FictionBook"/> </mime-type> + <mime-type type="application/x-zip-compressed-fb2"> + <_comment>Compressed FictionBook document</_comment> + <sub-class-of type="application/zip"/> + <glob pattern="*.fb2.zip"/> + <magic priority="80"> + <match type="string" value="PK\003\004" offset="0"> +  + <match type="string" value=".fb2" offset="30:256"/> + </match> + </magic> + </mime-type> <mime-type type="application/x-dia-diagram"> <_comment>Dia diagram</_comment> <generic-icon name="image-x-generic"/> @@ -2133,9 +2175,18 @@ <_comment>JavaScript program</_comment> <alias type="application/x-javascript"/> <alias type="text/javascript"/> - <sub-class-of type="text/x-csrc"/> + <sub-class-of type="application/ecmascript"/> <generic-icon name="text-x-script"/> <glob pattern="*.js"/> + <glob pattern="*.jsm"/> + </mime-type> + <mime-type type="application/json"> + <_comment>JSON document</_comment> + <acronym>JSON</acronym> + <expanded-acronym>JavaScript Object Notation</expanded-acronym> + <sub-class-of type="application/javascript"/> + <generic-icon name="text-x-script"/> + <glob pattern="*.json"/> </mime-type> <mime-type type="application/x-jbuilder-project"> <_comment>JBuilder project</_comment> @@ -2408,6 +2459,15 @@ <glob pattern="*.lyx"/> <alias type="text/x-lyx"/> </mime-type> + <mime-type type="application/x-lz4"> + <_comment>LZ4 archive</_comment> + <generic-icon name="package-x-generic"/> + <magic priority="50"> + <match type="little32" value="0x184d2204" offset="0"/> + <match type="little32" value="0x184c2102" offset="0"/> + </magic> + <glob pattern="*.lz4"/> + </mime-type> <mime-type type="application/x-lzip"> <_comment>Lzip archive</_comment> <generic-icon name="package-x-generic"/> @@ -2702,6 +2762,7 @@ </magic> <glob pattern="*.oga"/> <glob pattern="*.ogg"/> + <glob pattern="*.opus"/> <alias type="audio/x-ogg"/> </mime-type> <mime-type type="video/ogg"> @@ -2742,6 +2803,16 @@ <glob pattern="*.oga"/> <glob pattern="*.ogg"/> </mime-type> + <mime-type type="audio/x-opus+ogg"> + <_comment>Opus audio</_comment> + <sub-class-of type="audio/ogg"/> + <magic priority="80"> + <match type="string" value="OggS" offset="0"> + <match type="string" value="OpusHead" offset="28"/> + </match> + </magic> + <glob pattern="*.opus"/> + </mime-type> <mime-type type="audio/x-speex+ogg"> <_comment>Ogg Speex audio</_comment> <sub-class-of type="audio/ogg"/> @@ -3792,7 +3863,7 @@ </mime-type> <mime-type type="audio/x-ms-wma"> <_comment>Windows Media audio</_comment> - <sub-class-of type="video/x-ms-asf"/> + <sub-class-of type="application/vnd.ms-asf"/> <glob pattern="*.wma"/> <alias type="audio/wma"/> </mime-type> @@ -3845,6 +3916,9 @@ </mime-type> <mime-type type="audio/x-riff"> <_comment>RIFF audio</_comment> + </mime-type> + <mime-type type="application/x-riff"> + <_comment>RIFF container</_comment>  <magic priority="45"> <match type="string" value="RIFF" offset="0"/> @@ -4282,6 +4356,15 @@ <match type="string" value="\x45\x50\x2A\x00" offset="0"/> </magic> </mime-type> + <mime-type type="image/webp"> + <_comment>WebP image</_comment> + <magic priority="50"> + <match type="string" value="RIFF" offset="0"> + <match type="string" value="WEBP" offset="8"/> + </match> + </magic> + <glob pattern="*.webp"/> + </mime-type> <mime-type type="image/x-3ds"> <_comment>3D Studio image</_comment> <glob pattern="*.3ds"/> @@ -4844,9 +4927,8 @@ <_comment>CSS stylesheet</_comment> <acronym>CSS</acronym> <expanded-acronym>Cascading Style Sheets</expanded-acronym> - <sub-class-of type="text/x-csrc"/> + <sub-class-of type="text/plain"/> <glob pattern="*.css"/> - <glob pattern="*.CSSL"/> </mime-type> <mime-type type="text/vcard"> <_comment>electronic business card</_comment> @@ -5786,12 +5868,12 @@ </magic> <glob pattern="*.mng"/> </mime-type> - <mime-type type="video/x-ms-asf"> + <mime-type type="application/vnd.ms-asf"> <_comment>ASF video</_comment> <acronym>ASF</acronym> <expanded-acronym>Advanced Streaming Format</expanded-acronym> <alias type="video/x-ms-wm"/> - <alias type="application/vnd.ms-asf"/> + <alias type="video/x-ms-asf"/> <glob pattern="*.asf"/> <magic priority="50"> <match type="big32" value="0x3026b275" offset="0"/> @@ -5800,7 +5882,7 @@ </mime-type> <mime-type type="application/x-netshow-channel"> <_comment>Windows Media Station file</_comment> - <sub-class-of type="video/x-ms-asf"/> + <sub-class-of type="application/vnd.ms-asf"/> <generic-icon name="video-x-generic"/> <glob pattern="*.nsc"/> <magic priority="50"> @@ -5809,7 +5891,7 @@ </mime-type> <mime-type type="video/x-ms-wmv"> <_comment>Windows Media video</_comment> - <sub-class-of type="video/x-ms-asf"/> + <sub-class-of type="application/vnd.ms-asf"/> <glob pattern="*.wmv"/> </mime-type> <mime-type type="video/x-msvideo"> @@ -6109,6 +6191,7 @@ <_comment>e-book reader</_comment> <treemagic> <treematch path=".kobo" type="directory" non-empty="true"/> + <treematch path="system/com.amazon.ebook.booklet.reader" non-empty="false"/> </treemagic> </mime-type> @@ -6165,4 +6248,17 @@ <glob pattern="*.trig" /> </mime-type> + <mime-type type="application/x-iwork-keynote-sffkey"> + <_comment>Apple Keynote 5 presentation</_comment> + <sub-class-of type="application/zip"/> + <generic-icon name="x-office-presentation"/> + <magic priority="50"> + <match type="string" value="PK\003\004" offset="0"> + <match type="string" value="index.apxl" offset="30"/> + </match> + </magic> + <glob pattern="*.key"/> + <alias type="application/vnd.apple.keynote"/> + </mime-type> + </mime-info> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/shared-mime-info-1.2/test-tree-magic.c new/shared-mime-info-1.3/test-tree-magic.c --- old/shared-mime-info-1.2/test-tree-magic.c 2012-02-20 00:40:03.000000000 +0100 +++ new/shared-mime-info-1.3/test-tree-magic.c 2013-10-09 22:09:17.000000000 +0200 @@ -637,7 +637,10 @@ char *content, **lines; guint i; +#if GLIB_CHECK_VERSION(2,36,0) +#else g_type_init (); +#endif if (argc != 2) { g_print ("Usage: %s [file]\n", argv[0]); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/shared-mime-info-1.2/update-mime-database.c new/shared-mime-info-1.3/update-mime-database.c --- old/shared-mime-info-1.2/update-mime-database.c 2013-07-10 00:10:53.000000000 +0200 +++ new/shared-mime-info-1.3/update-mime-database.c 2014-03-31 16:24:23.000000000 +0200 @@ -951,7 +951,7 @@ new_name = g_strndup(pathname, len - 4); #ifdef HAVE_FDATASYNC - fd = open(pathname, O_RDONLY); + fd = open(pathname, O_RDWR); if (fd == -1) { set_error_from_errno(error); @@ -995,15 +995,20 @@ const char *mime_dir = (char *) data; char *media, *filename; GError *local_error = NULL; + char *lower; - media = g_strconcat(mime_dir, "/", type->media, NULL); + lower = g_ascii_strdown(type->media, -1); + media = g_strconcat(mime_dir, "/", lower, NULL); + g_free(lower); #ifdef _WIN32 mkdir(media); #else mkdir(media, 0755); #endif - filename = g_strconcat(media, "/", type->subtype, ".xml.new", NULL); + lower = g_ascii_strdown(type->subtype, -1); + filename = g_strconcat(media, "/", lower, ".xml.new", NULL); + g_free(lower); g_free(media); media = 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 openssl for openSUSE:Factory
by root＠hilbert.suse.de 15 Apr '14

15 Apr '14

Hello community, here is the log from the commit of package openssl for openSUSE:Factory checked in at 2014-04-15 07:34:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openssl (Old) and /work/SRC/openSUSE:Factory/.openssl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openssl" Changes: -------- --- /work/SRC/openSUSE:Factory/openssl/openssl.changes 2014-04-09 18:17:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.openssl.new/openssl.changes 2014-04-15 07:34:11.000000000 +0200 @@ -1,0 +2,14 @@ +Fri Apr 11 02:40:34 UTC 2014 - crrodriguez(a)opensuse.org + +- openssl-gcc-attributes.patch + * annotate memory allocation wrappers with attribute(alloc_size) + so the compiler can tell us if it knows they are being misused + * OPENSSL_showfatal is annotated with attribute printf to detect + format string problems. + +- It is time to try to disable SSLv2 again, it was tried a while + ago but broke too many things, nowadays Debian, Ubuntu, the BSDs + all have disabled it, most components are already fixed. + I will fix the remaining fallout if any. (email me) + +------------------------------------------------------------------- New: ---- openssl-gcc-attributes.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openssl.spec ++++++ --- /var/tmp/diff_new_pack.Tl15V8/_old 2014-04-15 07:34:12.000000000 +0200 +++ /var/tmp/diff_new_pack.Tl15V8/_new 2014-04-15 07:34:12.000000000 +0200 @@ -64,6 +64,7 @@ Patch16: openssl-1.0.1e-fips-ec.patch Patch17: openssl-1.0.1e-fips-ctor.patch Patch18: openssl-1.0.1e-new-fips-reqs.patch +Patch19: openssl-gcc-attributes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -169,7 +170,7 @@ %patch16 -p1 %patch17 -p1 %patch18 -p1 - +%patch19 -p1 cp -p %{S:10} . cp -p %{S:11} . echo "adding/overwriting some entries in the 'table' hash in Configure" @@ -217,6 +218,9 @@ # config_flags="threads shared no-rc5 no-idea \ fips \ +%if 0%{suse_version} > 1310 +no-ssl2 \ +%endif %ifarch x86_64 enable-ec_nistp_64_gcc_128 \ %endif ++++++ openssl-gcc-attributes.patch ++++++ --- openssl-1.0.1g.orig/crypto/cryptlib.h +++ openssl-1.0.1g/crypto/cryptlib.h @@ -100,7 +100,7 @@ extern "C" { void OPENSSL_cpuid_setup(void); extern unsigned int OPENSSL_ia32cap_P[]; -void OPENSSL_showfatal(const char *fmta,...); +void OPENSSL_showfatal(const char *fmta,...) __attribute__ ((format (printf, 1, 2))); void *OPENSSL_stderr(void); extern int OPENSSL_NONPIC_relocated; --- openssl-1.0.1g.orig/crypto/crypto.h +++ openssl-1.0.1g/crypto/crypto.h @@ -487,15 +487,15 @@ void CRYPTO_get_mem_debug_functions(void void (**so)(long), long (**go)(void)); -void *CRYPTO_malloc_locked(int num, const char *file, int line); +void *CRYPTO_malloc_locked(int num, const char *file, int line) __attribute__((alloc_size(1))); void CRYPTO_free_locked(void *ptr); -void *CRYPTO_malloc(int num, const char *file, int line); +void *CRYPTO_malloc(int num, const char *file, int line) __attribute__((alloc_size(1))); char *CRYPTO_strdup(const char *str, const char *file, int line); void CRYPTO_free(void *ptr); -void *CRYPTO_realloc(void *addr,int num, const char *file, int line); +void *CRYPTO_realloc(void *addr,int num, const char *file, int line) __attribute__((alloc_size(2))); void *CRYPTO_realloc_clean(void *addr,int old_num,int num,const char *file, - int line); -void *CRYPTO_remalloc(void *addr,int num, const char *file, int line); + int line) __attribute__((alloc_size(2, 3))); +void *CRYPTO_remalloc(void *addr,int num, const char *file, int line) __attribute__((alloc_size(2))); void OPENSSL_cleanse(void *ptr, size_t len); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libqt5-qtbase for openSUSE:Factory
by root＠hilbert.suse.de 15 Apr '14

15 Apr '14

Hello community, here is the log from the commit of package libqt5-qtbase for openSUSE:Factory checked in at 2014-04-15 07:34:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qtbase (Old) and /work/SRC/openSUSE:Factory/.libqt5-qtbase.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libqt5-qtbase" Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qtbase/libqt5-qtbase.changes 2014-03-27 09:29:44.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libqt5-qtbase.new/libqt5-qtbase.changes 2014-04-15 07:34:08.000000000 +0200 @@ -1,0 +2,19 @@ +Tue Apr 8 06:56:21 UTC 2014 - mlin(a)suse.com + +- Add support for byte swapping, bnc#866709 + * Add libqt5-add-support-for-byte-swapping.patch + * Add libqt5-byte-order-byte-is-address0.patch +- Fix keyboard remapping not applied on Qt5, bnc#866051 + * Add backported libqt5-add-better-support-for-keymap-update-handling.patch + * Add backported libqt5-improve-keymap-error-handling.patch + * Add backported libqt5-fix-build-failure-xcb.patch + * Add backported libqt5-update-bundled-libxkbcommon-version-to-041.patch + * Add backported libqt5-fix-regression-in-key-handling.patch + +------------------------------------------------------------------- +Fri Mar 28 08:22:53 UTC 2014 - hrvoje.senjan(a)gmail.com + +- The no-neon switch no longer exists with 5.3, so drop it: fixes + build on arm/aarch64 + +------------------------------------------------------------------- New: ---- libqt5-add-better-support-for-keymap-update-handling.patch libqt5-add-support-for-byte-swapping.patch libqt5-byte-order-byte-is-address0.patch libqt5-fix-build-failure-xcb.patch libqt5-fix-regression-in-key-handling.patch libqt5-improve-keymap-error-handling.patch libqt5-update-bundled-libxkbcommon-version-to-041.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtbase.spec ++++++ --- /var/tmp/diff_new_pack.Tk8pRg/_old 2014-04-15 07:34:10.000000000 +0200 +++ /var/tmp/diff_new_pack.Tk8pRg/_new 2014-04-15 07:34:10.000000000 +0200 @@ -46,6 +46,20 @@ Patch132: use-freetype-default.patch # PATCH-FIX-UPSTREAM f1ee10f81ac18789e9a7dc715b464415ba2bc2b8.patch -- prefer QPA implementation in qsystemtrayicon_x11 if available Patch133: f1ee10f81ac18789e9a7dc715b464415ba2bc2b8.patch +# PATCH-FIX-UPSTREAM libqt5-add-better-support-for-keymap-update-handling.patch -- fixed keyboard remapping not applied(bnc#866051, qtbug#31527) +Patch134: libqt5-add-better-support-for-keymap-update-handling.patch +# PATCH-FIX-UPSTREAM libqt5-improve-keymap-error-handling.patch -- improve keymap error handling +Patch135: libqt5-improve-keymap-error-handling.patch +# PATCH-FIX-UPSTREAM libqt5-fix-build-failure-xcb.patch -- fix build failure in xcb(qtbug#37971) +Patch136: libqt5-fix-build-failure-xcb.patch +# PATCH-FIX-UPSTREAM libqt5-update-bundled-libxkbcommon-version-to-041.patch -- updated bundled libxkbcommon also updated the minimal requirement version at build(qtbug#36281) +Patch137: libqt5-update-bundled-libxkbcommon-version-to-041.patch +# PATCH-FIX-UPSTREAM libqt5-fix-regression-in-key-handling.patch -- introduced new function from libxkbcommon 0.4.1 to fix key handling regression(qtbug#36281) +Patch138: libqt5-fix-regression-in-key-handling.patch +# PATCH-FIX-UPSTREAM libqt5-add-support-for-byte-swapping.patch -- add support for byte swapping(bnc#866709), currently it's at the upstream dev branch +Patch139: libqt5-add-support-for-byte-swapping.patch +# PATCH-FIX-UPSTREAM libqt5-byte-order-byte-is-address0.patch -- the byte order byte is at address 0(bnc#866709), currently it's at the upstream dev branch +Patch140: libqt5-byte-order-byte-is-address0.patch BuildRequires: alsa-devel BuildRequires: cups-devel BuildRequires: fdupes @@ -91,9 +105,9 @@ %endif BuildRequires: pkgconfig(ice) BuildRequires: pkgconfig(sm) -%if 0%{?suse_version} >= 1320 -BuildRequires: pkgconfig(xkbcommon) -BuildRequires: pkgconfig(xkbcommon-x11) +%if 0%{?suse_version} >= 1315 +BuildRequires: pkgconfig(xkbcommon) >= 0.4.1 +BuildRequires: pkgconfig(xkbcommon-x11) >= 0.4.1 %else BuildRequires: xkeyboard-config %endif @@ -130,6 +144,13 @@ %patch131 -p1 %patch132 -p1 %patch133 -p1 +%patch134 -p1 +%patch135 -p1 +%patch136 -p1 +%patch137 -p1 +%patch138 -p1 +%patch139 -p1 +%patch140 -p1 # be sure not to use them rm -r src/3rdparty/{libjpeg,freetype,libpng,zlib} @@ -640,7 +661,7 @@ -no-separate-debug-info \ -shared \ -xkb \ -%if 0%{?suse_version} >= 1320 +%if 0%{?suse_version} >= 1315 -system-xkbcommon \ %else -qt-xkbcommon \ @@ -686,9 +707,6 @@ -opengl desktop \ %endif -release \ -%ifarch %arm aarch64 - -no-neon \ -%endif -plugin-sql-sqlite -nomake tests \ -plugin-sql-psql -I/usr/include -I/usr/include/pgsql/ -I/usr/include/pgsql/server \ -plugin-sql-odbc \ ++++++ libqt5-add-better-support-for-keymap-update-handling.patch ++++++ ++++ 666 lines (skipped) ++++++ libqt5-add-support-for-byte-swapping.patch ++++++ >From a3ed9b781cb0e1fa4ae3b1cedcd63bd394903db7 Mon Sep 17 00:00:00 2001 From: Egbert Eich <eich(a)suse.de> Date: Tue, 18 Mar 2014 18:29:02 +0100 Subject: [PATCH] [xcb/xsettings] Add support for byte swapping MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The XSettings protocol is not endian neutral. Instead it holds information about endianness in the first byte. It uses the same convention as X11/X.h does. So far byte order handling was missing leading to nasty crashes when byte order between clients setting and reading XSettings differed. This patch fixes this. Using the X11/X.h conventions seems to be an 'established standard', this piece is missing from the Xsettings specifications. Therefore this fix may introduce spurious regressions as other Xsettings 'providers' may use a different convention. To detect this and to avoid crashes the fix also adds checks to avoid reading past the end of the of the Xsettings data blob. If problems are encountered: warn and bail. Change-Id: If8acb23cca2478369633129af2d99e122a84cede Reviewed-by: Jørgen Lind <jorgen.lind(a)digia.com> --- src/plugins/platforms/xcb/qxcbxsettings.cpp | 43 +++++++++++++++++++++-------- 1 file changed, 32 insertions(+), 11 deletions(-) diff --git a/src/plugins/platforms/xcb/qxcbxsettings.cpp b/src/plugins/platforms/xcb/qxcbxsettings.cpp index 141a6cc..26d95e9 100644 --- a/src/plugins/platforms/xcb/qxcbxsettings.cpp +++ b/src/plugins/platforms/xcb/qxcbxsettings.cpp @@ -42,6 +42,7 @@ #include "qxcbxsettings.h" #include <QtCore/QByteArray> +#include <QtCore/QtEndian> #include <X11/extensions/XIproto.h> @@ -149,47 +150,67 @@ public: { if (xSettings.length() < 12) return; - // we ignore byteorder for now char byteOrder = xSettings.at(1); - Q_UNUSED(byteOrder); - uint number_of_settings = *reinterpret_cast<const uint *>(xSettings.mid(8,4).constData()); + if (byteOrder != LSBFirst && byteOrder != MSBFirst) { + qWarning("%s ByteOrder byte %d not 0 or 1", Q_FUNC_INFO , byteOrder); + return; + } + +#define ADJUST_BO(b, t, x) \ + ((b == LSBFirst) ? \ + qFromLittleEndian<t>((const uchar *)(x)) : \ + qFromBigEndian<t>((const uchar *)(x))) +#define VALIDATE_LENGTH(x) \ + if ((size_t)xSettings.length() < (offset + local_offset + 12 + x)) { \ + qWarning("%s Length %d runs past end of data", Q_FUNC_INFO , x); \ + return; \ + } + uint number_of_settings = ADJUST_BO(byteOrder, quint32, xSettings.mid(8,4).constData()); const char *data = xSettings.constData() + 12; size_t offset = 0; for (uint i = 0; i < number_of_settings; i++) { int local_offset = 0; + VALIDATE_LENGTH(2); XSettingsType type = static_cast<XSettingsType>(*reinterpret_cast<const quint8 *>(data + offset)); local_offset += 2; - quint16 name_len = *reinterpret_cast<const quint16 *>(data + offset + local_offset); + VALIDATE_LENGTH(2); + quint16 name_len = ADJUST_BO(byteOrder, quint16, data + offset + local_offset); local_offset += 2; + VALIDATE_LENGTH(name_len); QByteArray name(data + offset + local_offset, name_len); local_offset += round_to_nearest_multiple_of_4(name_len); - int last_change_serial = *reinterpret_cast<const int *>(data + offset + local_offset); + VALIDATE_LENGTH(4); + int last_change_serial = ADJUST_BO(byteOrder, qint32, data + offset + local_offset); Q_UNUSED(last_change_serial); local_offset += 4; QVariant value; if (type == XSettingsTypeString) { - int value_length = *reinterpret_cast<const int *>(data + offset + local_offset); + VALIDATE_LENGTH(4); + int value_length = ADJUST_BO(byteOrder, qint32, data + offset + local_offset); local_offset+=4; + VALIDATE_LENGTH(value_length); QByteArray value_string(data + offset + local_offset, value_length); value.setValue(value_string); local_offset += round_to_nearest_multiple_of_4(value_length); } else if (type == XSettingsTypeInteger) { - int value_length = *reinterpret_cast<const int *>(data + offset + local_offset); + VALIDATE_LENGTH(4); + int value_length = ADJUST_BO(byteOrder, qint32, data + offset + local_offset); local_offset += 4; value.setValue(value_length); } else if (type == XSettingsTypeColor) { - quint16 red = *reinterpret_cast<const quint16 *>(data + offset + local_offset); + VALIDATE_LENGTH(2*4); + quint16 red = ADJUST_BO(byteOrder, quint16, data + offset + local_offset); local_offset += 2; - quint16 green = *reinterpret_cast<const quint16 *>(data + offset + local_offset); + quint16 green = ADJUST_BO(byteOrder, quint16, data + offset + local_offset); local_offset += 2; - quint16 blue = *reinterpret_cast<const quint16 *>(data + offset + local_offset); + quint16 blue = ADJUST_BO(byteOrder, quint16, data + offset + local_offset); local_offset += 2; - quint16 alpha= *reinterpret_cast<const quint16 *>(data + offset + local_offset); + quint16 alpha= ADJUST_BO(byteOrder, quint16, data + offset + local_offset); local_offset += 2; QColor color_value(red,green,blue,alpha); value.setValue(color_value); -- 1.8.4.5 ++++++ libqt5-byte-order-byte-is-address0.patch ++++++ >From 5819ffe492cf3cd98718819b1bd837819318d82e Mon Sep 17 00:00:00 2001 From: Egbert Eich <eich(a)suse.de> Date: Sun, 6 Apr 2014 16:54:03 +0200 Subject: [PATCH] [xcb/xsettings] Byte order byte is at address 0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Accoring to http://standards.freedesktop.org\ /xsettings-spec/xsettings-spec-0.5.html the byte order byte is address 0 (not 1). Change-Id: I441084a7f24908dd8a504648bfc50ba2d486a586 Reviewed-by: Jørgen Lind <jorgen.lind(a)digia.com> --- src/plugins/platforms/xcb/qxcbxsettings.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/platforms/xcb/qxcbxsettings.cpp b/src/plugins/platforms/xcb/qxcbxsettings.cpp index 26d95e9..17b40a4 100644 --- a/src/plugins/platforms/xcb/qxcbxsettings.cpp +++ b/src/plugins/platforms/xcb/qxcbxsettings.cpp @@ -150,7 +150,7 @@ public: { if (xSettings.length() < 12) return; - char byteOrder = xSettings.at(1); + char byteOrder = xSettings.at(0); if (byteOrder != LSBFirst && byteOrder != MSBFirst) { qWarning("%s ByteOrder byte %d not 0 or 1", Q_FUNC_INFO , byteOrder); return; -- 1.8.4.5 ++++++ libqt5-fix-build-failure-xcb.patch ++++++ >From ee3dea8d3fdc9477f3a54e5457e19be1d0c61de9 Mon Sep 17 00:00:00 2001 From: Gatis Paeglis <gatis.paeglis(a)digia.com> Date: Mon, 31 Mar 2014 14:48:29 +0200 Subject: [PATCH] [xcb] Fix build failure Build failure was introduced by 9bb634a6176c639bd6b52d58151e9927c30919d0. When linking with systems provided libxkbcommon, then DFLT_XKB_CONFIG_ROOT can't be accessed directly. The reason that this slip through CI is that on CI machines Qt is build with bundled version of libxkbcommon. In addition this patch improves keymap error message, by making it more explicit for users what could be the reasons for "keymap compilation" failures and what should be done to make input work. As it turns out this is a common issue on old systems, servers and some VNC clients. Task-number: QTBUG-37971 Change-Id: I77667a404150ee7ab8465a065e23ca5eea63c33b Reviewed-by: Uli Schlachter <psychon(a)znc.in> Reviewed-by: Thiago Macieira <thiago.macieira(a)intel.com> Reviewed-by: Lars Knoll <lars.knoll(a)digia.com> --- src/plugins/platforms/xcb/qxcbkeyboard.cpp | 28 +++++++++------------------- src/plugins/platforms/xcb/qxcbkeyboard.h | 2 +- 2 files changed, 10 insertions(+), 20 deletions(-) --- a/src/plugins/platforms/xcb/qxcbkeyboard.cpp +++ b/src/plugins/platforms/xcb/qxcbkeyboard.cpp @@ -663,23 +663,14 @@ void QXcbKeyboard::clearXKBConfig() memset(&xkb_names, 0, sizeof(xkb_names)); } -void QXcbKeyboard::printKeymapError(const QString &error) const +void QXcbKeyboard::printKeymapError(const char *error) const { - qWarning() << "Qt: " << error; - // check if XKB config root is a valid path - const QDir xkbRoot = qEnvironmentVariableIsSet("QT_XKB_CONFIG_ROOT") - ? QString::fromLocal8Bit(qgetenv("QT_XKB_CONFIG_ROOT")) - : DFLT_XKB_CONFIG_ROOT; - if (!xkbRoot.exists() || xkbRoot.dirName() != "xkb") { - qWarning() << "Set QT_XKB_CONFIG_ROOT to provide a valid XKB configuration data path, current search paths: " - << xkbRoot.path() << ". Use ':' as separator to provide several search paths."; - return; - } - qWarning() << "_XKB_RULES_NAMES property contains:" << "\nrules : " << xkb_names.rules << - "\nmodel : " << xkb_names.model << "\nlayout : " << xkb_names.layout << - "\nvariant : " << xkb_names.variant << "\noptions : " << xkb_names.options << - "\nIf this looks like a valid keyboard layout information then you might need to " - "update XKB configuration data on the system (http://cgit.freedesktop.org/xkeyboard-config/)"; + qWarning() << error << "Current XKB configuration data search paths are: "; + for (unsigned int i = 0; i < xkb_context_num_include_paths(xkb_context); ++i) + qWarning() << xkb_context_include_path_get(xkb_context, i); + qWarning() << "Use QT_XKB_CONFIG_ROOT environmental variable to provide an additional search path, " + "add ':' as separator to provide several search paths and/or make sure that XKB configuration data " + "directory contains recent enough contents, to update please see http://cgit.freedesktop.org/xkeyboard-config/ ."; } void QXcbKeyboard::updateKeymap() @@ -696,7 +687,7 @@ void QXcbKeyboard::updateKeymap() xkb_context = xkb_context_new((xkb_context_flags)0); } if (!xkb_context) { - printKeymapError("Failed to create XKB context!"); + printKeymapError("Qt: Failed to create XKB context!"); m_config = false; return; } @@ -731,8 +722,7 @@ void QXcbKeyboard::updateKeymap() if (xkb_keymap) { new_state = xkb_state_new(xkb_keymap); } else { - // failed to compile from RMLVO, give a verbose error message - printKeymapError("Qt: Failed to compile a keymap!"); + printKeymapError("Failed to compile a keymap!"); m_config = false; return; } --- a/src/plugins/platforms/xcb/qxcbkeyboard.h +++ b/src/plugins/platforms/xcb/qxcbkeyboard.h @@ -92,7 +92,7 @@ protected: QString keysymToUnicode(xcb_keysym_t sym) const; int keysymToQtKey(xcb_keysym_t keysym) const; int keysymToQtKey(xcb_keysym_t keysym, Qt::KeyboardModifiers &modifiers, QString text) const; - void printKeymapError(const QString &error) const; + void printKeymapError(const char *error) const; void readXKBConfig(); void clearXKBConfig(); ++++++ libqt5-fix-regression-in-key-handling.patch ++++++ >From 6ad458bc93162753e448eea28499e778e2946d2c Mon Sep 17 00:00:00 2001 From: Gatis Paeglis <gatis.paeglis(a)digia.com> Date: Mon, 31 Mar 2014 17:13:20 +0200 Subject: [PATCH] Fix regression in key handling. libxkbcommon 0.4.1 added two new functions, xkb_state_key_get_utf{8,32}(). They combine the operations of xkb_state_key_get_syms() and xkb_keysym_to_utf{8,32}(). The xkb_state_key_get_utf{8,32}() functions now apply Control transformation: when the Control modifier is active, the string is converted to an appropriate control character. This matches the behavior of libX11's XLookupString(3), and is required by the XKB specification: http://www.x.org/releases/current/doc/kbproto/xkbproto.html#Interpreting_th… Task-number: QTBUG-36281 Change-Id: Ib45f45d801291c171640600384107a35d7d56b9b Reviewed-by: Ran Benita <ran234(a)gmail.com> Reviewed-by: Lars Knoll <lars.knoll(a)digia.com> --- src/plugins/platforms/xcb/qxcbkeyboard.cpp | 19 ++++++++----------- src/plugins/platforms/xcb/qxcbkeyboard.h | 2 +- 2 files changed, 9 insertions(+), 12 deletions(-) --- a/src/plugins/platforms/xcb/qxcbkeyboard.cpp +++ b/src/plugins/platforms/xcb/qxcbkeyboard.cpp @@ -853,7 +853,7 @@ QList<int> QXcbKeyboard::possibleKeys(co return QList<int>(); QList<int> result; - int baseQtKey = keysymToQtKey(sym, modifiers, keysymToUnicode(sym)); + int baseQtKey = keysymToQtKey(sym, modifiers, lookupString(kb_state, event->nativeScanCode())); result += (baseQtKey + modifiers); // The base key is _always_ valid, of course xkb_mod_index_t shiftMod = xkb_keymap_mod_get_index(xkb_keymap, "Shift"); @@ -900,7 +900,7 @@ QList<int> QXcbKeyboard::possibleKeys(co continue; Qt::KeyboardModifiers mods = modifiers & ~neededMods; - qtKey = keysymToQtKey(sym, mods, keysymToUnicode(sym)); + qtKey = keysymToQtKey(sym, mods, lookupString(kb_state, event->nativeScanCode())); if (qtKey == baseQtKey) continue; @@ -1316,7 +1316,8 @@ void QXcbKeyboard::handleKeyEvent(QWindo } Qt::KeyboardModifiers modifiers = translateModifiers(state); - QString string = keysymToUnicode(sym); + + QString string = lookupString(xkb_state, code); int count = string.size(); string.truncate(count); @@ -1379,16 +1380,12 @@ void QXcbKeyboard::handleKeyEvent(QWindo } } -QString QXcbKeyboard::keysymToUnicode(xcb_keysym_t sym) const +QString QXcbKeyboard::lookupString(struct xkb_state *state, xcb_keycode_t code) const { QByteArray chars; - int bytes; - chars.resize(7); - bytes = xkb_keysym_to_utf8(sym, chars.data(), chars.size()); - if (bytes == -1) - qWarning("QXcbKeyboard::handleKeyEvent - buffer too small"); - chars.resize(bytes-1); - + chars.resize(1 + xkb_state_key_get_utf8(state, code, 0, 0)); + // equivalent of XLookupString + xkb_state_key_get_utf8(state, code, chars.data(), chars.size()); return QString::fromUtf8(chars); } --- a/src/plugins/platforms/xcb/qxcbkeyboard.h +++ b/src/plugins/platforms/xcb/qxcbkeyboard.h @@ -86,7 +86,7 @@ protected: void handleKeyEvent(QWindow *window, QEvent::Type type, xcb_keycode_t code, quint16 state, xcb_timestamp_t time); void resolveMaskConflicts(); - QString keysymToUnicode(xcb_keysym_t sym) const; + QString lookupString(struct xkb_state *state, xcb_keycode_t code) const; int keysymToQtKey(xcb_keysym_t keysym) const; int keysymToQtKey(xcb_keysym_t keysym, Qt::KeyboardModifiers &modifiers, QString text) const; void printKeymapError(const char *error) const; ++++++ libqt5-improve-keymap-error-handling.patch ++++++ >From 9bb634a6176c639bd6b52d58151e9927c30919d0 Mon Sep 17 00:00:00 2001 From: Gatis Paeglis <gatis.paeglis(a)digia.com> Date: Mon, 3 Mar 2014 18:00:33 +0100 Subject: [PATCH] Improve keymap error handling - add QT_XKB_CONFIG_ROOT envvar, this can be used to provide an alternative XKB configuration search paths (default XKB configuration root is detected when building Qt library). At runtime these paths might change - when dropping Qt application binary into a system with different setup. Change-Id: Ia21a3e7f0339c95793c1f543d1a95b1591e5d8df Reviewed-by: Uli Schlachter <psychon(a)znc.in> Reviewed-by: Lars Knoll <lars.knoll(a)digia.com> --- src/plugins/platforms/xcb/qxcbkeyboard.cpp | 77 ++++++++++++++++++++++------- src/plugins/platforms/xcb/qxcbkeyboard.h | 1 2 files changed, 61 insertions(+), 17 deletions(-) --- a/src/plugins/platforms/xcb/qxcbkeyboard.cpp +++ b/src/plugins/platforms/xcb/qxcbkeyboard.cpp @@ -38,20 +38,22 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ - #include "qxcbkeyboard.h" #include "qxcbwindow.h" #include "qxcbscreen.h" -#include <X11/keysym.h> + #include <qpa/qwindowsysteminterface.h> +#include <qpa/qplatforminputcontext.h> +#include <qpa/qplatformintegration.h> +#include <qpa/qplatformcursor.h> + #include <QtCore/QTextCodec> #include <QtCore/QMetaMethod> +#include <QtCore/QDir> #include <private/qguiapplication_p.h> -#include <stdio.h> -#include <qpa/qplatforminputcontext.h> -#include <qpa/qplatformintegration.h> -#include <qpa/qplatformcursor.h> +#include <stdio.h> +#include <X11/keysym.h> #ifndef XK_ISO_Left_Tab #define XK_ISO_Left_Tab 0xFE20 @@ -619,6 +621,12 @@ void QXcbKeyboard::readXKBConfig() char *xkb_config = (char *)xcb_get_property_value(config_reply); int length = xcb_get_property_value_length(config_reply); + // on old X servers xkb_config can be 0 even if config_reply indicates a succesfull read + if (!xkb_config || length == 0) + return; + // ### TODO some X servers don't set _XKB_RULES_NAMES at all, in these cases it is filled + // with gibberish, we would need to do some kind of sanity check + char *names[5] = { 0, 0, 0, 0, 0 }; char *p = xkb_config, *end = p + length; int i = 0; @@ -655,17 +663,45 @@ void QXcbKeyboard::clearXKBConfig() memset(&xkb_names, 0, sizeof(xkb_names)); } +void QXcbKeyboard::printKeymapError(const QString &error) const +{ + qWarning() << "Qt: " << error; + // check if XKB config root is a valid path + const QDir xkbRoot = qEnvironmentVariableIsSet("QT_XKB_CONFIG_ROOT") + ? QString::fromLocal8Bit(qgetenv("QT_XKB_CONFIG_ROOT")) + : DFLT_XKB_CONFIG_ROOT; + if (!xkbRoot.exists() || xkbRoot.dirName() != "xkb") { + qWarning() << "Set QT_XKB_CONFIG_ROOT to provide a valid XKB configuration data path, current search paths: " + << xkbRoot.path() << ". Use ':' as separator to provide several search paths."; + return; + } + qWarning() << "_XKB_RULES_NAMES property contains:" << "\nrules : " << xkb_names.rules << + "\nmodel : " << xkb_names.model << "\nlayout : " << xkb_names.layout << + "\nvariant : " << xkb_names.variant << "\noptions : " << xkb_names.options << + "\nIf this looks like a valid keyboard layout information then you might need to " + "update XKB configuration data on the system (http://cgit.freedesktop.org/xkeyboard-config/)"; +} + void QXcbKeyboard::updateKeymap() { m_config = true; // set xkb context object if (!xkb_context) { - xkb_context = xkb_context_new((xkb_context_flags)0); + if (qEnvironmentVariableIsSet("QT_XKB_CONFIG_ROOT")) { + xkb_context = xkb_context_new((xkb_context_flags)XKB_CONTEXT_NO_DEFAULT_INCLUDES); + QList<QByteArray> xkbRootList = QByteArray(qgetenv("QT_XKB_CONFIG_ROOT")).split(':'); + foreach (QByteArray xkbRoot, xkbRootList) + xkb_context_include_path_append(xkb_context, xkbRoot.constData()); + } else { + xkb_context = xkb_context_new((xkb_context_flags)0); + } if (!xkb_context) { - qWarning("Qt: Failed to create XKB context"); + printKeymapError("Failed to create XKB context!"); m_config = false; return; } + // log only critical errors, we do our own error logging from printKeymapError() + xkb_context_set_log_level(xkb_context, (xkb_log_level)XKB_LOG_LEVEL_CRITICAL); } // update xkb keymap object xkb_keymap_unref(xkb_keymap); @@ -685,21 +721,28 @@ void QXcbKeyboard::updateKeymap() // Compile a keymap from RMLVO (rules, models, layouts, variants and options) names readXKBConfig(); xkb_keymap = xkb_keymap_new_from_names(xkb_context, &xkb_names, (xkb_keymap_compile_flags)0); - if (xkb_keymap) + if (!xkb_keymap) { + // last fallback is to used hard-coded keymap name, see DEFAULT_XKB_* in xkbcommon.pri + qWarning() << "Qt: Could not determine keyboard configuration data" + " from X server, will use hard-coded keymap configuration."; + clearXKBConfig(); + xkb_keymap = xkb_keymap_new_from_names(xkb_context, &xkb_names, (xkb_keymap_compile_flags)0); + } + if (xkb_keymap) { new_state = xkb_state_new(xkb_keymap); - } + } else { + // failed to compile from RMLVO, give a verbose error message + printKeymapError("Qt: Failed to compile a keymap!"); + m_config = false; + return; + } - if (!xkb_keymap) { - qWarning("Qt: Failed to compile a keymap"); - m_config = false; } if (!new_state) { - qWarning("Qt: Failed to create xkb state"); + qWarning("Qt: Failed to create xkb state!"); m_config = false; - } - if (!m_config) return; - + } // update xkb state object xkb_state_unref(xkb_state); xkb_state = new_state; --- a/src/plugins/platforms/xcb/qxcbkeyboard.h +++ b/src/plugins/platforms/xcb/qxcbkeyboard.h @@ -92,6 +92,7 @@ protected: QString keysymToUnicode(xcb_keysym_t sym) const; int keysymToQtKey(xcb_keysym_t keysym) const; int keysymToQtKey(xcb_keysym_t keysym, Qt::KeyboardModifiers &modifiers, QString text) const; + void printKeymapError(const QString &error) const; void readXKBConfig(); void clearXKBConfig(); ++++++ libqt5-update-bundled-libxkbcommon-version-to-041.patch ++++++ ++++ 7085 lines (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 patterns-openSUSE for openSUSE:Factory
by root＠hilbert.suse.de 14 Apr '14

14 Apr '14

Hello community, here is the log from the commit of package patterns-openSUSE for openSUSE:Factory checked in at 2014-04-14 21:22:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/patterns-openSUSE (Old) and /work/SRC/openSUSE:Factory/.patterns-openSUSE.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "patterns-openSUSE" Changes: -------- --- /work/SRC/openSUSE:Factory/patterns-openSUSE/patterns-openSUSE.changes 2014-03-23 22:30:06.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.patterns-openSUSE.new/patterns-openSUSE.changes 2014-04-14 21:22:08.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Apr 14 17:21:58 UTC 2014 - coolo(a)suse.com + +- fix kernel requires for rest patterns + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ patterns-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.VJKw4L/_old 2014-04-14 21:22:09.000000000 +0200 +++ /var/tmp/diff_new_pack.VJKw4L/_new 2014-04-14 21:22:09.000000000 +0200 @@ -4081,7 +4081,7 @@ # from data/REST-CD %ifarch x86_64 Requires: kernel-desktop -#else +%else Requires: kernel-default %endif Requires: kernel-firmware @@ -4127,7 +4127,7 @@ %ifarch x86_64 # kernel modules Recommends: ndiswrapper-kmp-desktop -#else +%else Recommends: ndiswrapper-kmp-default %endif # network @@ -4312,7 +4312,7 @@ # from data/REST-CD %ifarch x86_64 Requires: kernel-desktop -#else +%else Requires: kernel-default %endif Requires: kernel-firmware @@ -4358,7 +4358,7 @@ %ifarch x86_64 # kernel modules Recommends: ndiswrapper-kmp-desktop -#else +%else Recommends: ndiswrapper-kmp-default %endif # network @@ -4526,7 +4526,7 @@ # from data/REST-CD %ifarch x86_64 Requires: kernel-desktop -#else +%else Requires: kernel-default %endif Requires: kernel-firmware @@ -4572,7 +4572,7 @@ %ifarch x86_64 # kernel modules Recommends: ndiswrapper-kmp-desktop -#else +%else Recommends: ndiswrapper-kmp-default %endif # network @@ -4789,7 +4789,7 @@ # from data/REST-CORE-CD %ifarch x86_64 Requires: kernel-desktop -#else +%else Requires: kernel-default %endif Requires: kernel-firmware @@ -5121,7 +5121,7 @@ # from data/REST-CD %ifarch x86_64 Requires: kernel-desktop -#else +%else Requires: kernel-default %endif Requires: kernel-firmware @@ -5167,7 +5167,7 @@ %ifarch x86_64 # kernel modules Recommends: ndiswrapper-kmp-desktop -#else +%else Recommends: ndiswrapper-kmp-default %endif # network @@ -5743,7 +5743,7 @@ # from data/REST-CD %ifarch x86_64 Requires: kernel-desktop -#else +%else Requires: kernel-default %endif Requires: kernel-firmware @@ -5789,7 +5789,7 @@ %ifarch x86_64 # kernel modules Recommends: ndiswrapper-kmp-desktop -#else +%else Recommends: ndiswrapper-kmp-default %endif # network -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-iscsi-lio-server for openSUSE:Factory
by root＠hilbert.suse.de 14 Apr '14

14 Apr '14

Hello community, here is the log from the commit of package yast2-iscsi-lio-server for openSUSE:Factory checked in at 2014-04-14 21:21:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-iscsi-lio-server (Old) and /work/SRC/openSUSE:Factory/.yast2-iscsi-lio-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-iscsi-lio-server" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-iscsi-lio-server/yast2-iscsi-lio-server.changes 2014-01-23 15:59:05.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-iscsi-lio-server.new/yast2-iscsi-lio-server.changes 2014-04-14 21:21:12.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Apr 14 10:49:19 CEST 2014 - gs(a)suse.de + +- name of firewall service is service:target +- 3.1.4 + +------------------------------------------------------------------- Old: ---- yast2-iscsi-lio-server-3.1.3.tar.bz2 New: ---- yast2-iscsi-lio-server-3.1.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-iscsi-lio-server.spec ++++++ --- /var/tmp/diff_new_pack.Yve3M4/_old 2014-04-14 21:21:13.000000000 +0200 +++ /var/tmp/diff_new_pack.Yve3M4/_new 2014-04-14 21:21:13.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-iscsi-lio-server -Version: 3.1.3 +Version: 3.1.4 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-iscsi-lio-server-3.1.3.tar.bz2 -> yast2-iscsi-lio-server-3.1.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-lio-server-3.1.3/MAINTAINER new/yast2-iscsi-lio-server-3.1.4/MAINTAINER --- old/yast2-iscsi-lio-server-3.1.3/MAINTAINER 2014-01-15 09:20:31.000000000 +0100 +++ new/yast2-iscsi-lio-server-3.1.4/MAINTAINER 2014-04-14 12:55:39.000000000 +0200 @@ -1 +1 @@ -Thomas Fehr <fehr(a)suse.de> +Gabriele Mohr <gs(a)suse.de> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-lio-server-3.1.3/package/yast2-iscsi-lio-server.changes new/yast2-iscsi-lio-server-3.1.4/package/yast2-iscsi-lio-server.changes --- old/yast2-iscsi-lio-server-3.1.3/package/yast2-iscsi-lio-server.changes 2014-01-15 09:20:31.000000000 +0100 +++ new/yast2-iscsi-lio-server-3.1.4/package/yast2-iscsi-lio-server.changes 2014-04-14 12:55:39.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Apr 14 10:49:19 CEST 2014 - gs(a)suse.de + +- name of firewall service is service:target +- 3.1.4 + +------------------------------------------------------------------- Tue Jan 14 13:06:31 CET 2014 - gs(a)suse.de - use /etc/iet/ietd.conf instead of /etc/ietd.conf (bnc#800956) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-lio-server-3.1.3/package/yast2-iscsi-lio-server.spec new/yast2-iscsi-lio-server-3.1.4/package/yast2-iscsi-lio-server.spec --- old/yast2-iscsi-lio-server-3.1.3/package/yast2-iscsi-lio-server.spec 2014-01-15 09:20:31.000000000 +0100 +++ new/yast2-iscsi-lio-server-3.1.4/package/yast2-iscsi-lio-server.spec 2014-04-14 12:55:39.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-iscsi-lio-server -Version: 3.1.3 +Version: 3.1.4 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-lio-server-3.1.3/src/include/iscsi-lio-server/dialogs.rb new/yast2-iscsi-lio-server-3.1.4/src/include/iscsi-lio-server/dialogs.rb --- old/yast2-iscsi-lio-server-3.1.3/src/include/iscsi-lio-server/dialogs.rb 2014-01-15 09:20:31.000000000 +0100 +++ new/yast2-iscsi-lio-server-3.1.4/src/include/iscsi-lio-server/dialogs.rb 2014-04-14 12:55:39.000000000 +0200 @@ -268,7 +268,7 @@ IscsiLioServer.method(:SetStartService), "void (boolean)" ), - # radio button (starting iscsitarget service - option 1) + # radio button (starting LIO target service - option 1) "start_auto_button" => _( "When &Booting" ), @@ -287,7 +287,7 @@ ), # firewall "firewall" => CWMFirewallInterfaces.CreateOpenFirewallWidget( - { "services" => ["service:iscsitarget"], "display_details" => true } + { "services" => ["service:target"], "display_details" => true } ), # discovery authentication dialog "global_config" => { -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit telepathy-qt5 for openSUSE:Factory
by root＠hilbert.suse.de 14 Apr '14

14 Apr '14

Hello community, here is the log from the commit of package telepathy-qt5 for openSUSE:Factory checked in at 2014-04-14 20:50:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/telepathy-qt5 (Old) and /work/SRC/openSUSE:Factory/.telepathy-qt5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "telepathy-qt5" Changes: -------- New Changes file: --- /dev/null 2014-02-13 01:09:38.344032506 +0100 +++ /work/SRC/openSUSE:Factory/.telepathy-qt5.new/telepathy-qt5.changes 2014-04-14 20:50:11.000000000 +0200 @@ -0,0 +1,5 @@ +------------------------------------------------------------------- +Sun Apr 13 23:18:25 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Activate telepathy-qt5 package + New: ---- 0005-Start-0.9.4-development.patch 0006-farsight-Fix-linking.patch 0007-Link-telepathy-qt4-farsight-against-gobject.patch 0009-glib-Disable-tp_tests_connection_run_until_contact_b.patch 0010-cmake-Require-tp-glib-0.18.patch 0012-Fix-warning-in-DBusTubeChannel.patch 0013-Fix-storing-avatars-so-that-they-are-not-stored-mill.patch 0015-Fix-stack-overflow-in-SimpleObserver-create.patch 0017-Remove-references-to-deprecated-tp_channel_borrow_im.patch 0018-tests-sync-simple-channel-dispatch-operation.c-from-.patch 0019-Removing-old-Farsight-files.patch 0021-account-add-method-Account-createDbusTubeRoom.patch 0023-Kill-the-last-bits-of-Farsight.patch 0024-Fix-compilation-on-new-versions-of-cmake.patch 0025-Fix-build-for-Qt5-release.patch 0026-Fix-tests-build-for-Qt5-release.patch 0027-Fix-TestKeyFile-sort-list-before-comparing.patch 0028-Fix-TestAccountSet-testFilters.patch 0029-Fix-TestDBusProxyFactory-testDropRefs.patch 0030-Fix-HandledChannelNotifier-for-Qt5.patch 0031-Update-to-spec-0.27.3.patch 0032-Update-changes-from-Channel_Dispatcher_Future.patch 0033-Update-test-library-to-match-spec-changes.patch 0034-Add-Room-Subject-RoomConfig-interfaces-to-generation.patch 0035-Fix-ChannelDispatcher.Messages-test.patch 0036-Fix-moc-command-for-Qt5.2.patch 0037-Simplify-FindQt5.cmake.patch 0038-Allow-compilation-when-only-qmake-qt4-is-in-the-path.patch 0039-Add-Q_UNUSED-as-Q_ASSERT-is-a-no-op-in-release-mode.patch 0040-Add-5-to-pkg-config-package-names-for-Qt5.patch search-for-farstream0.2.diff search-for-gstreamer1.0.diff search-for-telepathy-farstream-0.4.diff telepathy-qt-0.9.3.tar.gz telepathy-qt5.changes telepathy-qt5.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ telepathy-qt5.spec ++++++ # # spec file for package telepathy-qt5 # # 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/ # %define libname libtelepathy-qt5 %define major 0 # farstream and gstreamer are disabled at the moment - until we get qtgstreamer with gst1.0 API support %define farstream 0 %define gstreamer1 0 Name: telepathy-qt5 Version: 0.9.3 Release: 0 Summary: Qt4 bindings for the Telepathy Library License: LGPL-2.1+ Group: Development/Tools/Other Url: http://telepathy.freedesktop.org/ Source: http://telepathy.freedesktop.org/releases/telepathy-qt/telepathy-qt-%{versi… # PATCH-FIX-UPSTREAM search-for-farstream0.2.diff -- searches for farstream0.2, instead of deprecated 0.1 Patch1: search-for-farstream0.2.diff # PATCH-FIX-UPSTREAM search-for-gstreamer1.0.diff -- searches for gstreamer1.0, which is only required for includes Patch2: search-for-gstreamer1.0.diff # PATCH-FIX-UPSTREAM search-for-telepathy-farstream-0.4.diff -- searches for telepathy-farstream-0.4 Patch3: search-for-telepathy-farstream-0.4.diff # PATCHES 4- 33 are from upstream git Patch4: 0005-Start-0.9.4-development.patch Patch5: 0006-farsight-Fix-linking.patch Patch6: 0007-Link-telepathy-qt4-farsight-against-gobject.patch Patch7: 0009-glib-Disable-tp_tests_connection_run_until_contact_b.patch Patch8: 0010-cmake-Require-tp-glib-0.18.patch Patch9: 0012-Fix-warning-in-DBusTubeChannel.patch Patch10: 0013-Fix-storing-avatars-so-that-they-are-not-stored-mill.patch Patch11: 0015-Fix-stack-overflow-in-SimpleObserver-create.patch Patch12: 0017-Remove-references-to-deprecated-tp_channel_borrow_im.patch Patch13: 0018-tests-sync-simple-channel-dispatch-operation.c-from-.patch Patch14: 0019-Removing-old-Farsight-files.patch Patch15: 0021-account-add-method-Account-createDbusTubeRoom.patch Patch16: 0023-Kill-the-last-bits-of-Farsight.patch Patch17: 0024-Fix-compilation-on-new-versions-of-cmake.patch Patch18: 0025-Fix-build-for-Qt5-release.patch Patch19: 0026-Fix-tests-build-for-Qt5-release.patch Patch20: 0027-Fix-TestKeyFile-sort-list-before-comparing.patch Patch21: 0028-Fix-TestAccountSet-testFilters.patch Patch22: 0029-Fix-TestDBusProxyFactory-testDropRefs.patch Patch23: 0030-Fix-HandledChannelNotifier-for-Qt5.patch Patch24: 0031-Update-to-spec-0.27.3.patch Patch25: 0032-Update-changes-from-Channel_Dispatcher_Future.patch Patch26: 0033-Update-test-library-to-match-spec-changes.patch Patch27: 0034-Add-Room-Subject-RoomConfig-interfaces-to-generation.patch Patch28: 0035-Fix-ChannelDispatcher.Messages-test.patch Patch29: 0036-Fix-moc-command-for-Qt5.2.patch Patch30: 0037-Simplify-FindQt5.cmake.patch Patch31: 0038-Allow-compilation-when-only-qmake-qt4-is-in-the-path.patch Patch32: 0039-Add-Q_UNUSED-as-Q_ASSERT-is-a-no-op-in-release-mode.patch Patch33: 0040-Add-5-to-pkg-config-package-names-for-Qt5.patch BuildRequires: cmake BuildRequires: dbus-1-python BuildRequires: fdupes # FIXME patch, or make upstream look for qhelpgenerator-qt5 first #BuildRequires: libqt5-qttools-devel #BuildRequires: doxygen BuildRequires: libxml2-devel BuildRequires: python-xml BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5DBus) BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5Network) BuildRequires: pkgconfig(Qt5Test) BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5Xml) BuildRequires: pkgconfig(telepathy-glib) %if %farstream %if %gstreamer1 BuildRequires: pkgconfig(farstream-0.2) BuildRequires: pkgconfig(gstreamer-1.0) BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) BuildRequires: pkgconfig(telepathy-farstream) %else BuildRequires: pkgconfig(farstream-0.1) BuildRequires: pkgconfig(gstreamer-0.10) BuildRequires: pkgconfig(gstreamer-plugins-base-0.10) BuildRequires: pkgconfig(telepathy-farstream-0.4) %endif %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Telepathy-Qt4 is a high-level binding for Telepathy, similar to telepathy-glib but for Qt 4. %package -n %{libname}-%{major} Summary: Library for performing syntax highlighting in Qt documents Group: Development/Tools/Other %description -n %{libname}-%{major} Telepathy-Qt4 is a high-level binding for Telepathy, similar to telepathy-glib but for Qt 4. %if %farstream %package -n %{libname}-farstream%{major} Summary: Library for performing syntax highlighting in Qt documents Group: Development/Tools/Other Obsoletes: %{libname}-farsight%{major} %description -n %{libname}-farstream%{major} Telepathy-farstream-Qt4 is a high-level binding for Telepathy, similar to telepathy-glib but for Qt 4. %endif %package devel Summary: Header files, libraries and development documentation for %{name} Group: Development/Libraries/C and C++ Requires: %{libname}-%{major} = %{version} %if %farstream Requires: %{libname}-farstream%{major} = %{version} %if %gstreamer1 Requires: pkgconfig(gstreamer-1.0) Requires: pkgconfig(gstreamer-plugins-base-1.0) %else Requires: pkgconfig(gstreamer-0.10) Requires: pkgconfig(gstreamer-plugins-base-0.10) %endif %endif %description devel This package contains the header files, static libraries and development documentation for %{name}. If you like to develop programs using %{name}, you will need to install %{name}-devel. %prep %setup -q -n telepathy-qt-%{version} %if %farstream %if %gstreamer1 %patch0 -p1 %patch1 -p1 %else %patch2 -p1 %endif %endif %patch3 -p1 %patch4 -p1 %patch5 -p1 %patch6 -p1 %patch7 -p1 %patch8 -p1 %patch9 -p1 %patch10 -p1 %patch11 -p1 %patch12 -p1 %patch13 -p1 %patch14 -p1 %patch15 -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 %patch30 -p1 %patch31 -p1 %patch32 -p1 %patch33 -p1 %build export CXXFLAGS="%{optflags}" export CFLAGS="%{optflags}" if [ %{_lib} = lib64 ]; then EXTRA_FLAGS="$EXTRA_FLAGS -DLIB_SUFFIX=64" fi mkdir build cd build cmake .. -DCMAKE_CXXFLAGS="%{optflags}" -DCMAKE_CFLAGS="%{optflags}" $EXTRA_FLAGS -DCMAKE_INSTALL_PREFIX=/usr \ -DENABLE_TESTS=FALSE -DENABLE_EXAMPLES=FALSE -DENABLE_FARSIGHT=FALSE -DENABLE_FARSTREAM=TRUE -DDISABLE_WERROR=TRUE -DDESIRED_QT_VERSION=5 make %{?_smp_mflags} %install cd build %make_install cd .. %fdupes %{buildroot} %post -n %{libname}-%{major} -p /sbin/ldconfig %postun -n %{libname}-%{major} -p /sbin/ldconfig %if %farstream %post -n %{libname}-farstream%{major} -p /sbin/ldconfig %postun -n %{libname}-farstream%{major} -p /sbin/ldconfig %endif %files -n %{libname}-%{major} %defattr(-,root,root) %{_libdir}/libtelepathy-qt5.so.* %if %farstream %files -n %{libname}-farstream%{major} %defattr(-,root,root) %{_libdir}/libtelepathy-qt5-farstream.so.* %endif %files devel %defattr(-,root,root) %doc AUTHORS ChangeLog README COPYING HACKING NEWS %{_includedir}/telepathy-qt5/ %{_libdir}/libtelepathy-qt5*.so %{_libdir}/pkgconfig/TelepathyQt5*.pc %{_libdir}/cmake/TelepathyQt5*/ %changelog ++++++ 0005-Start-0.9.4-development.patch ++++++ >From 1fbca358bfb4627697429d0429f2d0fb8073b7bb Mon Sep 17 00:00:00 2001 From: George Kiagiadakis <george.kiagiadakis(a)collabora.com> Date: Fri, 13 Jul 2012 21:40:33 +0300 Subject: [PATCH 05/40] Start 0.9.4 development --- CMakeLists.txt | 2 +- NEWS | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 998a19e..574cb60 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,7 +41,7 @@ endif(POLICY CMP0011) set(TP_QT_MAJOR_VERSION 0) set(TP_QT_MINOR_VERSION 9) set(TP_QT_MICRO_VERSION 3) -set(TP_QT_NANO_VERSION 0) +set(TP_QT_NANO_VERSION 1) set(PACKAGE_NAME telepathy-qt) diff --git a/NEWS b/NEWS index 0bd1966..0d8365d 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,14 @@ +telepathy-qt 0.9.4 (UNRELEASED) +================================= + +The "..." release. + +Enhancements: + * ... + +Fixes: + * ... + telepathy-qt 0.9.3 (2012-07-13) ================================= -- 1.9.1 ++++++ 0006-farsight-Fix-linking.patch ++++++ >From d309812522dd3f2988d99d8f66570f0aa053bc83 Mon Sep 17 00:00:00 2001 From: Dario Freddi <dario.freddi(a)collabora.com> Date: Mon, 27 Aug 2012 18:55:44 +0200 Subject: [PATCH 06/40] farsight: Fix linking Thanks to shadeslayer for the patch Reviewed-by: Dario Freddi <dario.freddi(a)collabora.com> --- TelepathyQt/Farsight/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/TelepathyQt/Farsight/CMakeLists.txt b/TelepathyQt/Farsight/CMakeLists.txt index 4cc660c..b234703 100644 --- a/TelepathyQt/Farsight/CMakeLists.txt +++ b/TelepathyQt/Farsight/CMakeLists.txt @@ -28,6 +28,8 @@ if(FARSIGHT_COMPONENTS_FOUND) target_link_libraries(telepathy-qt${QT_VERSION_MAJOR}-farsight ${QT_QTDBUS_LIBRARY} ${QT_QTCORE_LIBRARY} + ${GOBJECT_LIBRARIES} + ${TELEPATHY_GLIB_LIBRARIES} ${TELEPATHY_FARSIGHT_LIBRARIES} ${GSTREAMER_INTERFACE_LIBRARY} telepathy-qt${QT_VERSION_MAJOR} -- 1.9.1 ++++++ 0007-Link-telepathy-qt4-farsight-against-gobject.patch ++++++ >From 2414ecb2482a80a805d824ddf0258cb120fd9d9b Mon Sep 17 00:00:00 2001 From: Ken VanDine <ken.vandine(a)canonical.com> Date: Mon, 27 Aug 2012 19:00:42 +0200 Subject: [PATCH 07/40] Link telepathy-qt4-farsight against gobject Reviewed-by: Dario Freddi <dario.freddi(a)collabora.com> --- TelepathyQt/Farstream/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/TelepathyQt/Farstream/CMakeLists.txt b/TelepathyQt/Farstream/CMakeLists.txt index 3ea6cec..250bfdb 100644 --- a/TelepathyQt/Farstream/CMakeLists.txt +++ b/TelepathyQt/Farstream/CMakeLists.txt @@ -41,6 +41,7 @@ if(FARSTREAM_COMPONENTS_FOUND) target_link_libraries(telepathy-qt${QT_VERSION_MAJOR}-farstream ${QT_QTDBUS_LIBRARY} ${QT_QTCORE_LIBRARY} + ${GOBJECT_LIBRARIES} ${TELEPATHY_FARSTREAM_LIBRARIES} ${TELEPATHY_GLIB_LIBRARIES} telepathy-qt${QT_VERSION_MAJOR} -- 1.9.1 ++++++ 0009-glib-Disable-tp_tests_connection_run_until_contact_b.patch ++++++ >From 6c05efa268c80947060929dc8fe6f2d4cd7d5a15 Mon Sep 17 00:00:00 2001 From: Dario Freddi <dario.freddi(a)collabora.com> Date: Mon, 27 Aug 2012 19:28:24 +0200 Subject: [PATCH 09/40] glib: Disable tp_tests_connection_run_until_contact_by_id to avoid requiring 0.19.x --- tests/lib/glib/util.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/lib/glib/util.c b/tests/lib/glib/util.c index 21d3855..f0bcd96 100644 --- a/tests/lib/glib/util.c +++ b/tests/lib/glib/util.c @@ -431,6 +431,9 @@ tp_tests_connection_assert_disconnect_succeeds (TpConnection *connection) g_object_unref (result); } +/* The following blocks require tp-glib 0.19 to compile. However, tp_tests_connection_run_until_contact_by_id + is never used in our code, so we simply disable its compilation. */ +#if 0 static void one_contact_cb (GObject *object, GAsyncResult *result, @@ -463,3 +466,4 @@ tp_tests_connection_run_until_contact_by_id (TpConnection *connection, return contact; } +#endif -- 1.9.1 ++++++ 0010-cmake-Require-tp-glib-0.18.patch ++++++ >From 4f562709551fdfad6587a14332466937061b8beb Mon Sep 17 00:00:00 2001 From: Dario Freddi <dario.freddi(a)collabora.com> Date: Mon, 27 Aug 2012 19:28:49 +0200 Subject: [PATCH 10/40] cmake: Require tp-glib 0.18 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 574cb60..2e52f27 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -185,7 +185,7 @@ macro_log_feature(HAVE_TEST_PYTHON "dbus-python" if(ENABLE_TESTS OR ENABLE_FARSTREAM OR ENABLE_FARSIGHT) # Find telepathy-glib - set(TELEPATHY_GLIB_MIN_VERSION 0.17.5) + set(TELEPATHY_GLIB_MIN_VERSION 0.18.0) find_package(TelepathyGlib) macro_log_feature(TELEPATHYGLIB_FOUND "Telepathy-glib" "Glib bindings for Telepathy" -- 1.9.1 ++++++ 0012-Fix-warning-in-DBusTubeChannel.patch ++++++ >From 3f82f8b0c1e87718cf390f9388f177e5b0ce9f39 Mon Sep 17 00:00:00 2001 From: "Daniele E. Domenichelli" <daniele.domenichelli(a)gmail.com> Date: Fri, 1 Feb 2013 19:10:28 +0100 Subject: [PATCH 12/40] Fix warning in DBusTubeChannel Reviewed-by: Dario Freddi <drf(a)kde.org> --- TelepathyQt/dbus-tube-channel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TelepathyQt/dbus-tube-channel.cpp b/TelepathyQt/dbus-tube-channel.cpp index 001139e..a492270 100644 --- a/TelepathyQt/dbus-tube-channel.cpp +++ b/TelepathyQt/dbus-tube-channel.cpp @@ -245,7 +245,7 @@ DBusTubeChannel::~DBusTubeChannel() QString DBusTubeChannel::serviceName() const { if (!isReady(FeatureCore)) { - warning() << "DBusTubeChannel::service() used with " + warning() << "DBusTubeChannel::serviceName() used with " "FeatureCore not ready"; return QString(); } -- 1.9.1 ++++++ 0013-Fix-storing-avatars-so-that-they-are-not-stored-mill.patch ++++++ >From 8da9f7069929893bcee64dab22101134752fe618 Mon Sep 17 00:00:00 2001 From: George Kiagiadakis <george.kiagiadakis(a)collabora.com> Date: Thu, 7 Feb 2013 14:37:49 +0200 Subject: [PATCH 13/40] Fix storing avatars, so that they are not stored millions of times each The original problem lies in the fact that QFile::rename() does not overwrite existing files. Therefore it fails and the temporary file stays on the filesystem together with the already existing avatar file. Checking if the file exists before renaming solves this partially, but the problem is that this operation is not atomic. There can be many processes using tp-qt, fetching avatars at the same time from the server, and in this case we can still have a problem there. The final solution is to ignore a new avatar that has the same token as an avatar that is already on the filesystem. According to the spec, different avatars have different tokens, so if an avatar changes, the token changes as well. https://bugs.freedesktop.org/show_bug.cgi?id=47647 Reviewed-by: David Edmundson <kde(a)davidedmundson.co.uk> --- TelepathyQt/contact-manager.cpp | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/TelepathyQt/contact-manager.cpp b/TelepathyQt/contact-manager.cpp index a67e736..dfa28bc 100644 --- a/TelepathyQt/contact-manager.cpp +++ b/TelepathyQt/contact-manager.cpp @@ -1341,17 +1341,27 @@ void ContactManager::onAvatarRetrieved(uint handle, const QString &token, debug() << "Filename:" << avatarFileName; debug() << "MimeType:" << mimeType; - QTemporaryFile mimeTypeFile(mimeTypeFileName); - mimeTypeFile.open(); - mimeTypeFile.write(mimeType.toLatin1()); - mimeTypeFile.setAutoRemove(false); - mimeTypeFile.rename(mimeTypeFileName); - - QTemporaryFile avatarFile(avatarFileName); - avatarFile.open(); - avatarFile.write(data); - avatarFile.setAutoRemove(false); - avatarFile.rename(avatarFileName); + if (!QFile::exists(mimeTypeFileName)) { + QTemporaryFile mimeTypeFile(mimeTypeFileName); + if (mimeTypeFile.open()) { + mimeTypeFile.write(mimeType.toLatin1()); + mimeTypeFile.setAutoRemove(false); + if (!mimeTypeFile.rename(mimeTypeFileName)) { + mimeTypeFile.remove(); + } + } + } + + if (!QFile::exists(avatarFileName)) { + QTemporaryFile avatarFile(avatarFileName); + if (avatarFile.open()) { + avatarFile.write(data); + avatarFile.setAutoRemove(false); + if (!avatarFile.rename(avatarFileName)) { + avatarFile.remove(); + } + } + } } ContactPtr contact = lookupContactByHandle(handle); -- 1.9.1 ++++++ 0015-Fix-stack-overflow-in-SimpleObserver-create.patch ++++++ >From 819e00afb6814b58670edc15ff21ccf43e45c958 Mon Sep 17 00:00:00 2001 From: Matthias Gehre <gehre.matthias(a)gmail.com> Date: Mon, 25 Mar 2013 15:21:20 +0200 Subject: [PATCH 15/40] Fix stack overflow in SimpleObserver::create Reviewed-by: George Kiagiadakis <george.kiagiadakis(a)collabora.com> --- TelepathyQt/simple-observer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TelepathyQt/simple-observer.cpp b/TelepathyQt/simple-observer.cpp index 5985a71..e34f31c 100644 --- a/TelepathyQt/simple-observer.cpp +++ b/TelepathyQt/simple-observer.cpp @@ -379,7 +379,7 @@ SimpleObserverPtr SimpleObserver::create( const ChannelClassSpecList &channelFilter, const QList<ChannelClassFeatures> &extraChannelFeatures) { - return create(account, channelFilter, extraChannelFeatures); + return create(account, channelFilter, QString(), false, extraChannelFeatures); } /** -- 1.9.1 ++++++ 0017-Remove-references-to-deprecated-tp_channel_borrow_im.patch ++++++ >From 3de4dea2ca0338f7fa89b8c8f4f46c9547c89e3c Mon Sep 17 00:00:00 2001 From: David Edmundson <kde(a)davidedmundson.co.uk> Date: Fri, 15 Feb 2013 22:41:25 +0000 Subject: [PATCH 17/40] Remove references to deprecated tp_channel_borrow_immutable_properties and replace with tp_channel_dup_immutable_properties this allows tests to compile against newer versions of Telepathy glib Reviewed-by: Martin Klapetek <mklapetek(a)kde.org> --- tests/lib/glib/simple-channel-dispatch-operation.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/lib/glib/simple-channel-dispatch-operation.c b/tests/lib/glib/simple-channel-dispatch-operation.c index 9adc9b0..cd727de 100644 --- a/tests/lib/glib/simple-channel-dispatch-operation.c +++ b/tests/lib/glib/simple-channel-dispatch-operation.c @@ -150,7 +150,7 @@ tp_tests_simple_channel_dispatch_operation_get_property (GObject *object, tp_value_array_build (2, DBUS_TYPE_G_OBJECT_PATH, tp_proxy_get_object_path (channel), TP_HASH_TYPE_STRING_VARIANT_MAP, - tp_channel_borrow_immutable_properties (channel), + tp_channel_dup_immutable_properties (channel), G_TYPE_INVALID)); } -- 1.9.1 ++++++ 0018-tests-sync-simple-channel-dispatch-operation.c-from-.patch ++++++ >From aa8c33371e1d16267d302ddbb0f52abad7686472 Mon Sep 17 00:00:00 2001 From: David Edmundson <kde(a)davidedmundson.co.uk> Date: Mon, 17 Jun 2013 21:21:11 +0100 Subject: [PATCH 18/40] tests: sync simple-channel-dispatch-operation.c from telepahty-glib This fixed a memory leak introduced in the last commit Reviewed-by: Martin Klapetek <mklapetek(a)kde.org> --- tests/lib/glib/simple-channel-dispatch-operation.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/tests/lib/glib/simple-channel-dispatch-operation.c b/tests/lib/glib/simple-channel-dispatch-operation.c index cd727de..542b036 100644 --- a/tests/lib/glib/simple-channel-dispatch-operation.c +++ b/tests/lib/glib/simple-channel-dispatch-operation.c @@ -145,13 +145,22 @@ tp_tests_simple_channel_dispatch_operation_get_property (GObject *object, for (i = 0; i < self->priv->channels->len; i++) { TpChannel *channel = g_ptr_array_index (self->priv->channels, i); + GValue props_value = G_VALUE_INIT; + GVariant *props_variant; + + /* Yay, double conversion! But this is for tests corner case */ + props_variant = tp_channel_dup_immutable_properties (channel); + dbus_g_value_parse_g_variant (props_variant, &props_value); g_ptr_array_add (arr, tp_value_array_build (2, DBUS_TYPE_G_OBJECT_PATH, tp_proxy_get_object_path (channel), TP_HASH_TYPE_STRING_VARIANT_MAP, - tp_channel_dup_immutable_properties (channel), + g_value_get_boxed (&props_value), G_TYPE_INVALID)); + + g_variant_unref (props_variant); + g_value_unset (&props_value); } g_value_take_boxed (value, arr); -- 1.9.1 ++++++ 0019-Removing-old-Farsight-files.patch ++++++ >From 375691fb7b1d53943c0ec4f0b15dc07f0db702c9 Mon Sep 17 00:00:00 2001 From: Dario Freddi <dario.freddi(a)ispirata.com> Date: Mon, 15 Jul 2013 00:24:25 +0200 Subject: [PATCH 19/40] Removing old Farsight files. Actually, the directory was already deprecated and never triggered. This change simply cleans up the tree. Signed-off-by: Dario Freddi <dario.freddi(a)ispirata.com> Reviewed-by: David Edmundson <davidedmundson(a)kde.org> --- TelepathyQt/CMakeLists.txt | 1 - TelepathyQt/Farsight/CMakeLists.txt | 85 ------------------- TelepathyQt/Farsight/Channel | 13 --- .../Farsight/TelepathyQtFarsight-uninstalled.pc.in | 11 --- TelepathyQt/Farsight/TelepathyQtFarsight.pc.in | 11 --- .../Farsight/TelepathyQtFarsightConfig.cmake.in | 24 ------ TelepathyQt/Farsight/channel.cpp | 98 ---------------------- TelepathyQt/Farsight/channel.h | 43 ---------- TelepathyQt/Farsight/global.h | 58 ------------- 9 files changed, 344 deletions(-) delete mode 100644 TelepathyQt/Farsight/CMakeLists.txt delete mode 100644 TelepathyQt/Farsight/Channel delete mode 100644 TelepathyQt/Farsight/TelepathyQtFarsight-uninstalled.pc.in delete mode 100644 TelepathyQt/Farsight/TelepathyQtFarsight.pc.in delete mode 100644 TelepathyQt/Farsight/TelepathyQtFarsightConfig.cmake.in delete mode 100644 TelepathyQt/Farsight/channel.cpp delete mode 100644 TelepathyQt/Farsight/channel.h delete mode 100644 TelepathyQt/Farsight/global.h diff --git a/TelepathyQt/CMakeLists.txt b/TelepathyQt/CMakeLists.txt index 7577be9..06aaad7 100644 --- a/TelepathyQt/CMakeLists.txt +++ b/TelepathyQt/CMakeLists.txt @@ -845,7 +845,6 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/TelepathyQt${QT_VERSION_MAJOR}ConfigVe DESTINATION ${_TelepathyQtConfig_INSTALL_DIR} COMPONENT headers) -add_subdirectory(Farsight) add_subdirectory(Farstream) if(ENABLE_EXPERIMENTAL_SERVICE_SUPPORT) diff --git a/TelepathyQt/Farsight/CMakeLists.txt b/TelepathyQt/Farsight/CMakeLists.txt deleted file mode 100644 index b234703..0000000 --- a/TelepathyQt/Farsight/CMakeLists.txt +++ /dev/null @@ -1,85 +0,0 @@ -if(FARSIGHT_COMPONENTS_FOUND) - include_directories(${TELEPATHY_FARSIGHT_INCLUDE_DIR} - ${GSTREAMER_INCLUDE_DIR} - ${GLIB2_INCLUDE_DIR} - ${LIBXML2_INCLUDE_DIR} - ${DBUS_INCLUDE_DIR}) - - # It gets inherited from the previous directory, hence it has to be removed explicitely - remove_definitions(-DBUILDING_TP_QT) - # We are building Telepathy-Qt-Farsight - add_definitions(-DBUILDING_TP_QT_FARSIGHT -DQT_NO_KEYWORDS) - - set(telepathy_qt_farsight_SRCS - channel.cpp) - - set(telepathy_qt_farsight_HEADERS - Channel - channel.h - global.h) - - # Create the library - if (ENABLE_COMPILER_COVERAGE) - add_library(telepathy-qt${QT_VERSION_MAJOR}-farsight STATIC ${telepathy_qt_farsight_SRCS}) - else (ENABLE_COMPILER_COVERAGE) - add_library(telepathy-qt${QT_VERSION_MAJOR}-farsight SHARED ${telepathy_qt_farsight_SRCS}) - endif (ENABLE_COMPILER_COVERAGE) - # Link - target_link_libraries(telepathy-qt${QT_VERSION_MAJOR}-farsight - ${QT_QTDBUS_LIBRARY} - ${QT_QTCORE_LIBRARY} - ${GOBJECT_LIBRARIES} - ${TELEPATHY_GLIB_LIBRARIES} - ${TELEPATHY_FARSIGHT_LIBRARIES} - ${GSTREAMER_INTERFACE_LIBRARY} - telepathy-qt${QT_VERSION_MAJOR} - ${TP_QT_LIBRARY_LINKER_FLAGS}) - - # Set the correct version number - set_target_properties(telepathy-qt${QT_VERSION_MAJOR}-farsight PROPERTIES - SOVERSION ${TP_QT_ABI_VERSION} - VERSION ${TP_QT_LIBRARY_VERSION}) - - # Install the library - watch out for the correct components - if (WIN32) - install(TARGETS telepathy-qt${QT_VERSION_MAJOR}-farsight - EXPORT TelepathyQt${QT_VERSION_MAJOR}Targets - RUNTIME DESTINATION ${LIB_INSTALL_DIR} COMPONENT farsight - ARCHIVE DESTINATION ${LIB_INSTALL_DIR} COMPONENT farsight_libs) - else (WIN32) - install(TARGETS telepathy-qt${QT_VERSION_MAJOR}-farsight - EXPORT TelepathyQt${QT_VERSION_MAJOR}Targets - LIBRARY DESTINATION ${LIB_INSTALL_DIR} COMPONENT farsight - ARCHIVE DESTINATION ${LIB_INSTALL_DIR} COMPONENT farsight_libs) - endif (WIN32) - - # Install headers - install(FILES ${telepathy_qt_farsight_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/telepathy-qt${QT_VERSION_MAJOR}/TelepathyQt/Farsight - COMPONENT farsight_headers) - - # pkg-config files, only if not on windows - if (NOT WIN32) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/TelepathyQtFarsight.pc.in ${CMAKE_CURRENT_BINARY_DIR}/TelepathyQt${QT_VERSION_MAJOR}Farsight.pc) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/TelepathyQtFarsight-uninstalled.pc.in ${CMAKE_CURRENT_BINARY_DIR}/TelepathyQt${QT_VERSION_MAJOR}Farsight-uninstalled.pc) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/TelepathyQt${QT_VERSION_MAJOR}Farsight.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig COMPONENT pkgconfig) - endif (NOT WIN32) - - # Configure the actual Config file - configure_file(TelepathyQtFarsightConfig.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/TelepathyQt${QT_VERSION_MAJOR}FarsightConfig.cmake" @ONLY) - - # this file is used by to check if the installed version can be used. - macro_write_basic_cmake_version_file(${CMAKE_CURRENT_BINARY_DIR}/TelepathyQt${QT_VERSION_MAJOR}FarsightConfigVersion.cmake - ${PACKAGE_VERSION}) - - if(USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR) - set(_TelepathyQtFarsightConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/TelepathyQt${QT_VERSION_MAJOR}Farsight) - else(USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR) - set(_TelepathyQtFarsightConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/TelepathyQt${QT_VERSION_MAJOR}Farsight/cmake) - endif(USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR) - - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/TelepathyQt${QT_VERSION_MAJOR}FarsightConfigVersion.cmake - ${CMAKE_CURRENT_BINARY_DIR}/TelepathyQt${QT_VERSION_MAJOR}FarsightConfig.cmake - DESTINATION ${_TelepathyQtFarsightConfig_INSTALL_DIR} - COMPONENT headers) - -endif(FARSIGHT_COMPONENTS_FOUND) diff --git a/TelepathyQt/Farsight/Channel b/TelepathyQt/Farsight/Channel deleted file mode 100644 index ea05f89..0000000 --- a/TelepathyQt/Farsight/Channel +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt_Farsight_Channel_HEADER_GUARD_ -#define _TelepathyQt_Farsight_Channel_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt/Farsight/channel.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt/Farsight/TelepathyQtFarsight-uninstalled.pc.in b/TelepathyQt/Farsight/TelepathyQtFarsight-uninstalled.pc.in deleted file mode 100644 index 255cc0d..0000000 --- a/TelepathyQt/Farsight/TelepathyQtFarsight-uninstalled.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=/nonexistent -exec_prefix=/nonexistent -abs_top_builddir=${CMAKE_BINARY_DIR} -abs_top_srcdir=${CMAKE_SOURCE_DIR} - -Name: TelepathyQt${QT_VERSION_MAJOR}Farsight (uninstalled copy) -Description: Qt Telepathy Farsight utility library for the Telepathy framework -Version: ${PACKAGE_VERSION} -Requires.private: QtCore >= ${QT_MIN_VERSION}, QtCore < ${QT_MAX_VERSION}, QtDBus >= ${QT_MIN_VERSION}, QtDBus < ${QT_MAX_VERSION}, telepathy-glib >= ${TELEPATHY_GLIB_MIN_VERSION}, telepathy-farsight >= ${TELEPATHY_FARSIGHT_MIN_VERSION}, TelepathyQt${QT_VERSION_MAJOR} = ${PACKAGE_VERSION} -Libs: ${CMAKE_BINARY_DIR}/TelepathyQt/Farsight/libtelepathy-qt${QT_VERSION_MAJOR}-farsight.so -Cflags: -I${CMAKE_SOURCE_DIR} -I${CMAKE_BINARY_DIR} diff --git a/TelepathyQt/Farsight/TelepathyQtFarsight.pc.in b/TelepathyQt/Farsight/TelepathyQtFarsight.pc.in deleted file mode 100644 index 4a0243a..0000000 --- a/TelepathyQt/Farsight/TelepathyQtFarsight.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=${CMAKE_INSTALL_PREFIX} -exec_prefix=${CMAKE_INSTALL_PREFIX} -libdir=${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR} -includedir=${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR} - -Name: TelepathyQt${QT_VERSION_MAJOR}Farsight -Description: Qt Telepathy Farsight utility library for the Telepathy framework -Version: ${PACKAGE_VERSION} -Requires.private: QtCore >= ${QT_MIN_VERSION}, QtCore < ${QT_MAX_VERSION}, QtDBus >= ${QT_MIN_VERSION}, QtDBus < ${QT_MAX_VERSION}, telepathy-glib >= ${TELEPATHY_GLIB_MIN_VERSION}, telepathy-farsight >= ${TELEPATHY_FARSIGHT_MIN_VERSION}, TelepathyQt${QT_VERSION_MAJOR} = ${PACKAGE_VERSION} -Libs: -L${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR} -ltelepathy-qt${QT_VERSION_MAJOR}-farsight -Cflags: -I${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}/telepathy-qt${QT_VERSION_MAJOR} diff --git a/TelepathyQt/Farsight/TelepathyQtFarsightConfig.cmake.in b/TelepathyQt/Farsight/TelepathyQtFarsightConfig.cmake.in deleted file mode 100644 index 4ca27a6..0000000 --- a/TelepathyQt/Farsight/TelepathyQtFarsightConfig.cmake.in +++ /dev/null @@ -1,24 +0,0 @@ -# TelepathyQt@QT_VERSION_MAJOR@FarsightConfig.cmake is generated by CMake from TelepathyQt/TelepathyQtFarsightConfig.cmake.in. -# Any changed value in this file will be overwritten by CMake. - -if(NOT TelepathyQt@QT_VERSION_MAJOR@Farsight_FOUND) - # set the version number - set(TELEPATHY_QT@QT_VERSION_MAJOR@_FARSIGHT_VERSION_MAJOR @TP_QT_MAJOR_VERSION@) - set(TELEPATHY_QT@QT_VERSION_MAJOR@_FARSIGHT_VERSION_MINOR @TP_QT_MINOR_VERSION@) - set(TELEPATHY_QT@QT_VERSION_MAJOR@_FARSIGHT_VERSION_MICRO @TP_QT_MICRO_VERSION@) - set(TELEPATHY_QT@QT_VERSION_MAJOR@_FARSIGHT_VERSION_NANO @TP_QT_NANO_VERSION@) - set(TELEPATHY_QT@QT_VERSION_MAJOR@_FARSIGHT_VERSION @PACKAGE_VERSION@) - - # set the directories - if(NOT TELEPATHY_QT@QT_VERSION_MAJOR@_FARSIGHT_INSTALL_DIR) - set(TELEPATHY_QT@QT_VERSION_MAJOR@_FARSIGHT_INSTALL_DIR "@CMAKE_INSTALL_PREFIX@") - endif(NOT TELEPATHY_QT@QT_VERSION_MAJOR@_FARSIGHT_INSTALL_DIR) - - set(TELEPATHY_QT@QT_VERSION_MAJOR@_FARSIGHT_INCLUDE_DIR "@TELEPATHY_QT_INCLUDE_DIR@") - set(TELEPATHY_QT@QT_VERSION_MAJOR@_FARSIGHT_LIB_DIR "@TELEPATHY_QT_LIB_DIR@") - set(TELEPATHY_QT@QT_VERSION_MAJOR@_FARSIGHT_SHARE_DIR "@TELEPATHY_QT_DATA_DIR@") - - find_package(TelepathyQt@QT_VERSION_MAJOR@ REQUIRED) - - set(TELEPATHY_QT@QT_VERSION_MAJOR@_FARSIGHT_LIBRARIES telepathy-qt@QT_VERSION_MAJOR@-farsight) -endif(NOT TelepathyQt@QT_VERSION_MAJOR@Farsight_FOUND) diff --git a/TelepathyQt/Farsight/channel.cpp b/TelepathyQt/Farsight/channel.cpp deleted file mode 100644 index 9929363..0000000 --- a/TelepathyQt/Farsight/channel.cpp +++ /dev/null @@ -1,98 +0,0 @@ -/** - * This file is part of TelepathyQt - * - * @copyright Copyright (C) 2009 Collabora Ltd. <http://www.collabora.co.uk/> - * @copyright Copyright (C) 2009 Nokia Corporation - * @license LGPL 2.1 - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include <TelepathyQt/Farsight/Channel> - -#include "TelepathyQt/debug-internal.h" - -#include <TelepathyQt/Channel> -#include <TelepathyQt/Connection> -#include <TelepathyQt/StreamedMediaChannel> - -#include <telepathy-glib/automatic-client-factory.h> -#include <telepathy-glib/channel.h> -#include <telepathy-glib/connection.h> -#include <telepathy-glib/dbus.h> - -#include <telepathy-farsight/channel.h> - -namespace Tp -{ - -TfChannel *createFarsightChannel(const StreamedMediaChannelPtr &channel) -{ - if (!channel->handlerStreamingRequired()) { - warning() << "Handler streaming not required"; - return 0; - } - - TpDBusDaemon *dbus = tp_dbus_daemon_dup(0); - - if (!dbus) { - warning() << "Unable to connect to D-Bus"; - return 0; - } - - ConnectionPtr connection = channel->connection(); - - TpSimpleClientFactory *factory = (TpSimpleClientFactory *) - tp_automatic_client_factory_new (dbus); - if (!factory) { - warning() << "Unable to construct TpAutomaticClientFactory"; - g_object_unref(dbus); - return 0; - } - - TpConnection *gconnection = tp_simple_client_factory_ensure_connection (factory, - connection->objectPath().toAscii(), NULL, 0); - g_object_unref(factory); - factory = 0; - g_object_unref(dbus); - dbus = 0; - - if (!gconnection) { - warning() << "Unable to construct TpConnection"; - return 0; - } - - TpChannel *gchannel = tp_channel_new(gconnection, - channel->objectPath().toAscii(), - TP_QT_IFACE_CHANNEL_TYPE_STREAMED_MEDIA.latin1(), - (TpHandleType) channel->targetHandleType(), - channel->targetHandle(), - 0); - g_object_unref(gconnection); - gconnection = 0; - - if (!gchannel) { - warning() << "Unable to construct TpChannel"; - return 0; - } - - TfChannel *ret = tf_channel_new(gchannel); - g_object_unref(gchannel); - gchannel = 0; - - return ret; -} - -} // Tp diff --git a/TelepathyQt/Farsight/channel.h b/TelepathyQt/Farsight/channel.h deleted file mode 100644 index 97119bf..0000000 --- a/TelepathyQt/Farsight/channel.h +++ /dev/null @@ -1,43 +0,0 @@ -/** - * This file is part of TelepathyQt - * - * @copyright Copyright (C) 2009 Collabora Ltd. <http://www.collabora.co.uk/> - * @copyright Copyright (C) 2009 Nokia Corporation - * @license LGPL 2.1 - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef _TelepathyQt_Farsight_channel_h_HEADER_GUARD_ -#define _TelepathyQt_Farsight_channel_h_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#error IN_TP_QT_HEADER -#endif - -#include <TelepathyQt/Farsight/global.h> - -#include <TelepathyQt/Types> - -typedef struct _TfChannel TfChannel; - -namespace Tp -{ - -TP_QT_FS_DEPRECATED TP_QT_FS_EXPORT TfChannel *createFarsightChannel(const StreamedMediaChannelPtr &channel); - -} // Tp - -#endif diff --git a/TelepathyQt/Farsight/global.h b/TelepathyQt/Farsight/global.h deleted file mode 100644 index 9a38238..0000000 --- a/TelepathyQt/Farsight/global.h +++ /dev/null @@ -1,58 +0,0 @@ -/** - * This file is part of TelepathyQt - * - * @copyright Copyright (C) 2009 Collabora Ltd. <http://www.collabora.co.uk/> - * @copyright Copyright (C) 2009 Nokia Corporation - * @license LGPL 2.1 - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef _TelepathyQt_Farsight_global_h_HEADER_GUARD_ -#define _TelepathyQt_Farsight_global_h_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#error IN_TP_QT_HEADER -#endif - -#include <QtGlobal> - -#ifdef BUILDING_TP_QT_FARSIGHT -# define TP_QT_FS_EXPORT Q_DECL_EXPORT -#else -# define TP_QT_FS_EXPORT Q_DECL_IMPORT -#endif - -#if !defined(Q_OS_WIN) && defined(QT_VISIBILITY_AVAILABLE) -# define TP_QT_FS_NO_EXPORT __attribute__((visibility("hidden"))) -#endif - -#ifndef TP_QT_FS_NO_EXPORT -# define TP_QT_FS_NO_EXPORT -#endif - -#ifndef TP_QT_FS_DEPRECATED -# ifdef TP_QT_DEPRECATED_WARNINGS -# ifdef BUILDING_TP_QT_FARSIGHT -# define TP_QT_FS_DEPRECATED -# else -# define TP_QT_FS_DEPRECATED Q_DECL_DEPRECATED -# endif -# else -# define TP_QT_FS_DEPRECATED -# endif -#endif - -#endif -- 1.9.1 ++++++ 0021-account-add-method-Account-createDbusTubeRoom.patch ++++++ >From d007ff722c77618cbbfbdbc5c495e5b263e14f80 Mon Sep 17 00:00:00 2001 From: David Edmundson <kde(a)davidedmundson.co.uk> Date: Wed, 3 Apr 2013 23:24:34 +0200 Subject: [PATCH 21/40] account: add method Account::createDbusTubeRoom fixes fd.o #63089 Reviewed-by: Dario Freddi <dario.freddi(a)ispirata.com> --- TelepathyQt/account.cpp | 27 +++++++++++++++++++++++++++ TelepathyQt/account.h | 6 ++++++ 2 files changed, 33 insertions(+) diff --git a/TelepathyQt/account.cpp b/TelepathyQt/account.cpp index c35759a..c2ad581 100644 --- a/TelepathyQt/account.cpp +++ b/TelepathyQt/account.cpp @@ -418,6 +418,20 @@ QVariantMap dbusTubeRequest(const Tp::ContactPtr &contact, const QString &servic return request; } +QVariantMap dbusTubeRoomRequest(const QString &roomName, const QString &serviceName) +{ + QVariantMap request; + request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".ChannelType"), + TP_QT_IFACE_CHANNEL_TYPE_DBUS_TUBE); + request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandleType"), + (uint) Tp::HandleTypeRoom); + request.insert(TP_QT_IFACE_CHANNEL_TYPE_DBUS_TUBE + QLatin1String(".ServiceName"), + serviceName); + request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetID"), + roomName); + return request; +} + QVariantMap conferenceCommonRequest(const QString &channelType, Tp::HandleType targetHandleType, const QList<Tp::ChannelPtr> &channels) { @@ -2892,6 +2906,19 @@ PendingChannelRequest* Account::createDBusTube( preferredHandler, true, hints); } +PendingChannelRequest* Account::createDBusTubeRoom( + const QString &room, + const QString &serviceName, + const QDateTime &userActionTime, + const QString &preferredHandler, + const ChannelRequestHints &hints) +{ + QVariantMap request = dbusTubeRoomRequest(room, serviceName); + + return new PendingChannelRequest(AccountPtr(this), request, userActionTime, + preferredHandler, true, hints); +} + /** * Start a request to create a conference media call with the given * channels \a channels. diff --git a/TelepathyQt/account.h b/TelepathyQt/account.h index e1e00c3..72f858f 100644 --- a/TelepathyQt/account.h +++ b/TelepathyQt/account.h @@ -330,6 +330,12 @@ public: const QDateTime &userActionTime = QDateTime::currentDateTime(), const QString &preferredHandler = QString(), const ChannelRequestHints &hints = ChannelRequestHints()); + PendingChannelRequest *createDBusTubeRoom( + const QString &room, + const QString &serviceName, + const QDateTime &userActionTime = QDateTime::currentDateTime(), + const QString &preferredHandler = QString(), + const ChannelRequestHints &hints = ChannelRequestHints()); TP_QT_DEPRECATED PendingChannelRequest *createConferenceStreamedMediaCall( const QList<ChannelPtr> &channels, -- 1.9.1 ++++++ 0023-Kill-the-last-bits-of-Farsight.patch ++++++ >From 0f20582acc1dd952cde1bff9a1a2c093c1da9f2a Mon Sep 17 00:00:00 2001 From: Dario Freddi <dario.freddi(a)ispirata.com> Date: Mon, 15 Jul 2013 01:24:44 +0200 Subject: [PATCH 23/40] Kill the last bits of Farsight --- CMakeLists.txt | 25 ++-------------- TelepathyQt/main.dox | 4 +-- cmake/modules/FindTelepathyFarsight.cmake | 49 ------------------------------- cmake/modules/TelepathyDist.cmake | 20 ++++++------- 4 files changed, 15 insertions(+), 83 deletions(-) delete mode 100644 cmake/modules/FindTelepathyFarsight.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 2e52f27..e72f559 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -110,8 +110,6 @@ endif (${TP_QT_NANO_VERSION} EQUAL 0) option(ENABLE_EXPERIMENTAL_SERVICE_SUPPORT "Enable compilation of experimental and unstable service side bindings for Telepathy-Qt" FALSE) # Add an option for compiling examples option(ENABLE_EXAMPLES "Enable compilation of examples for Telepathy-Qt" TRUE) -# Add an option for compiling Farsight (disabled by default) -option(ENABLE_FARSIGHT "Enable compilation of Farsight bindings (deprecated)" FALSE) # Add an option for compiling Farstream option(ENABLE_FARSTREAM "Enable compilation of Farstream bindings" TRUE) # Add an option for building tests @@ -183,7 +181,7 @@ macro_log_feature(HAVE_TEST_PYTHON "dbus-python" "http://www.python.org/" FALSE "" "Needed to build some additional unit tests") -if(ENABLE_TESTS OR ENABLE_FARSTREAM OR ENABLE_FARSIGHT) +if(ENABLE_TESTS OR ENABLE_FARSTREAM) # Find telepathy-glib set(TELEPATHY_GLIB_MIN_VERSION 0.18.0) find_package(TelepathyGlib) @@ -205,16 +203,6 @@ if(ENABLE_TESTS OR ENABLE_FARSTREAM OR ENABLE_FARSIGHT) find_package(LibXml2) endif() -if(ENABLE_FARSIGHT) - # Find tp-farsight - set(TELEPATHY_FARSIGHT_MIN_VERSION "0.0.4") - find_package(TelepathyFarsight) - macro_log_feature(TELEPATHYFARSIGHT_FOUND "Telepathy-Farsight" - "A Framework for dealing with audio/video conferencing protocols" - "http://farsight.freedesktop.org/wiki/" FALSE "${TELEPATHY_FARSIGHT_MIN_VERSION}" - "Needed, together with GStreamer, to build telepathy-qt-farsight and some additional examples") -endif() - if(ENABLE_FARSTREAM) # Find tp-farstream set(FARSTREAM_MIN_VERSION "0.1.0") @@ -233,22 +221,15 @@ if(ENABLE_FARSTREAM) "Needed, together with GStreamer and Farstream, to build telepathy-qt-farstream") endif() -if(ENABLE_FARSTREAM OR ENABLE_FARSIGHT) +if(ENABLE_FARSTREAM) # Find GStreamer find_package(GStreamer) macro_log_feature(GSTREAMER_FOUND "GStreamer" "An open source multimedia framework" - "Needed, together with Tp-Farsight, to build telepathy-qt-farsight and some additional examples" + "Needed, together with Tp-Farstream, to build telepathy-qt-farstream and some additional examples" "http://www.gstreamer.net/" FALSE) endif() -# Build TelepathyQt-Farsight only if GStreamer, TelepathyFarsight and all of their dependencies were found -if (TELEPATHYFARSIGHT_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND AND TELEPATHYGLIB_FOUND AND ENABLE_FARSIGHT) - set (FARSIGHT_COMPONENTS_FOUND 1) -else (TELEPATHYFARSIGHT_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND AND TELEPATHYGLIB_FOUND AND ENABLE_FARSIGHT) - set (FARSIGHT_COMPONENTS_FOUND 0) -endif (TELEPATHYFARSIGHT_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND AND TELEPATHYGLIB_FOUND AND ENABLE_FARSIGHT) - # Build TelepathyQt-Farstream only if GStreamer, TelepathyFarstream and all of their dependencies were found if (TELEPATHYFARSTREAM_FOUND AND FARSTREAM_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND AND TELEPATHYGLIB_FOUND AND ENABLE_FARSTREAM) set (FARSTREAM_COMPONENTS_FOUND 1) diff --git a/TelepathyQt/main.dox b/TelepathyQt/main.dox index 3d5e0aa..faf4a9e 100644 --- a/TelepathyQt/main.dox +++ b/TelepathyQt/main.dox @@ -80,8 +80,8 @@ * * and to build the example VoIP call UI (examples/call), you'll need: * \li telepathy-glib <http://telepathy.freedesktop.org/releases/telepathy-glib/> - * \li telepathy-farsight - * <http://telepathy.freedesktop.org/releases/telepathy-farsight/> + * \li telepathy-farstream + * <http://telepathy.freedesktop.org/releases/telepathy-farstream/> * \li GStreamer <http://gstreamer.freedesktop.org/>\n * * Building also requires the cmake build system. diff --git a/cmake/modules/FindTelepathyFarsight.cmake b/cmake/modules/FindTelepathyFarsight.cmake deleted file mode 100644 index 65215d6..0000000 --- a/cmake/modules/FindTelepathyFarsight.cmake +++ /dev/null @@ -1,49 +0,0 @@ -# - Try to find Telepathy-Farsight -# Once done this will define -# -# TELEPATHY_FARSIGHT_FOUND - system has TelepathyFarsight -# TELEPATHY_FARSIGHT_INCLUDE_DIR - the TelepathyFarsight include directory -# TELEPATHY_FARSIGHT_LIBRARIES - the libraries needed to use TelepathyFarsight -# TELEPATHY_FARSIGHT_DEFINITIONS - Compiler switches required for using TelepathyFarsight - -# Copyright (c) 2010, Dario Freddi <dario.freddi(a)collabora.co.uk> -# -# Redistribution and use is allowed according to the terms of the BSD license. - -if (TELEPATHY_FARSIGHT_INCLUDE_DIR AND TELEPATHY_FARSIGHT_LIBRARIES) - # in cache already - set(TelepathyFarsight_FIND_QUIETLY TRUE) -else (TELEPATHY_FARSIGHT_INCLUDE_DIR AND TELEPATHY_FARSIGHT_LIBRARIES) - set(TelepathyFarsight_FIND_QUIETLY FALSE) -endif (TELEPATHY_FARSIGHT_INCLUDE_DIR AND TELEPATHY_FARSIGHT_LIBRARIES) - -if (NOT WIN32) - # use pkg-config to get the directories and then use these values - # in the find_path() and find_library() calls - find_package(PkgConfig) - if (TELEPATHY_FARSIGHT_MIN_VERSION) - PKG_CHECK_MODULES(PC_TELEPATHY_FARSIGHT telepathy-farsight>=${TELEPATHY_FARSIGHT_MIN_VERSION}) - else (TELEPATHY_FARSIGHT_MIN_VERSION) - PKG_CHECK_MODULES(PC_TELEPATHY_FARSIGHT telepathy-farsight) - endif (TELEPATHY_FARSIGHT_MIN_VERSION) - set(TELEPATHY_FARSIGHT_DEFINITIONS ${PC_TELEPATHY_FARSIGHT_CFLAGS_OTHER}) -endif (NOT WIN32) - -find_path(TELEPATHY_FARSIGHT_INCLUDE_DIR telepathy-farsight/channel.h - PATHS - ${PC_TELEPATHY_FARSIGHT_INCLUDEDIR} - ${PC_TELEPATHY_FARSIGHT_INCLUDE_DIRS} - PATH_SUFFIXES telepathy-1.0 - ) - -find_library(TELEPATHY_FARSIGHT_LIBRARIES NAMES telepathy-farsight - PATHS - ${PC_TELEPATHY_FARSIGHT_LIBDIR} - ${PC_TELEPATHY_FARSIGHT_LIBRARY_DIRS} - ) - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(TelepathyFarsight DEFAULT_MSG TELEPATHY_FARSIGHT_LIBRARIES - TELEPATHY_FARSIGHT_INCLUDE_DIR) - -mark_as_advanced(TELEPATHY_FARSIGHT_INCLUDE_DIR TELEPATHY_FARSIGHT_LIBRARIES) diff --git a/cmake/modules/TelepathyDist.cmake b/cmake/modules/TelepathyDist.cmake index 89d7071..7c179fd 100644 --- a/cmake/modules/TelepathyDist.cmake +++ b/cmake/modules/TelepathyDist.cmake @@ -78,31 +78,31 @@ if (ENABLE_CPACK) #name components set(CPACK_COMPONENT_MAINLIBRARY_DISPLAY_NAME "TelepathyQt main components") - set(CPACK_COMPONENT_FARSIGHT_DISPLAY_NAME "TelepathyQt Farsight support") + set(CPACK_COMPONENT_FARSTREAM_DISPLAY_NAME "TelepathyQt Farstream support") set(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "Development files for TelepathyQt") - set(CPACK_COMPONENT_FARSIGHT_HEADERS_DISPLAY_NAME "Development files for TelepathyQt-Farsight") + set(CPACK_COMPONENT_FARSTREAM_HEADERS_DISPLAY_NAME "Development files for TelepathyQt-Farstream") #components description set(CPACK_COMPONENT_MAINLIBRARY_DESCRIPTION "The main TelepathyQt library") - set(CPACK_COMPONENT_FARSIGHT_DESCRIPTION - "The TelepathyQt-Farsight library") + set(CPACK_COMPONENT_FARSTREAM_DESCRIPTION + "The TelepathyQt-Farstream library") set(CPACK_COMPONENT_HEADERS_DESCRIPTION "Development files for TelepathyQt") - set(CPACK_COMPONENT_FARSIGHT_HEADERS_DESCRIPTION - "Development files for TelepathyQt-Farsight") + set(CPACK_COMPONENT_FARSTREAM_HEADERS_DESCRIPTION + "Development files for TelepathyQt-Farstream") set(CPACK_COMPONENT_HEADERS_DEPENDS mainlibrary) - set(CPACK_COMPONENT_FARSIGHT_DEPENDS mainlibrary) - set(CPACK_COMPONENT_FARSIGHT_HEADERS_DEPENDS mainlibrary farsight) + set(CPACK_COMPONENT_FARSTREAM_DEPENDS mainlibrary) + set(CPACK_COMPONENT_FARSTREAM_HEADERS_DEPENDS mainlibrary farstream) #installation types set(CPACK_ALL_INSTALL_TYPES User Developer Minimal) set(CPACK_COMPONENT_MAINLIBRARY_INSTALL_TYPES User Developer Minimal) - set(CPACK_COMPONENT_FARSIGHT_INSTALL_TYPES User Developer) + set(CPACK_COMPONENT_FARSTREAM_INSTALL_TYPES User Developer) set(CPACK_COMPONENT_HEADERS_INSTALL_TYPES Developer) - set(CPACK_COMPONENT_FARSIGHT_HEADERS_INSTALL_TYPES Developer) + set(CPACK_COMPONENT_FARSTREAM_HEADERS_INSTALL_TYPES Developer) # Leave this as the last declaration, always!!! include(CPack) -- 1.9.1 ++++++ 0024-Fix-compilation-on-new-versions-of-cmake.patch ++++++ >From 05fe3f4980bbc6b016e25dcf07e44afe29e377c0 Mon Sep 17 00:00:00 2001 From: David Edmundson <kde(a)davidedmundson.co.uk> Date: Sun, 29 Sep 2013 22:19:27 +0000 Subject: [PATCH 24/40] Fix compilation on new versions of cmake Recent cmake has changed the argument count to qt4_create_moc_command, we need to adjust accordingly Reviewed-by: Dario Freddi <dario.freddi(a)ispirata.com> --- cmake/modules/FindQt.cmake | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/cmake/modules/FindQt.cmake b/cmake/modules/FindQt.cmake index c2eac76..b3131f0 100644 --- a/cmake/modules/FindQt.cmake +++ b/cmake/modules/FindQt.cmake @@ -74,10 +74,18 @@ ENDMACRO(QT_GET_MOC_FLAGS) MACRO(QT_CREATE_MOC_COMMAND infile outfile moc_flags moc_options) IF(QT_VERSION_MAJOR MATCHES 4) - QT4_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}") + IF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607) + QT4_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}" "") + ELSE(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607) + QT4_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}") + ENDIF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607) ELSE(QT_VERSION_MAJOR MATCHES 4) IF(QT_VERSION_MAJOR MATCHES 5) - QT5_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}") + IF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607) + QT5_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}" "") + ELSE(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607) + QT5_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}") + ENDIF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607) ENDIF(QT_VERSION_MAJOR MATCHES 5) ENDIF(QT_VERSION_MAJOR MATCHES 4) ENDMACRO(QT_CREATE_MOC_COMMAND) -- 1.9.1 ++++++ 0025-Fix-build-for-Qt5-release.patch ++++++ >From a074b02f8c1c6ee2fb8f15091812f0f8d9370cb5 Mon Sep 17 00:00:00 2001 From: David Edmundson <david(a)davidedmundson.co.uk> Date: Wed, 22 Jan 2014 13:03:16 -0700 Subject: [PATCH 25/40] Fix build for Qt5 release Reviewed-by: John Brooks <john.brooks(a)jolla.com> --- TelepathyQt/Farstream/channel.cpp | 6 ++-- TelepathyQt/account.cpp | 4 +-- TelepathyQt/utils.cpp | 2 +- cmake/modules/FindQt5.cmake | 68 +++++++++------------------------------ 4 files changed, 21 insertions(+), 59 deletions(-) diff --git a/TelepathyQt/Farstream/channel.cpp b/TelepathyQt/Farstream/channel.cpp index 20acee3..0cd54f9 100644 --- a/TelepathyQt/Farstream/channel.cpp +++ b/TelepathyQt/Farstream/channel.cpp @@ -90,7 +90,7 @@ PendingChannel::PendingChannel(const CallChannelPtr &channel) } TpConnection *gconnection = tp_simple_client_factory_ensure_connection (factory, - connection->objectPath().toAscii(), NULL, 0); + connection->objectPath().toLatin1(), NULL, 0); if (!gconnection) { warning() << "Unable to construct TpConnection"; setFinishedWithError(TP_QT_ERROR_NOT_AVAILABLE, @@ -101,10 +101,10 @@ PendingChannel::PendingChannel(const CallChannelPtr &channel) } TpChannel *gchannel = (TpChannel*) g_object_new(TP_TYPE_CALL_CHANNEL, - "bus-name", connection->busName().toAscii().constData(), + "bus-name", connection->busName().toLatin1().constData(), "connection", gconnection, "dbus-daemon", dbus, - "object-path", channel->objectPath().toAscii().constData(), + "object-path", channel->objectPath().toLatin1().constData(), NULL); g_object_unref(factory); factory = 0; diff --git a/TelepathyQt/account.cpp b/TelepathyQt/account.cpp index c2ad581..52025a4 100644 --- a/TelepathyQt/account.cpp +++ b/TelepathyQt/account.cpp @@ -52,7 +52,7 @@ #include <QRegExp> #include <QSharedPointer> #include <QTimer> -#include <QWeakPointer> +#include <QPointer> #include <string.h> @@ -648,7 +648,7 @@ struct Account::Private::DispatcherContext Client::ChannelDispatcherInterface *iface; bool introspected, supportsHints; - QWeakPointer<PendingVariant> introspectOp; + QPointer<PendingVariant> introspectOp; private: DispatcherContext(const DispatcherContext &); diff --git a/TelepathyQt/utils.cpp b/TelepathyQt/utils.cpp index 5b922d9..e4614c2 100644 --- a/TelepathyQt/utils.cpp +++ b/TelepathyQt/utils.cpp @@ -204,7 +204,7 @@ QVariant parseValueWithDBusSignature(const QString &value, case QVariant::StringList: { QStringList list; - QByteArray rawValue = value.toAscii(); + QByteArray rawValue = value.toLatin1(); if (KeyFile::unescapeStringList(rawValue, 0, rawValue.size(), list)) { return QVariant(list); } else { diff --git a/cmake/modules/FindQt5.cmake b/cmake/modules/FindQt5.cmake index fb30054..922ebc1 100644 --- a/cmake/modules/FindQt5.cmake +++ b/cmake/modules/FindQt5.cmake @@ -12,29 +12,12 @@ # QT_VERSION_MINOR The minor version of Qt found. # QT_VERSION_PATCH The patch version of Qt found. # -# QT_BINARY_DIR Path to "bin" of Qt4 -# QT_DOC_DIR Path to "doc" of Qt4 -# -# QT_QTCORE_FOUND True if QtCore was found. -# QT_QTGUI_FOUND True if QtGui was found. -# QT_QTDBUS_FOUND True if QtDBus was found. -# QT_QTNETWORK_FOUND True if QtNetwork was found. -# QT_QTTEST_FOUND True if QtTest was found. -# QT_QTWIDGETS_FOUND True if QtWidgets was found. -# QT_QTXML_FOUND True if QtXml was found. +# QT_BINARY_DIR Path to "bin" of Qt5 +# QT_DOC_DIR Path to "doc" of Qt5 # # QT_INCLUDES List of paths to all include directories of Qt5. -# QT_INCLUDE_DIR Path to "include" of Qt4 -# QT_QTCORE_INCLUDE_DIR Path to "include/QtCore" -# QT_QTDBUS_INCLUDE_DIR Path to "include/QtDBus" -# QT_QTGUI_INCLUDE_DIR Path to "include/QtGui" -# QT_QTNETWORK_INCLUDE_DIR Path to "include/QtNetwork" -# QT_QTTEST_INCLUDE_DIR Path to "include/QtTest" -# QT_QTWIDGETS_INCLUDE_DIR Path to "include/QtWidgets" -# QT_QTXML_INCLUDE_DIR Path to "include/QtXml" # # QT_LIBRARIES List of paths to all libraries of Qt5. -# QT_LIBRARY_DIR Path to "lib" of Qt4 # QT_QTCORE_LIBRARY The QtCore library # QT_QTDBUS_LIBRARY The QtDBus library # QT_QTGUI_LIBRARY The QtGui library @@ -79,43 +62,20 @@ ENDIF(NOT QTVERSION MATCHES "5.*") FIND_PACKAGE(PkgConfig REQUIRED) -IF(NOT Qt5_FIND_COMPONENTS) - SET(_COMPONENTS QtCore QtDBus QtGui QtNetwork QtTest QtWidgets QtXml) -ELSE(NOT Qt5_FIND_COMPONENTS) - SET(_COMPONENTS ${Qt5_FIND_COMPONENTS}) -ENDIF(NOT Qt5_FIND_COMPONENTS) - -FOREACH(_COMPONENT ${_COMPONENTS}) - STRING(TOUPPER ${_COMPONENT} _COMPONENT_UPPER) - IF(NOT QT_${_COMPONENT_UPPER}_FOUND) - IF(Qt5_FIND_REQUIRED) - PKG_CHECK_MODULES(PC_${_COMPONENT} REQUIRED ${_COMPONENT}>=${QT_MIN_VERSION}) - ELSE(Qt5_FIND_REQUIRED) - PKG_CHECK_MODULES(PC_${_COMPONENT} QUIET ${_COMPONENT}>=${QT_MIN_VERSION}) - ENDIF(Qt5_FIND_REQUIRED) - - SET(QT_${_COMPONENT_UPPER}_INCLUDE_DIR ${PC_${_COMPONENT}_INCLUDE_DIRS}) +FIND_PACKAGE(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core DBus Gui Network Test Widgets Xml) - FIND_LIBRARY(QT_${_COMPONENT_UPPER}_LIBRARY - NAMES ${_COMPONENT} - HINTS - ${PC_${_COMPONENT}_LIBDIR}) +# Copy includes and library names into the same style as pkgconfig used for Qt4 +set(QT_INCLUDES ${Qt5Core_INCLUDE_DIRS} ${Qt5DBus_INCLUDE_DIRS} ${Qt5Gui_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS} ${Qt5Test_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS}) - SET(QT_${_COMPONENT_UPPER}_FOUND ${PC_${_COMPONENT}_FOUND}) +set(QT_QTCORE_LIBRARY ${Qt5Core_LIBRARIES}) +set(QT_QTDBUS_LIBRARY ${Qt5DBus_LIBRARIES}) +set(QT_QTGUI_LIBRARY ${Qt5Gui_LIBRARIES}) +set(QT_QTNETWORK_LIBRARY ${Qt5Network_LIBRARIES}) +set(QT_QTTEST_LIBRARY ${Qt5Test_LIBRARIES}) +set(QT_QTWIDGETS_LIBRARY ${Qt5Widgets_LIBRARIES}) +set(QT_QTXML_LIBRARY ${Qt5Xml_LIBRARIES}) - #MESSAGE(STATUS "COMPONENT ${_COMPONENT_UPPER}:") - #MESSAGE(STATUS " QT_${_COMPONENT_UPPER}_LIBRARY: ${QT_${_COMPONENT_UPPER}_LIBRARY}") - #MESSAGE(STATUS " QT_${_COMPONENT_UPPER}_INCLUDE_DIR: ${QT_${_COMPONENT_UPPER}_INCLUDE_DIR}") - #MESSAGE(STATUS " QT_${_COMPONENT_UPPER}_FOUND: ${QT_${_COMPONENT_UPPER}_FOUND}") - - SET(QT_INCLUDES ${QT_INCLUDES} ${QT_${_COMPONENT_UPPER}_INCLUDE_DIR}) - SET(QT_LIBRARIES ${QT_LIBRARIES} ${QT_${_COMPONENT_UPPER}_INCLUDE_DIR}) - MARK_AS_ADVANCED(QT_${_COMPONENT_UPPER}_LIBRARY QT_${_COMPONENT_UPPER}_INCLUDE_DIR) - ENDIF(NOT QT_${_COMPONENT_UPPER}_FOUND) -ENDFOREACH(_COMPONENT) - -#MESSAGE(STATUS "QT_LIBRARIES: ${QT_LIBRARIES}") -#MESSAGE(STATUS "QT_INCLUDES: ${QT_INCLUDES}") +set(QT_LIBRARIES ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTTEST_LIBRARY} ${QT_QTWIDGETS_LIBRARY} ${QT_QTXML_LIBRARY}) STRING(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" QT_VERSION_MAJOR "${QTVERSION}") STRING(REGEX REPLACE "^[0-9]+\\.([0-9])+\\.[0-9]+.*" "\\1" QT_VERSION_MINOR "${QTVERSION}") @@ -158,6 +118,8 @@ EXECUTE_PROCESS(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable qt_config QtCore RESULT_VARIABLE _pkgconfig_failed) STRING(REPLACE " " ";" QT_CONFIG_FLAGS "${_pkgconfig_flags}") +SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") + INCLUDE(Qt5Macros) SET(QT_FOUND TRUE) -- 1.9.1 ++++++ 0026-Fix-tests-build-for-Qt5-release.patch ++++++ >From de35be668db0e31b3fe1114e0885b6506ed30eba Mon Sep 17 00:00:00 2001 From: John Brooks <john.brooks(a)jollamobile.com> Date: Wed, 22 Jan 2014 13:22:48 -0700 Subject: [PATCH 26/40] Fix tests build for Qt5 release Reviewed-by: David Edmundson <davidedmundson(a)kde.org> --- tests/dbus/account-channel-dispatcher.cpp | 2 +- tests/dbus/chan-basics.cpp | 2 +- tests/dbus/chan-conference.cpp | 10 +++++----- tests/dbus/chan-group.cpp | 2 +- tests/dbus/client-factories.cpp | 4 ++-- tests/dbus/client.cpp | 4 ++-- tests/dbus/contact-messenger.cpp | 2 +- tests/dbus/contact-search-chan.cpp | 4 ++-- tests/dbus/properties.cpp | 2 +- tests/dbus/stream-tube-handlers.cpp | 2 +- tests/dbus/streamed-media-chan.cpp | 2 +- tests/dbus/text-chan.cpp | 4 ++-- 12 files changed, 20 insertions(+), 20 deletions(-) diff --git a/tests/dbus/account-channel-dispatcher.cpp b/tests/dbus/account-channel-dispatcher.cpp index 510a163..8f7f634 100644 --- a/tests/dbus/account-channel-dispatcher.cpp +++ b/tests/dbus/account-channel-dispatcher.cpp @@ -1061,7 +1061,7 @@ void TestAccountChannelDispatcher::testCreateAndHandleChannelHandledAgain() guint handle = tp_handle_ensure(contactRepo, "someone@localhost", 0, 0); mChanPath = mConn->objectPath() + QLatin1String("/TextChannel"); - QByteArray chanPath(mChanPath.toAscii()); + QByteArray chanPath(mChanPath.toLatin1()); ExampleEcho2Channel *textChanService = EXAMPLE_ECHO_2_CHANNEL(g_object_new( EXAMPLE_TYPE_ECHO_2_CHANNEL, "connection", mConn->service(), diff --git a/tests/dbus/chan-basics.cpp b/tests/dbus/chan-basics.cpp index 8596060..a3a00da 100644 --- a/tests/dbus/chan-basics.cpp +++ b/tests/dbus/chan-basics.cpp @@ -229,7 +229,7 @@ void TestChanBasics::testFallback() guint handle = tp_handle_ensure(contactRepo, "someone@localhost", 0, 0); QString textChanPath = mConn->objectPath() + QLatin1String("/Channel"); - QByteArray chanPath(textChanPath.toAscii()); + QByteArray chanPath(textChanPath.toLatin1()); TpTestsTextChannelNull *textChanService = TP_TESTS_TEXT_CHANNEL_NULL (g_object_new ( TP_TESTS_TYPE_TEXT_CHANNEL_NULL, diff --git a/tests/dbus/chan-conference.cpp b/tests/dbus/chan-conference.cpp index 830fa97..1b074d6 100644 --- a/tests/dbus/chan-conference.cpp +++ b/tests/dbus/chan-conference.cpp @@ -98,7 +98,7 @@ void TestConferenceChan::initTestCase() GPtrArray *initialChannels = g_ptr_array_new(); mTextChan1Path = mConn->objectPath() + QLatin1String("/TextChannel/1"); - chanPath = mTextChan1Path.toAscii(); + chanPath = mTextChan1Path.toLatin1(); mTextChan1Service = EXAMPLE_ECHO_CHANNEL(g_object_new( EXAMPLE_TYPE_ECHO_CHANNEL, "connection", mConn->service(), @@ -108,7 +108,7 @@ void TestConferenceChan::initTestCase() g_ptr_array_add(initialChannels, g_strdup(chanPath.data())); mTextChan2Path = mConn->objectPath() + QLatin1String("/TextChannel/2"); - chanPath = mTextChan2Path.toAscii(); + chanPath = mTextChan2Path.toLatin1(); mTextChan2Service = EXAMPLE_ECHO_CHANNEL(g_object_new( EXAMPLE_TYPE_ECHO_CHANNEL, "connection", mConn->service(), @@ -119,7 +119,7 @@ void TestConferenceChan::initTestCase() // let's not add this one to initial channels mTextChan3Path = mConn->objectPath() + QLatin1String("/TextChannel/3"); - chanPath = mTextChan3Path.toAscii(); + chanPath = mTextChan3Path.toLatin1(); mTextChan3Service = EXAMPLE_ECHO_CHANNEL(g_object_new( EXAMPLE_TYPE_ECHO_CHANNEL, "connection", mConn->service(), @@ -128,7 +128,7 @@ void TestConferenceChan::initTestCase() NULL)); mConferenceChanPath = mConn->objectPath() + QLatin1String("/ConferenceChannel"); - chanPath = mConferenceChanPath.toAscii(); + chanPath = mConferenceChanPath.toLatin1(); mConferenceChanService = TP_TESTS_CONFERENCE_CHANNEL(g_object_new( TP_TESTS_TYPE_CONFERENCE_CHANNEL, "connection", mConn->service(), @@ -229,7 +229,7 @@ void TestConferenceChan::testConference() SLOT(onConferenceChannelRemoved(const Tp::ChannelPtr &, const Tp::Channel::GroupMemberChangeDetails &)))); tp_tests_conference_channel_remove_channel (mConferenceChanService, - mChannelMerged->objectPath().toAscii().data()); + mChannelMerged->objectPath().toLatin1().data()); while (!mChannelRemovedDetailed) { QCOMPARE(mLoop->exec(), 0); } diff --git a/tests/dbus/chan-group.cpp b/tests/dbus/chan-group.cpp index b516a1a..6ccc8ad 100644 --- a/tests/dbus/chan-group.cpp +++ b/tests/dbus/chan-group.cpp @@ -448,7 +448,7 @@ void TestChanGroup::testGroupFlagsChange() guint handle = tp_handle_ensure(contactRepo, "someone@localhost", 0, 0); QString textChanPath = mConn->objectPath() + QLatin1String("/Channel"); - QByteArray chanPath(textChanPath.toAscii()); + QByteArray chanPath(textChanPath.toLatin1()); TpTestsPropsGroupTextChannel *textChanService = TP_TESTS_PROPS_GROUP_TEXT_CHANNEL(g_object_new( TP_TESTS_TYPE_PROPS_GROUP_TEXT_CHANNEL, diff --git a/tests/dbus/client-factories.cpp b/tests/dbus/client-factories.cpp index 1f7b7fa..719007b 100644 --- a/tests/dbus/client-factories.cpp +++ b/tests/dbus/client-factories.cpp @@ -516,7 +516,7 @@ void TestClientFactories::initTestCase() guint handle = tp_handle_ensure(mContactRepo, "someone@localhost", 0, 0); mText1ChanPath = mConnPath + QLatin1String("/TextChannel1"); - QByteArray chanPath(mText1ChanPath.toAscii()); + QByteArray chanPath(mText1ChanPath.toLatin1()); mText1ChanService = EXAMPLE_ECHO_CHANNEL(g_object_new( EXAMPLE_TYPE_ECHO_CHANNEL, "connection", mConnService, @@ -525,7 +525,7 @@ void TestClientFactories::initTestCase() NULL)); mText2ChanPath = mConnPath + QLatin1String("/TextChannel2"); - chanPath = mText2ChanPath.toAscii(); + chanPath = mText2ChanPath.toLatin1(); mText2ChanService = EXAMPLE_ECHO_CHANNEL(g_object_new( EXAMPLE_TYPE_ECHO_CHANNEL, "connection", mConnService, diff --git a/tests/dbus/client.cpp b/tests/dbus/client.cpp index 20729eb..46088ae 100644 --- a/tests/dbus/client.cpp +++ b/tests/dbus/client.cpp @@ -451,7 +451,7 @@ void TestClient::initTestCase() // create a Channel by magic, rather than doing D-Bus round-trips for it mText1ChanPath = mConn->objectPath() + QLatin1String("/TextChannel1"); - QByteArray chanPath(mText1ChanPath.toAscii()); + QByteArray chanPath(mText1ChanPath.toLatin1()); mText1ChanService = EXAMPLE_ECHO_CHANNEL(g_object_new( EXAMPLE_TYPE_ECHO_CHANNEL, "connection", mConn->service(), @@ -460,7 +460,7 @@ void TestClient::initTestCase() NULL)); mText2ChanPath = mConn->objectPath() + QLatin1String("/TextChannel2"); - chanPath = mText2ChanPath.toAscii(); + chanPath = mText2ChanPath.toLatin1(); mText2ChanService = EXAMPLE_ECHO_CHANNEL(g_object_new( EXAMPLE_TYPE_ECHO_CHANNEL, "connection", mConn->service(), diff --git a/tests/dbus/contact-messenger.cpp b/tests/dbus/contact-messenger.cpp index 446f79e..4932000 100644 --- a/tests/dbus/contact-messenger.cpp +++ b/tests/dbus/contact-messenger.cpp @@ -403,7 +403,7 @@ void TestContactMessenger::initTestCase() guint handle = tp_handle_ensure(mContactRepo, "Ann", 0, 0); mMessagesChanPath = mConnPath + QLatin1String("/MessagesChannel"); - QByteArray chanPath = mMessagesChanPath.toAscii(); + QByteArray chanPath = mMessagesChanPath.toLatin1(); mMessagesChanService = EXAMPLE_ECHO_2_CHANNEL(g_object_new( EXAMPLE_TYPE_ECHO_2_CHANNEL, "connection", mConnService, diff --git a/tests/dbus/contact-search-chan.cpp b/tests/dbus/contact-search-chan.cpp index 9739d6f..220c416 100644 --- a/tests/dbus/contact-search-chan.cpp +++ b/tests/dbus/contact-search-chan.cpp @@ -114,7 +114,7 @@ void TestContactSearchChan::initTestCase() QByteArray chan1Path; mChan1Path = mConn->objectPath() + QLatin1String("/ContactSearchChannel/1"); - chan1Path = mChan1Path.toAscii(); + chan1Path = mChan1Path.toLatin1(); mChan1Service = TP_TESTS_CONTACT_SEARCH_CHANNEL(g_object_new( TP_TESTS_TYPE_CONTACT_SEARCH_CHANNEL, "connection", mConn->service(), @@ -123,7 +123,7 @@ void TestContactSearchChan::initTestCase() QByteArray chan2Path; mChan2Path = mConn->objectPath() + QLatin1String("/ContactSearchChannel/2"); - chan2Path = mChan2Path.toAscii(); + chan2Path = mChan2Path.toLatin1(); mChan2Service = TP_TESTS_CONTACT_SEARCH_CHANNEL(g_object_new( TP_TESTS_TYPE_CONTACT_SEARCH_CHANNEL, "connection", mConn->service(), diff --git a/tests/dbus/properties.cpp b/tests/dbus/properties.cpp index 31f9d2a..07fb741 100644 --- a/tests/dbus/properties.cpp +++ b/tests/dbus/properties.cpp @@ -104,7 +104,7 @@ void TestProperties::testPropertiesMonitoring() "a.random.interface", changed, NULL); tp_svc_dbus_properties_emit_properties_changed (mConnService, - mConn->interface().toAscii().data(), changed, NULL); + mConn->interface().toLatin1().data(), changed, NULL); QCOMPARE(spy.count(), 0); diff --git a/tests/dbus/stream-tube-handlers.cpp b/tests/dbus/stream-tube-handlers.cpp index ebc9a6e..fcd7937 100644 --- a/tests/dbus/stream-tube-handlers.cpp +++ b/tests/dbus/stream-tube-handlers.cpp @@ -1209,7 +1209,7 @@ void TestStreamTubeHandlers::testSSTHErrorPaths() // Pass it a text channel, and with no satisfied requests QString textChanPath = mConn->objectPath() + QLatin1String("/TextChannel"); - QByteArray chanPath(textChanPath.toAscii()); + QByteArray chanPath(textChanPath.toLatin1()); ExampleEchoChannel *textChanService = EXAMPLE_ECHO_CHANNEL(g_object_new( EXAMPLE_TYPE_ECHO_CHANNEL, "connection", mConn->service(), diff --git a/tests/dbus/streamed-media-chan.cpp b/tests/dbus/streamed-media-chan.cpp index 1c5dd9d..8c160ee 100644 --- a/tests/dbus/streamed-media-chan.cpp +++ b/tests/dbus/streamed-media-chan.cpp @@ -1127,7 +1127,7 @@ void TestStreamedMediaChan::testHoldNoUnhold() SIGNAL(localHoldStateChanged(Tp::LocalHoldState, Tp::LocalHoldStateReason)), SLOT(onLocalHoldStateChanged(Tp::LocalHoldState, Tp::LocalHoldStateReason)))); // Request hold - QWeakPointer<PendingOperation> holdOp = mChan->requestHold(true); + QPointer<PendingOperation> holdOp = mChan->requestHold(true); while (mLocalHoldStates.size() != 2 || (holdOp && !holdOp.data()->isFinished())) { mLoop->processEvents(); } diff --git a/tests/dbus/text-chan.cpp b/tests/dbus/text-chan.cpp index 5bc5aa8..de1d9d2 100644 --- a/tests/dbus/text-chan.cpp +++ b/tests/dbus/text-chan.cpp @@ -145,7 +145,7 @@ void TestTextChan::initTestCase() // create a Channel by magic, rather than doing D-Bus round-trips for it mTextChanPath = mConn->objectPath() + QLatin1String("/TextChannel"); - QByteArray chanPath(mTextChanPath.toAscii()); + QByteArray chanPath(mTextChanPath.toLatin1()); mTextChanService = EXAMPLE_ECHO_CHANNEL(g_object_new( EXAMPLE_TYPE_ECHO_CHANNEL, "connection", mConn->service(), @@ -154,7 +154,7 @@ void TestTextChan::initTestCase() NULL)); mMessagesChanPath = mConn->objectPath() + QLatin1String("/MessagesChannel"); - chanPath = mMessagesChanPath.toAscii(); + chanPath = mMessagesChanPath.toLatin1(); mMessagesChanService = EXAMPLE_ECHO_2_CHANNEL(g_object_new( EXAMPLE_TYPE_ECHO_2_CHANNEL, "connection", mConn->service(), -- 1.9.1 ++++++ 0027-Fix-TestKeyFile-sort-list-before-comparing.patch ++++++ >From 15ddf0963b75f09b1ed6558dd0472058e7eb9914 Mon Sep 17 00:00:00 2001 From: Martin Kampas <martin.kampas(a)tieto.com> Date: Fri, 8 Nov 2013 13:54:19 +0100 Subject: [PATCH 27/40] Fix TestKeyFile: sort list before comparing Reviewed-by: David Edmundson <davidedmundson(a)kde.org> --- tests/key-file.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/key-file.cpp b/tests/key-file.cpp index 1d7b439..ebcf1e7 100644 --- a/tests/key-file.cpp +++ b/tests/key-file.cpp @@ -31,7 +31,9 @@ void TestKeyFile::testKeyFile() KeyFile keyFile(QLatin1String("test-key-file.ini")); QCOMPARE(keyFile.status(), KeyFile::NoError); - QCOMPARE(keyFile.allGroups(), + QStringList allGroups = keyFile.allGroups(); + allGroups.sort(); + QCOMPARE(allGroups, QStringList() << QString() << QLatin1String("test group 1") << QLatin1String("test group 2")); -- 1.9.1 ++++++ 0028-Fix-TestAccountSet-testFilters.patch ++++++ >From 1adfbc3329dfa604165d9fd197abb14000e1ac1f Mon Sep 17 00:00:00 2001 From: Martin Kampas <martin.kampas(a)tieto.com> Date: Mon, 11 Nov 2013 15:39:00 +0100 Subject: [PATCH 28/40] Fix TestAccountSet::testFilters The ordering of mAM->allAccounts() has changed. Fixed so it works irrespective of the order. Reviewed-by: David Edmundson <davidedmundson(a)kde.org> --- tests/dbus/account-set.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/dbus/account-set.cpp b/tests/dbus/account-set.cpp index 07cc1ea..8bc51be 100644 --- a/tests/dbus/account-set.cpp +++ b/tests/dbus/account-set.cpp @@ -258,7 +258,7 @@ void TestAccountSet::testFilters() createAccount("spurious", "normal", "spuriousnormal", parameters); QCOMPARE(mAM->allAccounts().size(), 2); QCOMPARE(mAM->validAccounts()->accounts().size(), 2); - AccountPtr spuriousAcc = mAM->allAccounts()[1]; + AccountPtr spuriousAcc = *(mAM->allAccounts().toSet() -= fooAcc).begin(); Tp::AccountSetPtr filteredAccountSet; -- 1.9.1 ++++++ 0029-Fix-TestDBusProxyFactory-testDropRefs.patch ++++++ >From d6435eb0c335bab46d33d727560e2732bcd203aa Mon Sep 17 00:00:00 2001 From: Martin Kampas <martin.kampas(a)tieto.com> Date: Tue, 12 Nov 2013 08:09:22 +0100 Subject: [PATCH 29/40] Fix TestDBusProxyFactory::testDropRefs (Hopefully) prevent getting the new proxy instantiated on the very same address. Reviewed-by: David Edmundson <davidedmundson(a)kde.org> --- tests/dbus/dbus-proxy-factory.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/dbus/dbus-proxy-factory.cpp b/tests/dbus/dbus-proxy-factory.cpp index 67c8ab5..8596ea9 100644 --- a/tests/dbus/dbus-proxy-factory.cpp +++ b/tests/dbus/dbus-proxy-factory.cpp @@ -1,4 +1,5 @@ #include <QtCore/QDebug> +#include <QtCore/QScopedPointer> #include <QtCore/QTimer> #include <QtDBus/QtDBus> #include <QtTest/QtTest> @@ -222,6 +223,9 @@ void TestDBusProxyFactory::testDropRefs() Connection *firstPtr = firstProxy.data(); firstProxy.reset(); + // Hopefully this prevents getting the new proxy instantiated on the very same address + QScopedPointer<char, QScopedPointerArrayDeleter<char> > hole(new char[sizeof(Connection)]); + PendingReady *different = mFactory->proxy(mConnName1, mConnPath1, ChannelFactory::create(QDBusConnection::sessionBus()), ContactFactory::create()); -- 1.9.1 ++++++ 0030-Fix-HandledChannelNotifier-for-Qt5.patch ++++++ >From 46029e9f26c78f95c9846097d296ddaec9826c44 Mon Sep 17 00:00:00 2001 From: Martin Kampas <martin.kampas(a)tieto.com> Date: Tue, 12 Nov 2013 11:54:00 +0100 Subject: [PATCH 30/40] Fix HandledChannelNotifier for Qt5 The QObject::connectNotify() signature changed in Qt5. Detected by TestAccountChannelDispatcher::testCreateAndHandleChannelHandledAgain() which hangs forever because HandledChannelNotifier::handledAgain() gets never emitted. Reviewed-by: David Edmundson <davidedmundson(a)kde.org> --- TelepathyQt/handled-channel-notifier.cpp | 9 +++++++++ TelepathyQt/handled-channel-notifier.h | 6 +++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/TelepathyQt/handled-channel-notifier.cpp b/TelepathyQt/handled-channel-notifier.cpp index 47b2b55..e871306 100644 --- a/TelepathyQt/handled-channel-notifier.cpp +++ b/TelepathyQt/handled-channel-notifier.cpp @@ -93,11 +93,20 @@ void HandledChannelNotifier::onChannelInvalidated() deleteLater(); } +#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) +void HandledChannelNotifier::connectNotify(const QMetaMethod &signal) +{ + if (signal == QMetaMethod::fromSignal(&HandledChannelNotifier::handledAgain)) { + mPriv->handler->setQueueChannelReceived(false); + } +} +#else void HandledChannelNotifier::connectNotify(const char *signalName) { if (qstrcmp(signalName, SIGNAL(handledAgain(QDateTime,Tp::ChannelRequestHints))) == 0) { mPriv->handler->setQueueChannelReceived(false); } } +#endif } // Tp diff --git a/TelepathyQt/handled-channel-notifier.h b/TelepathyQt/handled-channel-notifier.h index 0dab6af..6474031 100644 --- a/TelepathyQt/handled-channel-notifier.h +++ b/TelepathyQt/handled-channel-notifier.h @@ -52,7 +52,11 @@ Q_SIGNALS: void handledAgain(const QDateTime &userActionTime, const Tp::ChannelRequestHints &requestHints); protected: - void connectNotify(const char *); +#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) + void connectNotify(const QMetaMethod &signal); +#else + void connectNotify(const char *signal); +#endif private Q_SLOTS: TP_QT_NO_EXPORT void onChannelReceived(const Tp::ChannelPtr &channel, -- 1.9.1 ++++++ 0031-Update-to-spec-0.27.3.patch ++++++ ++++ 1892 lines (skipped) ++++++ 0032-Update-changes-from-Channel_Dispatcher_Future.patch ++++++ >From 6823281506d8e063e43e6ecd0ae071b48758f90c Mon Sep 17 00:00:00 2001 From: David Edmundson <kde(a)davidedmundson.co.uk> Date: Sun, 19 Jan 2014 20:19:42 +0100 Subject: [PATCH 32/40] Update changes from Channel_Dispatcher_Future --- TelepathyQt/channel-dispatcher.xml | 14 ++++++++++++++ TelepathyQt/contact-messenger.cpp | 7 +++---- TelepathyQt/future-channel-dispatcher.xml | 12 ------------ tools/manager-file.py | 1 + 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/TelepathyQt/channel-dispatcher.xml b/TelepathyQt/channel-dispatcher.xml index a1588a4..c2b4332 100644 --- a/TelepathyQt/channel-dispatcher.xml +++ b/TelepathyQt/channel-dispatcher.xml @@ -6,4 +6,18 @@ <xi:include href="../spec/Channel_Dispatcher.xml"/> +<xi:include href="../spec/Channel_Dispatcher_Interface_Messages1.xml"/> + +<tp:generic-types> + <tp:external-type name="Message_Part" type="a{sv}" from="Telepathy specification"/> + <tp:mapping name="Message_Part" array-name="Message_Part_List" array-depth="2"> + <tp:member name="Key" type="s"/> + <tp:member name="Value" type="v"/> + </tp:mapping> +</tp:generic-types> + +<xi:include href="../spec/generic-types.xml"/> +<xi:include href="../spec/errors.xml"/> + + </tp:spec> diff --git a/TelepathyQt/contact-messenger.cpp b/TelepathyQt/contact-messenger.cpp index fdb5608..1f34f4b 100644 --- a/TelepathyQt/contact-messenger.cpp +++ b/TelepathyQt/contact-messenger.cpp @@ -55,22 +55,21 @@ struct TP_QT_NO_EXPORT ContactMessenger::Private AccountPtr account; QString contactIdentifier; SimpleTextObserverPtr observer; - TpFuture::Client::ChannelDispatcherInterfaceMessagesInterface *cdMessagesInterface; + Tp::Client::ChannelDispatcherInterfaceMessages1Interface *cdMessagesInterface; }; PendingSendMessage *ContactMessenger::Private::sendMessage(const Message &message, MessageSendingFlags flags) { if (!cdMessagesInterface) { - cdMessagesInterface = new TpFuture::Client::ChannelDispatcherInterfaceMessagesInterface( + cdMessagesInterface = new Tp::Client::ChannelDispatcherInterfaceMessages1Interface( account->dbusConnection(), TP_QT_CHANNEL_DISPATCHER_BUS_NAME, TP_QT_CHANNEL_DISPATCHER_OBJECT_PATH, parent); } PendingSendMessage *op = new PendingSendMessage(ContactMessengerPtr(parent), message); - // TODO: is there a way to avoid this? Ideally TpFuture classes should use Tp types. - TpFuture::MessagePartList parts; + Tp::MessagePartList parts; foreach (const Tp::MessagePart &part, message.parts()) { parts << static_cast<QMap<QString, QDBusVariant> >(part); } diff --git a/TelepathyQt/future-channel-dispatcher.xml b/TelepathyQt/future-channel-dispatcher.xml index 0e7f67c..091637d 100644 --- a/TelepathyQt/future-channel-dispatcher.xml +++ b/TelepathyQt/future-channel-dispatcher.xml @@ -4,17 +4,5 @@ <tp:title>Channel Dispatcher extensions from the future</tp:title> -<xi:include href="../spec/Channel_Dispatcher_Interface_Messages.xml"/> - -<tp:generic-types> - <tp:external-type name="Message_Part" type="a{sv}" from="Telepathy specification"/> - <tp:mapping name="Message_Part" array-name="Message_Part_List" array-depth="2"> - <tp:member name="Key" type="s"/> - <tp:member name="Value" type="v"/> - </tp:mapping> -</tp:generic-types> - -<xi:include href="../spec/generic-types.xml"/> -<xi:include href="../spec/errors.xml"/> </tp:spec> diff --git a/tools/manager-file.py b/tools/manager-file.py index 45f6404..d873014 100644 --- a/tools/manager-file.py +++ b/tools/manager-file.py @@ -25,6 +25,7 @@ import re import sys +import os _NOT_C_STR = re.compile(r'[^A-Za-z0-9_-]') -- 1.9.1 ++++++ 0033-Update-test-library-to-match-spec-changes.patch ++++++ >From bb2c4e68af128fe76d5599b46b33c81d7841608e Mon Sep 17 00:00:00 2001 From: David Edmundson <kde(a)davidedmundson.co.uk> Date: Sun, 19 Jan 2014 20:50:11 +0100 Subject: [PATCH 33/40] Update test library to match spec changes --- tests/lib/glib/future/extensions/misc.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/lib/glib/future/extensions/misc.xml b/tests/lib/glib/future/extensions/misc.xml index 061b4d4..91abcfb 100644 --- a/tests/lib/glib/future/extensions/misc.xml +++ b/tests/lib/glib/future/extensions/misc.xml @@ -5,7 +5,6 @@ <tp:title>Miscellaneous extensions from the future</tp:title> <xi:include href="../../../../../spec/Call_Content.xml"/> -<xi:include href="../../../../../spec/Call_Content_Codec_Offer.xml"/> <xi:include href="../../../../../spec/Call_Content_Interface_Media.xml"/> <xi:include href="../../../../../spec/Call_Stream_Endpoint.xml"/> <xi:include href="../../../../../spec/Call_Stream_Interface_Media.xml"/> -- 1.9.1 ++++++ 0034-Add-Room-Subject-RoomConfig-interfaces-to-generation.patch ++++++ >From 5afa270e4eed0f6401509809331db7e8a13653ca Mon Sep 17 00:00:00 2001 From: Leon Handreke <leonh(a)ndreke.de> Date: Sat, 18 Jan 2014 18:32:40 +0100 Subject: [PATCH 34/40] Add {Room,Subject,RoomConfig} interfaces to generation --- TelepathyQt/CMakeLists.txt | 3 +++ TelepathyQt/ChannelInterfaceRoomConfigInterface | 13 +++++++++++++ TelepathyQt/ChannelInterfaceRoomInterface | 13 +++++++++++++ TelepathyQt/ChannelInterfaceSubjectInterface | 13 +++++++++++++ TelepathyQt/channel.xml | 3 +++ TelepathyQt/svc-channel.xml | 3 +++ 6 files changed, 48 insertions(+) create mode 100644 TelepathyQt/ChannelInterfaceRoomConfigInterface create mode 100644 TelepathyQt/ChannelInterfaceRoomInterface create mode 100644 TelepathyQt/ChannelInterfaceSubjectInterface diff --git a/TelepathyQt/CMakeLists.txt b/TelepathyQt/CMakeLists.txt index 06aaad7..47ec09c 100644 --- a/TelepathyQt/CMakeLists.txt +++ b/TelepathyQt/CMakeLists.txt @@ -232,10 +232,13 @@ set(telepathy_qt_HEADERS ChannelInterfaceMediaSignallingInterface ChannelInterfaceMessagesInterface ChannelInterfacePasswordInterface + ChannelInterfaceRoomInterface + ChannelInterfaceRoomConfigInterface ChannelInterfaceSASLAuthenticationInterface ChannelInterfaceSecurableInterface ChannelInterfaceServicePointInterface ChannelInterfaceSMSInterface + ChannelInterfaceSubjectInterface ChannelInterfaceTubeInterface ChannelRequest ChannelRequestHints diff --git a/TelepathyQt/ChannelInterfaceRoomConfigInterface b/TelepathyQt/ChannelInterfaceRoomConfigInterface new file mode 100644 index 0000000..22e769a --- /dev/null +++ b/TelepathyQt/ChannelInterfaceRoomConfigInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ChannelInterfaceRoomConfigInterface_HEADER_GUARD_ +#define _TelepathyQt_ChannelInterfaceRoomConfigInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/channel.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ChannelInterfaceRoomInterface b/TelepathyQt/ChannelInterfaceRoomInterface new file mode 100644 index 0000000..8eea392 --- /dev/null +++ b/TelepathyQt/ChannelInterfaceRoomInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ChannelInterfaceRoomInterface_HEADER_GUARD_ +#define _TelepathyQt_ChannelInterfaceRoomInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/channel.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ChannelInterfaceSubjectInterface b/TelepathyQt/ChannelInterfaceSubjectInterface new file mode 100644 index 0000000..b2aa91e --- /dev/null +++ b/TelepathyQt/ChannelInterfaceSubjectInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ChannelInterfaceSubjectInterface_HEADER_GUARD_ +#define _TelepathyQt_ChannelInterfaceSubjectInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/channel.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/channel.xml b/TelepathyQt/channel.xml index 1c568c5..7f2ef4d 100644 --- a/TelepathyQt/channel.xml +++ b/TelepathyQt/channel.xml @@ -32,10 +32,13 @@ <xi:include href="../spec/Channel_Interface_Media_Signalling.xml"/> <xi:include href="../spec/Channel_Interface_Messages.xml"/> <xi:include href="../spec/Channel_Interface_Password.xml"/> +<xi:include href="../spec/Channel_Interface_Room.xml"/> +<xi:include href="../spec/Channel_Interface_Room_Config.xml"/> <xi:include href="../spec/Channel_Interface_SASL_Authentication.xml"/> <xi:include href="../spec/Channel_Interface_Securable.xml"/> <xi:include href="../spec/Channel_Interface_Service_Point.xml"/> <xi:include href="../spec/Channel_Interface_SMS.xml"/> +<xi:include href="../spec/Channel_Interface_Subject.xml"/> <xi:include href="../spec/Channel_Interface_Tube.xml"/> </tp:spec> diff --git a/TelepathyQt/svc-channel.xml b/TelepathyQt/svc-channel.xml index d4e8e6e..2df9cb0 100644 --- a/TelepathyQt/svc-channel.xml +++ b/TelepathyQt/svc-channel.xml @@ -30,9 +30,12 @@ <xi:include href="../spec/Channel_Interface_Media_Signalling.xml"/> <xi:include href="../spec/Channel_Interface_Messages.xml"/> <xi:include href="../spec/Channel_Interface_Password.xml"/> +<xi:include href="../spec/Channel_Interface_Room.xml"/> +<xi:include href="../spec/Channel_Interface_Room_Config.xml"/> <xi:include href="../spec/Channel_Interface_SASL_Authentication.xml"/> <xi:include href="../spec/Channel_Interface_Securable.xml"/> <xi:include href="../spec/Channel_Interface_Service_Point.xml"/> <xi:include href="../spec/Channel_Interface_SMS.xml"/> +<xi:include href="../spec/Channel_Interface_Subject.xml"/> </tp:spec> -- 1.9.1 ++++++ 0035-Fix-ChannelDispatcher.Messages-test.patch ++++++ >From 9d349d4d0a56bbd5fe0799193448a53c6247d14a Mon Sep 17 00:00:00 2001 From: David Edmundson <kde(a)davidedmundson.co.uk> Date: Sun, 19 Jan 2014 23:12:52 +0100 Subject: [PATCH 35/40] Fix ChannelDispatcher.Messages test --- tests/dbus/contact-messenger.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/dbus/contact-messenger.cpp b/tests/dbus/contact-messenger.cpp index 4932000..93ba023 100644 --- a/tests/dbus/contact-messenger.cpp +++ b/tests/dbus/contact-messenger.cpp @@ -44,9 +44,9 @@ class TestContactMessenger; class CDMessagesAdaptor : public QDBusAbstractAdaptor { Q_OBJECT - Q_CLASSINFO("D-Bus Interface", "org.freedesktop.Telepathy.ChannelDispatcher.Interface.Messages.DRAFT") + Q_CLASSINFO("D-Bus Interface", "org.freedesktop.Telepathy.ChannelDispatcher.Interface.Messages1") Q_CLASSINFO("D-Bus Introspection", "" -" <interface name=\"org.freedesktop.Telepathy.ChannelDispatcher.Interface.Messages.DRAFT\" >\n" +" <interface name=\"org.freedesktop.Telepathy.ChannelDispatcher.Interface.Messages1\" >\n" " <method name=\"SendMessage\" >\n" " <arg name=\"Account\" type=\"o\" direction=\"in\" />\n" " <arg name=\"TargetID\" type=\"s\" direction=\"in\" />\n" -- 1.9.1 ++++++ 0036-Fix-moc-command-for-Qt5.2.patch ++++++ >From 938509e23a3a02609d96dd82abdcb5a51d104b57 Mon Sep 17 00:00:00 2001 From: Dario Freddi <dario.freddi(a)ispirata.com> Date: Sun, 2 Feb 2014 15:40:38 +0100 Subject: [PATCH 36/40] Fix moc command for Qt5.2 The check was already there, but since Qt5 CMake files are being shipped with Qt5 itself, the check was meaningless as the only thing which matters is Qt's version, and not CMake's one. Reviewed-by: David Edmundson <davidedmundson(a)kde.org> --- cmake/modules/FindQt.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/modules/FindQt.cmake b/cmake/modules/FindQt.cmake index b3131f0..8cf0f25 100644 --- a/cmake/modules/FindQt.cmake +++ b/cmake/modules/FindQt.cmake @@ -81,11 +81,11 @@ MACRO(QT_CREATE_MOC_COMMAND infile outfile moc_flags moc_options) ENDIF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607) ELSE(QT_VERSION_MAJOR MATCHES 4) IF(QT_VERSION_MAJOR MATCHES 5) - IF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607) + IF(QTVERSION VERSION_GREATER 5.1.99) QT5_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}" "") - ELSE(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607) + ELSE() QT5_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}") - ENDIF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607) + ENDIF() ENDIF(QT_VERSION_MAJOR MATCHES 5) ENDIF(QT_VERSION_MAJOR MATCHES 4) ENDMACRO(QT_CREATE_MOC_COMMAND) -- 1.9.1 ++++++ 0037-Simplify-FindQt5.cmake.patch ++++++ >From dca59397c00d27f3de0da4269fe53d4dda5520cb Mon Sep 17 00:00:00 2001 From: Uwe Korn <uwelk(a)xhochy.com> Date: Fri, 14 Mar 2014 16:55:26 +0100 Subject: [PATCH 37/40] Simplify FindQt5.cmake Make further use of Qt 5's cmake integration Reviewed-by: David Edmundson --- cmake/modules/FindQt5.cmake | 53 ++++++++++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 22 deletions(-) diff --git a/cmake/modules/FindQt5.cmake b/cmake/modules/FindQt5.cmake index 922ebc1..957f7b3 100644 --- a/cmake/modules/FindQt5.cmake +++ b/cmake/modules/FindQt5.cmake @@ -44,25 +44,31 @@ IF(QT_INCLUDES AND QT_LIBRARIES AND QT_MAJOR_VERSION MATCHES 5) RETURN() ENDIF(QT_INCLUDES AND QT_LIBRARIES AND QT_MAJOR_VERSION MATCHES 5) -IF(NOT QT_QMAKE_EXECUTABLE) - FIND_PROGRAM(QT_QMAKE_EXECUTABLE_FINDQT NAMES qmake qmake5 qmake-qt5 - PATHS "${QT_SEARCH_PATH}/bin" "$ENV{QTDIR}/bin") - SET(QT_QMAKE_EXECUTABLE ${QT_QMAKE_EXECUTABLE_FINDQT} CACHE PATH "Qt qmake program.") -ENDIF(NOT QT_QMAKE_EXECUTABLE) - -EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE} ARGS "-query QT_VERSION" OUTPUT_VARIABLE QTVERSION) -IF(NOT QTVERSION MATCHES "5.*") - SET(QT_FOUND FALSE) - SET(QT5_FOUND FALSE) - IF(Qt5_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "CMake was unable to find Qt5, put qmake in your path or set QTDIR/QT_QMAKE_EXECUTABLE.") - ENDIF(Qt5_FIND_REQUIRED) - RETURN() -ENDIF(NOT QTVERSION MATCHES "5.*") - -FIND_PACKAGE(PkgConfig REQUIRED) - -FIND_PACKAGE(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core DBus Gui Network Test Widgets Xml) +IF(NOT Qt5Core_DIR ) + IF(NOT QT_QMAKE_EXECUTABLE) + FIND_PROGRAM(QT_QMAKE_EXECUTABLE_FINDQT NAMES qmake qmake5 qmake-qt5 + PATHS "${QT_SEARCH_PATH}/bin" "$ENV{QTDIR}/bin") + SET(QT_QMAKE_EXECUTABLE ${QT_QMAKE_EXECUTABLE_FINDQT} CACHE PATH "Qt qmake program.") + ENDIF(NOT QT_QMAKE_EXECUTABLE) + + EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE} ARGS "-query QT_VERSION" OUTPUT_VARIABLE QTVERSION) + IF(NOT QTVERSION MATCHES "5.*") + SET(QT_FOUND FALSE) + SET(QT5_FOUND FALSE) + IF(Qt5_FIND_REQUIRED) + MESSAGE(FATAL_ERROR "CMake was unable to find Qt5, put qmake in your path or set QTDIR/QT_QMAKE_EXECUTABLE.") + ENDIF(Qt5_FIND_REQUIRED) + RETURN() + ENDIF(NOT QTVERSION MATCHES "5.*") +ENDIF(NOT Qt5Core_DIR ) + +find_package(Qt5Core ${REQUIRED_QT_VERSION} REQUIRED) +find_package(Qt5DBus ${REQUIRED_QT_VERSION} REQUIRED) +find_package(Qt5Gui ${REQUIRED_QT_VERSION} REQUIRED) +find_package(Qt5Test ${REQUIRED_QT_VERSION} REQUIRED) +find_package(Qt5Widgets ${REQUIRED_QT_VERSION} REQUIRED) +find_package(Qt5Network ${REQUIRED_QT_VERSION} REQUIRED) +find_package(Qt5Xml ${REQUIRED_QT_VERSION} REQUIRED) # Copy includes and library names into the same style as pkgconfig used for Qt4 set(QT_INCLUDES ${Qt5Core_INCLUDE_DIRS} ${Qt5DBus_INCLUDE_DIRS} ${Qt5Gui_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS} ${Qt5Test_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS}) @@ -77,9 +83,12 @@ set(QT_QTXML_LIBRARY ${Qt5Xml_LIBRARIES}) set(QT_LIBRARIES ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTTEST_LIBRARY} ${QT_QTWIDGETS_LIBRARY} ${QT_QTXML_LIBRARY}) -STRING(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" QT_VERSION_MAJOR "${QTVERSION}") -STRING(REGEX REPLACE "^[0-9]+\\.([0-9])+\\.[0-9]+.*" "\\1" QT_VERSION_MINOR "${QTVERSION}") -STRING(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" QT_VERSION_PATCH "${QTVERSION}") +SET(QT_VERSION_MAJOR ${Qt5Core_VERSION_MAJOR}) +SET(QT_VERSION_MINOR ${Qt5Core_VERSION_MINOR}) +SET(QT_VERSION_PATCH ${Qt5Core_VERSION_PATCH}) +SET(QT_VERSION ${Qt5Core_VERSION}) + +GET_PROPERTY(QT_QMAKE_EXECUTABLE TARGET ${Qt5Core_QMAKE_EXECUTABLE} PROPERTY IMPORTED_LOCATION) IF(NOT QT_INCLUDE_DIR) EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_HEADERS" OUTPUT_VARIABLE QTHEADERS) -- 1.9.1 ++++++ 0038-Allow-compilation-when-only-qmake-qt4-is-in-the-path.patch ++++++ >From 7feb7ee8d2eb1986b5a1314bb064b39a79718c68 Mon Sep 17 00:00:00 2001 From: Uwe Korn <uwelk(a)xhochy.com> Date: Fri, 14 Mar 2014 16:56:36 +0100 Subject: [PATCH 38/40] Allow compilation when only qmake-qt4 is in the path If Qt5 is found via cmake we do not need to find the qmake executable. This fixes builds when only qmake4 is available in the path. Reviewed-by: David Edmundson --- cmake/modules/FindQt.cmake | 41 ++++++++++++++++++++++++++--------------- 1 file changed, 26 insertions(+), 15 deletions(-) diff --git a/cmake/modules/FindQt.cmake b/cmake/modules/FindQt.cmake index 8cf0f25..5cb2836 100644 --- a/cmake/modules/FindQt.cmake +++ b/cmake/modules/FindQt.cmake @@ -7,22 +7,33 @@ # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. -IF(NOT QT_QMAKE_EXECUTABLE) - FIND_PROGRAM(QT_QMAKE_EXECUTABLE_FINDQT NAMES qmake qmake4 qmake-qt4 qmake5 qmake-qt5 - PATHS "${QT_SEARCH_PATH}/bin" "$ENV{QTDIR}/bin") - SET(QT_QMAKE_EXECUTABLE ${QT_QMAKE_EXECUTABLE_FINDQT} CACHE PATH "Qt qmake program.") -ENDIF(NOT QT_QMAKE_EXECUTABLE) +IF(DESIRED_QT_VERSION MATCHES 5) + # Qt5 was explicitly requested, so use its CMakeConfig instead of qmake which may not be at a global location + find_package(Qt5Core QUIET) + IF( Qt5Core_DIR ) + SET(QT5_INSTALLED TRUE) + ENDIF( Qt5Core_DIR ) +ENDIF(DESIRED_QT_VERSION MATCHES 5) + +#Otherwise search for installed qmakes +IF(NOT QT5_INSTALLED) + IF(NOT QT_QMAKE_EXECUTABLE) + FIND_PROGRAM(QT_QMAKE_EXECUTABLE_FINDQT NAMES qmake qmake4 qmake-qt4 qmake5 qmake-qt5 + PATHS "${QT_SEARCH_PATH}/bin" "$ENV{QTDIR}/bin") + SET(QT_QMAKE_EXECUTABLE ${QT_QMAKE_EXECUTABLE_FINDQT} CACHE PATH "Qt qmake program.") + ENDIF(NOT QT_QMAKE_EXECUTABLE) -# now find qmake -IF(QT_QMAKE_EXECUTABLE) - EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE} ARGS "-query QT_VERSION" OUTPUT_VARIABLE QTVERSION) - IF(QTVERSION MATCHES "4.*") - SET(QT4_INSTALLED TRUE) - ENDIF(QTVERSION MATCHES "4.*") - IF(QTVERSION MATCHES "5.*") - SET(QT5_INSTALLED TRUE) - ENDIF(QTVERSION MATCHES "5.*") -ENDIF(QT_QMAKE_EXECUTABLE) + # now find qmake + IF(QT_QMAKE_EXECUTABLE) + EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE} ARGS "-query QT_VERSION" OUTPUT_VARIABLE QTVERSION) + IF(QTVERSION MATCHES "4.*") + SET(QT4_INSTALLED TRUE) + ENDIF(QTVERSION MATCHES "4.*") + IF(QTVERSION MATCHES "5.*") + SET(QT5_INSTALLED TRUE) + ENDIF(QTVERSION MATCHES "5.*") + ENDIF(QT_QMAKE_EXECUTABLE) +ENDIF(NOT QT5_INSTALLED) IF(NOT DESIRED_QT_VERSION) IF(QT4_INSTALLED) -- 1.9.1 ++++++ 0039-Add-Q_UNUSED-as-Q_ASSERT-is-a-no-op-in-release-mode.patch ++++++ >From ff169cde751d0bb0309109514dd10b9eff7de4e3 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" <uwelk(a)xhochy.com> Date: Fri, 28 Mar 2014 10:28:16 +0000 Subject: [PATCH 39/40] Add Q_UNUSED as Q_ASSERT is a no-op in release mode Reviewed-by: David Edmundson --- TelepathyQt/connection-manager.cpp | 1 + examples/file-transfer/file-sender.cpp | 2 ++ 2 files changed, 3 insertions(+) diff --git a/TelepathyQt/connection-manager.cpp b/TelepathyQt/connection-manager.cpp index 96b3234..e6e32e0 100644 --- a/TelepathyQt/connection-manager.cpp +++ b/TelepathyQt/connection-manager.cpp @@ -1084,6 +1084,7 @@ void ConnectionManager::gotParametersLegacy(QDBusPendingCallWatcher *watcher) ++pos; } Q_ASSERT(found); + Q_UNUSED(found); if (!reply.isError()) { debug() << QString(QLatin1String("Got reply to ConnectionManager.GetParameters(%1)")).arg(protocolName); diff --git a/examples/file-transfer/file-sender.cpp b/examples/file-transfer/file-sender.cpp index a747af1..50d50c2 100644 --- a/examples/file-transfer/file-sender.cpp +++ b/examples/file-transfer/file-sender.cpp @@ -91,6 +91,7 @@ void FileSender::onAMReady(PendingOperation *op) PendingReady *pr = qobject_cast<PendingReady*>(op); Q_ASSERT(pr != NULL); + Q_UNUSED(pr); qDebug() << "AccountManager ready"; mAccount = mAM->accountForObjectPath( @@ -116,6 +117,7 @@ void FileSender::onAccountReady(PendingOperation *op) PendingReady *pr = qobject_cast<PendingReady*>(op); Q_ASSERT(pr != NULL); + Q_UNUSED(pr); qDebug() << "Account ready"; qDebug() << "Checking if account is online..."; -- 1.9.1 ++++++ 0040-Add-5-to-pkg-config-package-names-for-Qt5.patch ++++++ >From 0191a6ddf0c094d9ae61b9ee48f1b282e13a9ef2 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" <uwelk(a)xhochy.com> Date: Wed, 26 Feb 2014 18:40:43 +0000 Subject: [PATCH 40/40] Add 5 to pkg-config package names for Qt5 --- CMakeLists.txt | 5 +++++ TelepathyQt/TelepathyQt-uninstalled.pc.in | 2 +- TelepathyQt/TelepathyQt.pc.in | 2 +- TelepathyQt/TelepathyQtService.pc.in | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e72f559..d5e1b71 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -83,6 +83,11 @@ set(QT5_MIN_VERSION "5.0.0") set(QT5_MAX_VERSION "6.0.0") find_package(Qt REQUIRED) +IF(QT_VERSION_MAJOR MATCHES 5) + # It is QtCore for Qt4 but Qt5Core for Qt5 in pkg-config + SET(QT_VERSION_PC 5) +ENDIF(QT_VERSION_MAJOR MATCHES 5) + foreach(flag ${QT_CONFIG_FLAGS}) if (${flag} MATCHES "reduce_relocations") set(TP_QT_EXECUTABLE_LINKER_FLAGS "-fPIE") diff --git a/TelepathyQt/TelepathyQt-uninstalled.pc.in b/TelepathyQt/TelepathyQt-uninstalled.pc.in index e8bf5ce..a61c2d3 100644 --- a/TelepathyQt/TelepathyQt-uninstalled.pc.in +++ b/TelepathyQt/TelepathyQt-uninstalled.pc.in @@ -6,6 +6,6 @@ abs_top_srcdir=${CMAKE_SOURCE_DIR} Name: TelepathyQt${QT_VERSION_MAJOR} (uninstalled copy) Description: Qt utility library for the Telepathy framework Version: ${PACKAGE_VERSION} -Requires.private: QtCore >= ${QT_MIN_VERSION}, QtCore < ${QT_MAX_VERSION}, QtDBus >= ${QT_MIN_VERSION}, QtDBus < ${QT_MAX_VERSION}, QtNetwork >= ${QT_MIN_VERSION}, QtNetwork < ${QT_MAX_VERSION}, QtXml >= ${QT_MIN_VERSION}, QtXml < ${QT_MAX_VERSION} +Requires.private: Qt${QT_VERSION_PC}Core >= ${QT_MIN_VERSION}, Qt${QT_VERSION_PC}Core < ${QT_MAX_VERSION}, Qt${QT_VERSION_PC}DBus >= ${QT_MIN_VERSION}, Qt${QT_VERSION_PC}DBus < ${QT_MAX_VERSION}, Qt${QT_VERSION_PC}Network >= ${QT_MIN_VERSION}, Qt${QT_VERSION_PC}Network < ${QT_MAX_VERSION}, Qt${QT_VERSION_PC}Xml >= ${QT_MIN_VERSION}, Qt${QT_VERSION_PC}Xml < ${QT_MAX_VERSION} Libs: ${CMAKE_BINARY_DIR}/TelepathyQt/libtelepathy-qt${QT_VERSION_MAJOR}.so Cflags: -I${CMAKE_SOURCE_DIR} -I${CMAKE_BINARY_DIR} diff --git a/TelepathyQt/TelepathyQt.pc.in b/TelepathyQt/TelepathyQt.pc.in index 92ba026..d245fed 100644 --- a/TelepathyQt/TelepathyQt.pc.in +++ b/TelepathyQt/TelepathyQt.pc.in @@ -6,6 +6,6 @@ includedir=${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR} Name: TelepathyQt${QT_VERSION_MAJOR} Description: Qt utility library for the Telepathy framework Version: ${PACKAGE_VERSION} -Requires.private: QtCore >= ${QT_MIN_VERSION}, QtCore < ${QT_MAX_VERSION}, QtDBus >= ${QT_MIN_VERSION}, QtDBus < ${QT_MAX_VERSION}, QtNetwork >= ${QT_MIN_VERSION}, QtNetwork < ${QT_MAX_VERSION}, QtXml >= ${QT_MIN_VERSION}, QtXml < ${QT_MAX_VERSION} +Requires.private: Qt${QT_VERSION_PC}Core >= ${QT_MIN_VERSION}, Qt${QT_VERSION_PC}Core < ${QT_MAX_VERSION}, Qt${QT_VERSION_PC}DBus >= ${QT_MIN_VERSION}, Qt${QT_VERSION_PC}DBus < ${QT_MAX_VERSION}, Qt${QT_VERSION_PC}Network >= ${QT_MIN_VERSION}, Qt${QT_VERSION_PC}Network < ${QT_MAX_VERSION}, Qt${QT_VERSION_PC}Xml >= ${QT_MIN_VERSION}, Qt${QT_VERSION_PC}Xml < ${QT_MAX_VERSION} Libs: -L${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR} -ltelepathy-qt${QT_VERSION_MAJOR} Cflags: -I${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}/telepathy-qt${QT_VERSION_MAJOR} diff --git a/TelepathyQt/TelepathyQtService.pc.in b/TelepathyQt/TelepathyQtService.pc.in index 69ba8c5..c579665 100644 --- a/TelepathyQt/TelepathyQtService.pc.in +++ b/TelepathyQt/TelepathyQtService.pc.in @@ -6,6 +6,6 @@ includedir=${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR} Name: TelepathyQt${QT_VERSION_MAJOR}Service Description: Qt Telepathy Service side bindings Version: ${PACKAGE_VERSION} -Requires.private: QtCore >= ${QT_MIN_VERSION}, QtCore < ${QT_MAX_VERSION}, QtDBus >= ${QT_MIN_VERSION}, QtDBus < ${QT_MAX_VERSION}, TelepathyQt${QT_VERSION_MAJOR} = ${PACKAGE_VERSION} +Requires.private: Qt${QT_VERSION_PC}Core >= ${QT_MIN_VERSION}, Qt${QT_VERSION_PC}Core < ${QT_MAX_VERSION}, Qt${QT_VERSION_PC}DBus >= ${QT_MIN_VERSION}, Qt${QT_VERSION_PC}DBus < ${QT_MAX_VERSION}, TelepathyQt${QT_VERSION_MAJOR} = ${PACKAGE_VERSION} Libs: -L${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR} -ltelepathy-qt${QT_VERSION_MAJOR}-service Cflags: -I${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}/telepathy-qt${QT_VERSION_MAJOR} -- 1.9.1 ++++++ search-for-farstream0.2.diff ++++++ diff --git a/cmake/modules/FindFarstream.cmake b/cmake/modules/FindFarstream.cmake index de42c29..abc311b 100644 --- a/cmake/modules/FindFarstream.cmake +++ b/cmake/modules/FindFarstream.cmake @@ -25,7 +25,7 @@ if (NOT WIN32) if (FARSTREAM_MIN_VERSION) PKG_CHECK_MODULES(PC_FARSTREAM farstream-0.1>=${FARSTREAM_MIN_VERSION}) else (FARSTREAM_MIN_VERSION) - PKG_CHECK_MODULES(PC_FARSTREAM farstream-0.1) + PKG_CHECK_MODULES(PC_FARSTREAM farstream-0.2) endif (FARSTREAM_MIN_VERSION) set(FARSTREAM_DEFINITIONS ${PC_FARSTREAM_CFLAGS_OTHER}) endif (NOT WIN32) @@ -34,10 +34,10 @@ find_path(FARSTREAM_INCLUDE_DIR farstream/fs-conference.h PATHS ${PC_FARSTREAM_INCLUDEDIR} ${PC_FARSTREAM_INCLUDE_DIRS} - PATH_SUFFIXES farstream-0.1 + PATH_SUFFIXES farstream-0.2 ) -find_library(FARSTREAM_LIBRARIES NAMES farstream-0.1 +find_library(FARSTREAM_LIBRARIES NAMES farstream-0.2 PATHS ${PC_FARSTREAM_LIBDIR} ${PC_FARSTREAM_LIBRARY_DIRS} ++++++ search-for-gstreamer1.0.diff ++++++ diff -urNB telepathy-qt4-0.9.3.orig/cmake/modules/FindGStreamer.cmake telepathy-qt4-0.9.3/cmake/modules/FindGStreamer.cmake --- telepathy-qt4-0.9.3.orig/cmake/modules/FindGStreamer.cmake 2012-07-13 19:40:23.000000000 +0200 +++ telepathy-qt4-0.9.3/cmake/modules/FindGStreamer.cmake 2013-07-20 21:09:05.023740233 +0200 @@ -5,76 +5,58 @@ # GSTREAMER_INCLUDE_DIR - the GStreamer include directory # GSTREAMER_LIBRARIES - the libraries needed to use GStreamer # GSTREAMER_DEFINITIONS - Compiler switches required for using GStreamer +# GSTREAMER_VERSION - the version of GStreamer -# Copyright (c) 2006, Tim Beaulen <tbscope(a)gmail.com> -# -# Redistribution and use is allowed according to the terms of the BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. +# Copyright (c) 2008 Helio Chissini de Castro, <helio(a)kde.org> +# (c)2006, Tim Beaulen <tbscope(a)gmail.com> -# TODO: Other versions --> GSTREAMER_X_Y_FOUND (Example: GSTREAMER_0_8_FOUND and GSTREAMER_0_10_FOUND etc) +# TODO: Other versions --> GSTREAMER_X_Y_FOUND (Example: GSTREAMER_0_8_FOUND and GSTREAMER_1.0_FOUND etc) -IF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY) + +IF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY) # in cache already - SET(GSTREAMER_FIND_QUIETLY TRUE) -ELSE (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY) - SET(GSTREAMER_FIND_QUIETLY FALSE) -ENDIF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY) + SET(GStreamer_FIND_QUIETLY TRUE) +ELSE (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY) + SET(GStreamer_FIND_QUIETLY FALSE) +ENDIF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY) IF (NOT WIN32) + FIND_PACKAGE(PkgConfig REQUIRED) # use pkg-config to get the directories and then use these values # in the FIND_PATH() and FIND_LIBRARY() calls - FIND_PACKAGE(PkgConfig) - PKG_CHECK_MODULES(PC_GSTREAMER gstreamer-0.10) - #MESSAGE(STATUS "DEBUG: GStreamer include directory = ${GSTREAMER_INCLUDE_DIRS}") - #MESSAGE(STATUS "DEBUG: GStreamer link directory = ${GSTREAMER_LIBRARY_DIRS}") - #MESSAGE(STATUS "DEBUG: GStreamer CFlags = ${GSTREAMER_CFLAGS_OTHER}") - SET(GSTREAMER_DEFINITIONS ${PC_GSTREAMER_CFLAGS_OTHER}) + # don't make this check required - otherwise you can't use macro_optional_find_package on this one + PKG_CHECK_MODULES(PKG_GSTREAMER gstreamer-1.0) + SET(GSTREAMER_VERSION ${PKG_GSTREAMER_VERSION}) + SET(GSTREAMER_DEFINITIONS ${PKG_GSTREAMER_CFLAGS}) ENDIF (NOT WIN32) FIND_PATH(GSTREAMER_INCLUDE_DIR gst/gst.h PATHS - ${PC_GSTREAMER_INCLUDEDIR} - ${PC_GSTREAMER_INCLUDE_DIRS} - PATH_SUFFIXES gstreamer-0.10 + ${PKG_GSTREAMER_INCLUDE_DIRS} + PATH_SUFFIXES gstreamer-1.0 ) -FIND_LIBRARY(GSTREAMER_LIBRARIES NAMES gstreamer-0.10 +FIND_LIBRARY(GSTREAMER_LIBRARIES NAMES gstreamer-1.0 PATHS - ${PC_GSTREAMER_LIBDIR} - ${PC_GSTREAMER_LIBRARY_DIRS} + ${PKG_GSTREAMER_LIBRARY_DIRS} ) -FIND_LIBRARY(GSTREAMER_BASE_LIBRARY NAMES gstbase-0.10 +FIND_LIBRARY(GSTREAMER_BASE_LIBRARY NAMES gstbase-1.0 PATHS - ${PC_GSTREAMER_LIBDIR} - ${PC_GSTREAMER_LIBRARY_DIRS} - ) - -FIND_LIBRARY(GSTREAMER_INTERFACE_LIBRARY NAMES gstinterfaces-0.10 - PATHS - ${PC_GSTREAMER_LIBDIR} - ${PC_GSTREAMER_LIBRARY_DIRS} + ${PKG_GSTREAMER_LIBRARY_DIRS} ) IF (GSTREAMER_INCLUDE_DIR) - #MESSAGE(STATUS "DEBUG: Found GStreamer include dir: ${GSTREAMER_INCLUDE_DIR}") ELSE (GSTREAMER_INCLUDE_DIR) MESSAGE(STATUS "GStreamer: WARNING: include dir not found") ENDIF (GSTREAMER_INCLUDE_DIR) IF (GSTREAMER_LIBRARIES) - #MESSAGE(STATUS "DEBUG: Found GStreamer library: ${GSTREAMER_LIBRARIES}") ELSE (GSTREAMER_LIBRARIES) MESSAGE(STATUS "GStreamer: WARNING: library not found") ENDIF (GSTREAMER_LIBRARIES) -IF (GSTREAMER_INTERFACE_LIBRARY) - #MESSAGE(STATUS "DEBUG: Found GStreamer interface library: ${GSTREAMER_INTERFACE_LIBRARY}") -ELSE (GSTREAMER_INTERFACE_LIBRARY) - MESSAGE(STATUS "GStreamer: WARNING: interface library not found") -ENDIF (GSTREAMER_INTERFACE_LIBRARY) - INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(GStreamer DEFAULT_MSG GSTREAMER_LIBRARIES GSTREAMER_INCLUDE_DIR GSTREAMER_BASE_LIBRARY GSTREAMER_INTERFACE_LIBRARY) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(GStreamer DEFAULT_MSG GSTREAMER_LIBRARIES GSTREAMER_INCLUDE_DIR GSTREAMER_BASE_LIBRARY) -MARK_AS_ADVANCED(GSTREAMER_INCLUDE_DIR GSTREAMER_LIBRARIES GSTREAMER_BASE_LIBRARY GSTREAMER_INTERFACE_LIBRARY) +MARK_AS_ADVANCED(GSTREAMER_INCLUDE_DIR GSTREAMER_LIBRARIES GSTREAMER_BASE_LIBRARY) ++++++ search-for-telepathy-farstream-0.4.diff ++++++ diff --git a/TelepathyQt/Farstream/TelepathyQtFarstream-uninstalled.pc.in b/TelepathyQt/Farstream/TelepathyQtFarstream-uninstalled.pc.in index 1c608ad..2670265 100644 --- a/TelepathyQt/Farstream/TelepathyQtFarstream-uninstalled.pc.in +++ b/TelepathyQt/Farstream/TelepathyQtFarstream-uninstalled.pc.in @@ -6,6 +6,6 @@ abs_top_srcdir=${CMAKE_SOURCE_DIR} Name: TelepathyQt${QT_VERSION_MAJOR}Farstream (uninstalled copy) Description: Qt Telepathy Farstream utility library for the Telepathy framework Version: ${PACKAGE_VERSION} -Requires.private: QtCore >= ${QT_MIN_VERSION}, QtCore < ${QT_MAX_VERSION}, QtDBus >= ${QT_MIN_VERSION}, QtDBus < ${QT_MAX_VERSION}, telepathy-glib >= ${TELEPATHY_GLIB_MIN_VERSION}, telepathy-farstream >= ${TELEPATHY_FARSTREAM_MIN_VERSION}, TelepathyQt${QT_VERSION_MAJOR} = ${PACKAGE_VERSION} +Requires.private: QtCore >= ${QT_MIN_VERSION}, QtCore < ${QT_MAX_VERSION}, QtDBus >= ${QT_MIN_VERSION}, QtDBus < ${QT_MAX_VERSION}, telepathy-glib >= ${TELEPATHY_GLIB_MIN_VERSION}, telepathy-farstream-0.4 >= ${TELEPATHY_FARSTREAM_MIN_VERSION}, TelepathyQt${QT_VERSION_MAJOR} = ${PACKAGE_VERSION} Libs: ${CMAKE_BINARY_DIR}/TelepathyQt${QT_VERSION_MAJOR}/Farstream/libtelepathy-qt${QT_VERSION_MAJOR}-farstream.so Cflags: -I${CMAKE_SOURCE_DIR} -I${CMAKE_BINARY_DIR} diff --git a/TelepathyQt/Farstream/TelepathyQtFarstream.pc.in b/TelepathyQt/Farstream/TelepathyQtFarstream.pc.in index 1a66d6d..a8ac174 100644 --- a/TelepathyQt/Farstream/TelepathyQtFarstream.pc.in +++ b/TelepathyQt/Farstream/TelepathyQtFarstream.pc.in @@ -6,6 +6,6 @@ includedir=${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR} Name: TelepathyQt${QT_VERSION_MAJOR}Farstream Description: Qt Telepathy Farstream utility library for the Telepathy framework Version: ${PACKAGE_VERSION} -Requires.private: QtCore >= ${QT_MIN_VERSION}, QtCore < ${QT_MAX_VERSION}, QtDBus >= ${QT_MIN_VERSION}, QtDBus < ${QT_MAX_VERSION}, telepathy-glib >= ${TELEPATHY_GLIB_MIN_VERSION}, telepathy-farstream >= ${TELEPATHY_FARSTREAM_MIN_VERSION}, TelepathyQt${QT_VERSION_MAJOR} = ${PACKAGE_VERSION} +Requires.private: QtCore >= ${QT_MIN_VERSION}, QtCore < ${QT_MAX_VERSION}, QtDBus >= ${QT_MIN_VERSION}, QtDBus < ${QT_MAX_VERSION}, telepathy-glib >= ${TELEPATHY_GLIB_MIN_VERSION}, telepathy-farstream-0.4 >= ${TELEPATHY_FARSTREAM_MIN_VERSION}, TelepathyQt${QT_VERSION_MAJOR} = ${PACKAGE_VERSION} Libs: -L${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR} -ltelepathy-qt${QT_VERSION_MAJOR}-farstream Cflags: -I${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}/telepathy-qt${QT_VERSION_MAJOR} diff --git a/cmake/modules/FindTelepathyFarstream.cmake b/cmake/modules/FindTelepathyFarstream.cmake index 74b12d8..215ed28 100644 --- a/cmake/modules/FindTelepathyFarstream.cmake +++ b/cmake/modules/FindTelepathyFarstream.cmake @@ -23,9 +23,9 @@ if (NOT WIN32) # in the find_path() and find_library() calls find_package(PkgConfig) if (TELEPATHY_FARSTREAM_MIN_VERSION) - PKG_CHECK_MODULES(PC_TELEPATHY_FARSTREAM telepathy-farstream>=${TELEPATHY_FARSTREAM_MIN_VERSION}) + PKG_CHECK_MODULES(PC_TELEPATHY_FARSTREAM telepathy-farstream-0.4>=${TELEPATHY_FARSTREAM_MIN_VERSION} telepathy-farstream>=${TELEPATHY_FARSTREAM_MIN_VERSION}) else (TELEPATHY_FARSTREAM_MIN_VERSION) - PKG_CHECK_MODULES(PC_TELEPATHY_FARSTREAM telepathy-farstream) + PKG_CHECK_MODULES(PC_TELEPATHY_FARSTREAM telepathy-farstream-0.4 telepathy-farstream) endif (TELEPATHY_FARSTREAM_MIN_VERSION) set(TELEPATHY_FARSTREAM_DEFINITIONS ${PC_TELEPATHY_FARSTREAM_CFLAGS_OTHER}) endif (NOT WIN32) @@ -34,10 +34,10 @@ find_path(TELEPATHY_FARSTREAM_INCLUDE_DIR telepathy-farstream/telepathy-farstrea PATHS ${PC_TELEPATHY_FARSTREAM_INCLUDEDIR} ${PC_TELEPATHY_FARSTREAM_INCLUDE_DIRS} - PATH_SUFFIXES telepathy-1.0 + PATH_SUFFIXES telepathy-1.0-compat telepathy-1.0 ) -find_library(TELEPATHY_FARSTREAM_LIBRARIES NAMES telepathy-farstream +find_library(TELEPATHY_FARSTREAM_LIBRARIES NAMES telepathy-farstream-0.4 telepathy-farstream PATHS ${PC_TELEPATHY_FARSTREAM_LIBDIR} ${PC_TELEPATHY_FARSTREAM_LIBRARY_DIRS} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-pexpect for openSUSE:Factory
by root＠hilbert.suse.de 14 Apr '14

14 Apr '14

Hello community, here is the log from the commit of package python-pexpect for openSUSE:Factory checked in at 2014-04-14 20:47:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-pexpect (Old) and /work/SRC/openSUSE:Factory/.python-pexpect.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-pexpect" Changes: -------- --- /work/SRC/openSUSE:Factory/python-pexpect/python-pexpect.changes 2013-10-25 11:26:31.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-pexpect.new/python-pexpect.changes 2014-04-14 20:47:33.000000000 +0200 @@ -1,0 +2,20 @@ +Fri Apr 11 08:37:18 UTC 2014 - dmueller(a)suse.com + +- fix license (ISC) + +------------------------------------------------------------------- +Thu Apr 3 12:28:20 UTC 2014 - dmueller(a)suse.com + +- update to 3.1: + * Fix an issue that prevented importing pexpect on Python 3 when ``sys.stdout`` + was reassigned + * Improve prompt synchronisation in :mod:`~pexpect.pxssh` + * Fix pickling exception instances + * Fix handling exceptions from :func:`select.select` on Python 3 + * A new :ref:`unicode API <unicode>` was introduced. + * Python 3 is now supported, using a single codebase. + * Pexpect now requires at least Python 2.6 or 3.2. + * The modules other than pexpect, such as :mod:`pexpect.fdpexpect` and + * Ignoring ``SIGHUP`` is now optional + +------------------------------------------------------------------- Old: ---- pexpect-2.4.tar.gz python-pexpect-2.3.patch New: ---- pexpect-3.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-pexpect.spec ++++++ --- /var/tmp/diff_new_pack.WSevcb/_old 2014-04-14 20:47:33.000000000 +0200 +++ /var/tmp/diff_new_pack.WSevcb/_new 2014-04-14 20:47:33.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-pexpect # -# 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 @@ -18,10 +18,10 @@ Name: python-pexpect BuildRequires: python-devel -Version: 2.4 +Version: 3.1 Release: 0 Summary: Pure Python Expect-like module -License: MIT +License: ISC Group: Development/Libraries/Python Url: http://pexpect.sourceforge.net/ Source: https://pypi.python.org/packages/source/p/pexpect/pexpect-%{version}.tar.gz @@ -49,10 +49,10 @@ %defattr(-,root,root,-) %doc doc examples %{python_sitelib}/ANSI.py* +%{python_sitelib}/pexpect/ %{python_sitelib}/FSM.py* %{python_sitelib}/fdpexpect.py* %{python_sitelib}/pexpect-%{version}-py%{py_ver}.egg-info -%{python_sitelib}/pexpect.py* %{python_sitelib}/pxssh.py* %{python_sitelib}/screen.py* ++++++ pexpect-2.4.tar.gz -> pexpect-3.1.tar.gz ++++++ ++++ 20331 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 python-keystoneclient for openSUSE:Factory
by root＠hilbert.suse.de 14 Apr '14

14 Apr '14

Hello community, here is the log from the commit of package python-keystoneclient for openSUSE:Factory checked in at 2014-04-14 20:44:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-keystoneclient (Old) and /work/SRC/openSUSE:Factory/.python-keystoneclient.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-keystoneclient" Changes: -------- --- /work/SRC/openSUSE:Factory/python-keystoneclient/python-keystoneclient.changes 2014-04-03 18:37:11.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-keystoneclient.new/python-keystoneclient.changes 2014-04-14 20:44:10.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Apr 14 09:11:58 UTC 2014 - dmueller(a)suse.com + +- update to 0.7.1: + * Adds to Keystone to convert V2 endpoints to V3 + +------------------------------------------------------------------- Old: ---- python-keystoneclient-0.7.0.tar.gz New: ---- python-keystoneclient-0.7.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-keystoneclient.spec ++++++ --- /var/tmp/diff_new_pack.CPR3P1/_old 2014-04-14 20:44:11.000000000 +0200 +++ /var/tmp/diff_new_pack.CPR3P1/_new 2014-04-14 20:44:11.000000000 +0200 @@ -19,7 +19,7 @@ %define component keystoneclient Name: python-%{component} -Version: 0.7.0 +Version: 0.7.1 Release: 0 Summary: Openstack Identity (Keystone) API Client License: Apache-2.0 @@ -42,7 +42,7 @@ Requires: python-PrettyTable >= 0.7 Requires: python-iso8601 >= 0.1.8 Requires: python-netaddr >= 0.7.6 -Requires: python-oslo.config >= 1.2.0 +Requires: python-oslo.config >= 1.2 Requires: python-pbr >= 0.6 Requires: python-requests >= 1.1 Requires: python-six >= 1.5.2 @@ -80,9 +80,9 @@ Requires: python-coverage >= 3.6 Requires: python-discover Requires: python-fixtures >= 0.3.14 -Requires: python-httpretty >= 0.8.0 -Requires: python-mock >= 1.0 -Requires: python-mox3 >= 0.7.0 +Requires: python-httpretty >= 0.8 +Requires: python-mock >= 1 +Requires: python-mox3 >= 0.7 Requires: python-pycrypto >= 2.6 Requires: python-testrepository >= 0.0.18 Requires: python-testresources >= 0.2.4 ++++++ python-keystoneclient-0.7.0.tar.gz -> python-keystoneclient-0.7.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-keystoneclient-0.7.0/ChangeLog new/python-keystoneclient-0.7.1/ChangeLog --- old/python-keystoneclient-0.7.0/ChangeLog 2014-03-26 14:01:51.000000000 +0100 +++ new/python-keystoneclient-0.7.1/ChangeLog 2014-03-27 15:10:47.000000000 +0100 @@ -1,6 +1,11 @@ CHANGES ======= +0.7.1 +----- + +* Adds to Keystone to convert V2 endpoints to V3 + 0.7.0 ----- @@ -23,6 +28,7 @@ * document that --pass can be required * Authenticate via oauth * Add request/access token and consumer support for keystoneclient +* Add 'methods' to all v3 test tokens * Handle Token/Endpoint authentication * Updated from global requirements * Fix retry logic diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-keystoneclient-0.7.0/PKG-INFO new/python-keystoneclient-0.7.1/PKG-INFO --- old/python-keystoneclient-0.7.0/PKG-INFO 2014-03-26 14:01:51.000000000 +0100 +++ new/python-keystoneclient-0.7.1/PKG-INFO 2014-03-27 15:10:47.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: python-keystoneclient -Version: 0.7.0 +Version: 0.7.1 Summary: Client Library for OpenStack Identity Home-page: http://www.openstack.org/ Author: OpenStack diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-keystoneclient-0.7.0/examples/pki/cms/auth_v3_token_revoked.json new/python-keystoneclient-0.7.1/examples/pki/cms/auth_v3_token_revoked.json --- old/python-keystoneclient-0.7.0/examples/pki/cms/auth_v3_token_revoked.json 2014-03-26 14:00:49.000000000 +0100 +++ new/python-keystoneclient-0.7.1/examples/pki/cms/auth_v3_token_revoked.json 2014-03-27 15:09:44.000000000 +0100 @@ -6,6 +6,7 @@ "expires_at": "2038-01-18T21:14:07Z", "project": {"enabled": true, "description": null, "name": "tenant_name1", "id": "tenant_id1", "domain": {"id": "domain_id1", "name": "domain_name1"}}, "user": {"name": "revoked_username1", "id": "revoked_user_id1", "domain": {"id": "domain_id1", "name": "domain_name1"}}, - "roles": [{"name": "role1"}, {"name": "role2"}] + "roles": [{"name": "role1"}, {"name": "role2"}], + "methods": ["password"], } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-keystoneclient-0.7.0/examples/pki/cms/auth_v3_token_revoked.pem new/python-keystoneclient-0.7.1/examples/pki/cms/auth_v3_token_revoked.pem --- old/python-keystoneclient-0.7.0/examples/pki/cms/auth_v3_token_revoked.pem 2014-03-26 14:00:49.000000000 +0100 +++ new/python-keystoneclient-0.7.1/examples/pki/cms/auth_v3_token_revoked.pem 2014-03-27 15:09:44.000000000 +0100 @@ -1,6 +1,6 @@ -----BEGIN CMS----- -MIIINgYJKoZIhvcNAQcCoIIIJzCCCCMCAQExCTAHBgUrDgMCGjCCBkMGCSqGSIb3 -DQEHAaCCBjQEggYweyJ0b2tlbiI6DQogICAgeyJjYXRhbG9nIjogW3siZW5kcG9p +MIIIVgYJKoZIhvcNAQcCoIIIRzCCCEMCAQExCTAHBgUrDgMCGjCCBmMGCSqGSIb3 +DQEHAaCCBlQEggZQeyJ0b2tlbiI6DQogICAgeyJjYXRhbG9nIjogW3siZW5kcG9p bnRzIjogW3siYWRtaW5VUkwiOiAiaHR0cDovLzEyNy4wLjAuMTo4Nzc2L3YxLzY0 YjZmM2ZiY2M1MzQzNWU4YTYwZmNmODliYjY2MTdhIiwgInJlZ2lvbiI6ICJyZWdp b25PbmUiLCAiaW50ZXJuYWxVUkwiOiAiaHR0cDovLzEyNy4wLjAuMTo4Nzc2L3Yx @@ -33,14 +33,15 @@ bmFtZTEiLCAiaWQiOiAicmV2b2tlZF91c2VyX2lkMSIsICJkb21haW4iOiB7Imlk IjogImRvbWFpbl9pZDEiLCAibmFtZSI6ICJkb21haW5fbmFtZTEifX0sDQogICAg ICJyb2xlcyI6IFt7Im5hbWUiOiAicm9sZTEifSwgeyJuYW1lIjogInJvbGUyIn1d -DQogICAgfQ0KfQ0KMYIByjCCAcYCAQEwgaQwgZ4xCjAIBgNVBAUTATUxCzAJBgNV -BAYTAlVTMQswCQYDVQQIEwJDQTESMBAGA1UEBxMJU3Vubnl2YWxlMRIwEAYDVQQK -EwlPcGVuU3RhY2sxETAPBgNVBAsTCEtleXN0b25lMSUwIwYJKoZIhvcNAQkBFhZr -ZXlzdG9uZUBvcGVuc3RhY2sub3JnMRQwEgYDVQQDEwtTZWxmIFNpZ25lZAIBETAH -BgUrDgMCGjANBgkqhkiG9w0BAQEFAASCAQDIWHEFO42YbfdxOGw57VA0jd4+nSzi -7X5c6HmwnYbVm+zZwoNfLcwgzQeVMHm0yVzRy3LIqWglCoE/3MUAI14fCT+HKctW -DTbYM2n/9mx7+ZSPVUmFYopAbgWZ+xjJea1y8esCJFevoZ+BVScufs9+ytTbTAbg -9h/JkMJQtU36q2EAgVvcosYGdngahECK4drUFCvZEZoesB2LCRdxkwfkZtyau9uO -VrxauUEqWLCKOl+GKVWwlj+4t80q8UTx/BdNa60ufWmOyCusjpsRgT9Gba7YlPzN -mg395UFp8ob1ZM2QdeS/YmxbUD7OlKs6H8bgOK1lE1i6fuLnvc1L5pG6 +LA0KICAgICAibWV0aG9kcyI6IFsicGFzc3dvcmQiXSwNCiAgICB9DQp9DQoxggHK +MIIBxgIBATCBpDCBnjEKMAgGA1UEBRMBNTELMAkGA1UEBhMCVVMxCzAJBgNVBAgT +AkNBMRIwEAYDVQQHEwlTdW5ueXZhbGUxEjAQBgNVBAoTCU9wZW5TdGFjazERMA8G +A1UECxMIS2V5c3RvbmUxJTAjBgkqhkiG9w0BCQEWFmtleXN0b25lQG9wZW5zdGFj +ay5vcmcxFDASBgNVBAMTC1NlbGYgU2lnbmVkAgERMAcGBSsOAwIaMA0GCSqGSIb3 +DQEBAQUABIIBAI9qvSGYlIHoI0gWTZ55POWwj5Gjyr/SQ4q2e13m5bSnmvawGw6Z +Xa500UvvnUPHe/Nf4ExS0/hO2zn80hjLC+uEDwESlMMDTc29+TbafHTQOp+Zz742 +KdO+2Zv3UevStJK+wg+D0cKUmhmghyzzIsD44OmzLaGe+3mCqLkWFv8i7KX9rrb5 +Jqv8kbLm9bY7wlWqmYcaJyXy5SdJMKi1/aWm9nn5AOaujHTfV/bygQd8ZY9t4+6k +OwKPZlt5x1KA3IxGdJUFvIHj7am6j0auQ2TMx8x2vzPzy5+mBzB0u0XaENJsb9Jz +z+aVgXOQ81PbwwZmStONrwEVpjQeyEXY4pM= -----END CMS----- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-keystoneclient-0.7.0/examples/pki/cms/auth_v3_token_scoped.json new/python-keystoneclient-0.7.1/examples/pki/cms/auth_v3_token_scoped.json --- old/python-keystoneclient-0.7.0/examples/pki/cms/auth_v3_token_scoped.json 2014-03-26 14:00:49.000000000 +0100 +++ new/python-keystoneclient-0.7.1/examples/pki/cms/auth_v3_token_scoped.json 2014-03-27 15:09:44.000000000 +0100 @@ -1,4 +1,4 @@ -{"token": +{"token": {"catalog": [{"endpoints": [{"adminURL": "http://127.0.0.1:8776/v1/64b6f3fbcc53435e8a60fcf89bb6617a", "region": "regionOne", "internalURL": "http://127.0.0.1:8776/v1/64b6f3fbcc53435e8a60fcf89bb6617a", "publicURL": "http://127.0.0.1:8776/v1/64b6f3fbcc53435e8a60fcf89bb6617a"}], "endpoints_links": [], "type": "volume", "name": "volume"}, {"endpoints": [{"adminURL": "http://127.0.0.1:9292/v1", "region": "regionOne", "internalURL": "http://127.0.0.1:9292/v1", "publicURL": "http://127.0.0.1:9292/v1"}], "endpoints_links": [], "type": "image", "name": "glance"}, {"endpoints": [{"adminURL": "http://127.0.0.1:8774/v1.1/64b6f3fbcc53435e8a60fcf89bb6617a", "region": "regionOne", "internalURL": "http://127.0.0.1:8774/v1.1/64b6f3fbcc53435e8a60fcf89bb6617a", "publicURL": "http://127.0.0.1:8774/v1.1/64b6f3fbcc53435e8a60fcf89bb6617a"}], "endpoints_links": [], "type": "compute", "name": "nova"}, @@ -6,6 +6,7 @@ "expires_at": "2038-01-18T21:14:07Z", "project": {"enabled": true, "description": null, "name": "tenant_name1", "id": "tenant_id1", "domain": {"id": "domain_id1", "name": "domain_name1"}}, "user": {"name": "user_name1", "id": "user_id1", "domain": {"id": "domain_id1", "name": "domain_name1"}}, - "roles": [{"name": "role1"}, {"name": "role2"}] + "roles": [{"name": "role1"}, {"name": "role2"}], + "methods": ["password"] } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-keystoneclient-0.7.0/examples/pki/cms/auth_v3_token_scoped.pem new/python-keystoneclient-0.7.1/examples/pki/cms/auth_v3_token_scoped.pem --- old/python-keystoneclient-0.7.0/examples/pki/cms/auth_v3_token_scoped.pem 2014-03-26 14:00:49.000000000 +0100 +++ new/python-keystoneclient-0.7.1/examples/pki/cms/auth_v3_token_scoped.pem 2014-03-27 15:09:44.000000000 +0100 @@ -1,45 +1,46 @@ -----BEGIN CMS----- -MIIH/AYJKoZIhvcNAQcCoIIH7TCCB+kCAQExCTAHBgUrDgMCGjCCBgkGCSqGSIb3 -DQEHAaCCBfoEggX2eyJ0b2tlbiI6IA0KCXsiY2F0YWxvZyI6IFt7ImVuZHBvaW50 -cyI6IFt7ImFkbWluVVJMIjogImh0dHA6Ly8xMjcuMC4wLjE6ODc3Ni92MS82NGI2 -ZjNmYmNjNTM0MzVlOGE2MGZjZjg5YmI2NjE3YSIsICJyZWdpb24iOiAicmVnaW9u -T25lIiwgImludGVybmFsVVJMIjogImh0dHA6Ly8xMjcuMC4wLjE6ODc3Ni92MS82 -NGI2ZjNmYmNjNTM0MzVlOGE2MGZjZjg5YmI2NjE3YSIsICJwdWJsaWNVUkwiOiAi -aHR0cDovLzEyNy4wLjAuMTo4Nzc2L3YxLzY0YjZmM2ZiY2M1MzQzNWU4YTYwZmNm -ODliYjY2MTdhIn1dLCAiZW5kcG9pbnRzX2xpbmtzIjogW10sICJ0eXBlIjogInZv -bHVtZSIsICJuYW1lIjogInZvbHVtZSJ9LA0KCQkJICAgICB7ImVuZHBvaW50cyI6 -IFt7ImFkbWluVVJMIjogImh0dHA6Ly8xMjcuMC4wLjE6OTI5Mi92MSIsICJyZWdp -b24iOiAicmVnaW9uT25lIiwgImludGVybmFsVVJMIjogImh0dHA6Ly8xMjcuMC4w -LjE6OTI5Mi92MSIsICJwdWJsaWNVUkwiOiAiaHR0cDovLzEyNy4wLjAuMTo5Mjky -L3YxIn1dLCAiZW5kcG9pbnRzX2xpbmtzIjogW10sICJ0eXBlIjogImltYWdlIiwg -Im5hbWUiOiAiZ2xhbmNlIn0sDQoJCQkgICAgIHsiZW5kcG9pbnRzIjogW3siYWRt -aW5VUkwiOiAiaHR0cDovLzEyNy4wLjAuMTo4Nzc0L3YxLjEvNjRiNmYzZmJjYzUz -NDM1ZThhNjBmY2Y4OWJiNjYxN2EiLCAicmVnaW9uIjogInJlZ2lvbk9uZSIsICJp -bnRlcm5hbFVSTCI6ICJodHRwOi8vMTI3LjAuMC4xOjg3NzQvdjEuMS82NGI2ZjNm -YmNjNTM0MzVlOGE2MGZjZjg5YmI2NjE3YSIsICJwdWJsaWNVUkwiOiAiaHR0cDov -LzEyNy4wLjAuMTo4Nzc0L3YxLjEvNjRiNmYzZmJjYzUzNDM1ZThhNjBmY2Y4OWJi -NjYxN2EifV0sICJlbmRwb2ludHNfbGlua3MiOiBbXSwgInR5cGUiOiAiY29tcHV0 -ZSIsICJuYW1lIjogIm5vdmEifSwNCgkJCSAgICAgeyJlbmRwb2ludHMiOiBbeyJh -ZG1pblVSTCI6ICJodHRwOi8vMTI3LjAuMC4xOjM1MzU3L3YzIiwgInJlZ2lvbiI6 -ICJSZWdpb25PbmUiLCAiaW50ZXJuYWxVUkwiOiAiaHR0cDovLzEyNy4wLjAuMToz -NTM1Ny92MyIsICJwdWJsaWNVUkwiOiAiaHR0cDovLzEyNy4wLjAuMTo1MDAwL3Yz -In1dLCAiZW5kcG9pbnRzX2xpbmtzIjogW10sICJ0eXBlIjogImlkZW50aXR5Iiwg -Im5hbWUiOiAia2V5c3RvbmUifV0sDQoJICJleHBpcmVzX2F0IjogIjIwMzgtMDEt -MThUMjE6MTQ6MDdaIiwNCgkgInByb2plY3QiOiB7ImVuYWJsZWQiOiB0cnVlLCAi -ZGVzY3JpcHRpb24iOiBudWxsLCAibmFtZSI6ICJ0ZW5hbnRfbmFtZTEiLCAiaWQi -OiAidGVuYW50X2lkMSIsICJkb21haW4iOiB7ImlkIjogImRvbWFpbl9pZDEiLCAi -bmFtZSI6ICJkb21haW5fbmFtZTEifX0sDQoJICJ1c2VyIjogeyJuYW1lIjogInVz -ZXJfbmFtZTEiLCAiaWQiOiAidXNlcl9pZDEiLCAiZG9tYWluIjogeyJpZCI6ICJk -b21haW5faWQxIiwgIm5hbWUiOiAiZG9tYWluX25hbWUxIn19LA0KCSAicm9sZXMi -OiBbeyJuYW1lIjogInJvbGUxIn0sIHsibmFtZSI6ICJyb2xlMiJ9XQ0KCSB9DQp9 -DQoxggHKMIIBxgIBATCBpDCBnjEKMAgGA1UEBRMBNTELMAkGA1UEBhMCVVMxCzAJ -BgNVBAgTAkNBMRIwEAYDVQQHEwlTdW5ueXZhbGUxEjAQBgNVBAoTCU9wZW5TdGFj -azERMA8GA1UECxMIS2V5c3RvbmUxJTAjBgkqhkiG9w0BCQEWFmtleXN0b25lQG9w -ZW5zdGFjay5vcmcxFDASBgNVBAMTC1NlbGYgU2lnbmVkAgERMAcGBSsOAwIaMA0G -CSqGSIb3DQEBAQUABIIBAAppuE8x44hZEbLsthPztkKOcnVnXgzHWZyzEyHyg9ez -P4lMPtjmGmb2naVpWnR0Q6bIHDHvM4gv0MiHdWOLHKnEP1DA0fjbEQgerAAsTjnu -7qzt6R3XZTwfYPMTxbnLAHApwcFii2rmNTk+Nz6hJ84oF2rUX7w4+RMAuGJjzLWG -vkGhP0yf3n/gzr+D1sZRxxCpoqHj21ppZLpDIHGgWXrXkHGwou4Pba04iIHnjm0W -Xf0qUAuc9UJYtqJwLV0c/M4i8lhDBh2cTIbMAba+bQ4FKZibpDzxmUYq3YvLBmop -QpvBEFgqz4YkakREYvENe/kVA24vl5klzYPtiKpouM4= +MIIIHgYJKoZIhvcNAQcCoIIIDzCCCAsCAQExCTAHBgUrDgMCGjCCBisGCSqGSIb3 +DQEHAaCCBhwEggYYeyJ0b2tlbiI6DQoJeyJjYXRhbG9nIjogW3siZW5kcG9pbnRz +IjogW3siYWRtaW5VUkwiOiAiaHR0cDovLzEyNy4wLjAuMTo4Nzc2L3YxLzY0YjZm +M2ZiY2M1MzQzNWU4YTYwZmNmODliYjY2MTdhIiwgInJlZ2lvbiI6ICJyZWdpb25P +bmUiLCAiaW50ZXJuYWxVUkwiOiAiaHR0cDovLzEyNy4wLjAuMTo4Nzc2L3YxLzY0 +YjZmM2ZiY2M1MzQzNWU4YTYwZmNmODliYjY2MTdhIiwgInB1YmxpY1VSTCI6ICJo +dHRwOi8vMTI3LjAuMC4xOjg3NzYvdjEvNjRiNmYzZmJjYzUzNDM1ZThhNjBmY2Y4 +OWJiNjYxN2EifV0sICJlbmRwb2ludHNfbGlua3MiOiBbXSwgInR5cGUiOiAidm9s +dW1lIiwgIm5hbWUiOiAidm9sdW1lIn0sDQoJCQkgICAgIHsiZW5kcG9pbnRzIjog +W3siYWRtaW5VUkwiOiAiaHR0cDovLzEyNy4wLjAuMTo5MjkyL3YxIiwgInJlZ2lv +biI6ICJyZWdpb25PbmUiLCAiaW50ZXJuYWxVUkwiOiAiaHR0cDovLzEyNy4wLjAu +MTo5MjkyL3YxIiwgInB1YmxpY1VSTCI6ICJodHRwOi8vMTI3LjAuMC4xOjkyOTIv +djEifV0sICJlbmRwb2ludHNfbGlua3MiOiBbXSwgInR5cGUiOiAiaW1hZ2UiLCAi +bmFtZSI6ICJnbGFuY2UifSwNCgkJCSAgICAgeyJlbmRwb2ludHMiOiBbeyJhZG1p +blVSTCI6ICJodHRwOi8vMTI3LjAuMC4xOjg3NzQvdjEuMS82NGI2ZjNmYmNjNTM0 +MzVlOGE2MGZjZjg5YmI2NjE3YSIsICJyZWdpb24iOiAicmVnaW9uT25lIiwgImlu +dGVybmFsVVJMIjogImh0dHA6Ly8xMjcuMC4wLjE6ODc3NC92MS4xLzY0YjZmM2Zi +Y2M1MzQzNWU4YTYwZmNmODliYjY2MTdhIiwgInB1YmxpY1VSTCI6ICJodHRwOi8v +MTI3LjAuMC4xOjg3NzQvdjEuMS82NGI2ZjNmYmNjNTM0MzVlOGE2MGZjZjg5YmI2 +NjE3YSJ9XSwgImVuZHBvaW50c19saW5rcyI6IFtdLCAidHlwZSI6ICJjb21wdXRl +IiwgIm5hbWUiOiAibm92YSJ9LA0KCQkJICAgICB7ImVuZHBvaW50cyI6IFt7ImFk +bWluVVJMIjogImh0dHA6Ly8xMjcuMC4wLjE6MzUzNTcvdjMiLCAicmVnaW9uIjog +IlJlZ2lvbk9uZSIsICJpbnRlcm5hbFVSTCI6ICJodHRwOi8vMTI3LjAuMC4xOjM1 +MzU3L3YzIiwgInB1YmxpY1VSTCI6ICJodHRwOi8vMTI3LjAuMC4xOjUwMDAvdjMi +fV0sICJlbmRwb2ludHNfbGlua3MiOiBbXSwgInR5cGUiOiAiaWRlbnRpdHkiLCAi +bmFtZSI6ICJrZXlzdG9uZSJ9XSwNCgkgImV4cGlyZXNfYXQiOiAiMjAzOC0wMS0x +OFQyMToxNDowN1oiLA0KCSAicHJvamVjdCI6IHsiZW5hYmxlZCI6IHRydWUsICJk +ZXNjcmlwdGlvbiI6IG51bGwsICJuYW1lIjogInRlbmFudF9uYW1lMSIsICJpZCI6 +ICJ0ZW5hbnRfaWQxIiwgImRvbWFpbiI6IHsiaWQiOiAiZG9tYWluX2lkMSIsICJu +YW1lIjogImRvbWFpbl9uYW1lMSJ9fSwNCgkgInVzZXIiOiB7Im5hbWUiOiAidXNl +cl9uYW1lMSIsICJpZCI6ICJ1c2VyX2lkMSIsICJkb21haW4iOiB7ImlkIjogImRv +bWFpbl9pZDEiLCAibmFtZSI6ICJkb21haW5fbmFtZTEifX0sDQoJICJyb2xlcyI6 +IFt7Im5hbWUiOiAicm9sZTEifSwgeyJuYW1lIjogInJvbGUyIn1dLA0KICAgICAg +ICAgIm1ldGhvZHMiOiBbInBhc3N3b3JkIl0NCgkgfQ0KfQ0KMYIByjCCAcYCAQEw +gaQwgZ4xCjAIBgNVBAUTATUxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTESMBAG +A1UEBxMJU3Vubnl2YWxlMRIwEAYDVQQKEwlPcGVuU3RhY2sxETAPBgNVBAsTCEtl +eXN0b25lMSUwIwYJKoZIhvcNAQkBFhZrZXlzdG9uZUBvcGVuc3RhY2sub3JnMRQw +EgYDVQQDEwtTZWxmIFNpZ25lZAIBETAHBgUrDgMCGjANBgkqhkiG9w0BAQEFAASC +AQCjMu6pnPu6uCaCrbELvNmuRd5d4WbsI4N2eh6JlD6oTF4vOFo5JmZIsHTUW+oi +b5Tly7C4ivm549NomTOUvNugI9G2M25rh3EXVzv59Jrj1NlC1uBlgR5W3/x7yPSr +JyJumkRy3R/mVIbd+CV0f8qJ4tCia43QhGrLT3jPUl5LSQOfWOunDNL7wZF0OfBq +wNkwGLpN2i9oMlcXwOmEQw9Kh3Th0p54QogY06LmCjXsneyjl0J3hucLevdMHuXV +f3bonuowe8OEB/0GDkJFIZChKgtN6GRG5hIpb6zDjP9almmJk2Is1HdJPI1+94nj +coCr6q/P3e4rE48NZicsf1sM -----END CMS----- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-keystoneclient-0.7.0/keystoneclient/tests/client_fixtures.py new/python-keystoneclient-0.7.1/keystoneclient/tests/client_fixtures.py --- old/python-keystoneclient-0.7.0/keystoneclient/tests/client_fixtures.py 2014-03-26 14:00:49.000000000 +0100 +++ new/python-keystoneclient-0.7.1/keystoneclient/tests/client_fixtures.py 2014-03-27 15:09:44.000000000 +0100 @@ -265,6 +265,7 @@ self.v3_UUID_TOKEN_DEFAULT: { 'token': { 'expires_at': '2020-01-01T00:00:10.000123Z', + 'methods': ['password'], 'user': { 'id': 'user_id1', 'name': 'user_name1', @@ -291,6 +292,7 @@ self.v3_UUID_TOKEN_UNSCOPED: { 'token': { 'expires_at': '2020-01-01T00:00:10.000123Z', + 'methods': ['password'], 'user': { 'id': 'user_id1', 'name': 'user_name1', @@ -304,6 +306,7 @@ self.v3_UUID_TOKEN_DOMAIN_SCOPED: { 'token': { 'expires_at': '2020-01-01T00:00:10.000123Z', + 'methods': ['password'], 'user': { 'id': 'user_id1', 'name': 'user_name1', @@ -358,6 +361,7 @@ self.SIGNED_v3_TOKEN_SCOPED_KEY: { 'token': { 'expires': '2020-01-01T00:00:10.000123Z', + 'methods': ['password'], 'user': { 'id': 'user_id1', 'name': 'user_name1', @@ -384,6 +388,7 @@ self.v3_UUID_TOKEN_BIND: { 'token': { 'bind': {'kerberos': self.KERBEROS_BIND}, + 'methods': ['password'], 'expires_at': '2020-01-01T00:00:10.000123Z', 'user': { 'id': 'user_id1', @@ -412,6 +417,7 @@ 'token': { 'bind': {'FOO': 'BAR'}, 'expires_at': '2020-01-01T00:00:10.000123Z', + 'methods': ['password'], 'user': { 'id': 'user_id1', 'name': 'user_name1', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-keystoneclient-0.7.0/keystoneclient/v3/client.py new/python-keystoneclient-0.7.1/keystoneclient/v3/client.py --- old/python-keystoneclient-0.7.0/keystoneclient/v3/client.py 2014-03-26 14:00:51.000000000 +0100 +++ new/python-keystoneclient-0.7.1/keystoneclient/v3/client.py 2014-03-27 15:09:45.000000000 +0100 @@ -124,6 +124,8 @@ self._process_management_url(kwargs.get('region_name')) self.domain_name = self.auth_ref.domain_name self.domain_id = self.auth_ref.domain_id + if self._management_url: + self._management_url = self._management_url.replace('/v2.0', '/v3') def get_raw_token_from_identity_service(self, auth_url, user_id=None, username=None, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-keystoneclient-0.7.0/python_keystoneclient.egg-info/PKG-INFO new/python-keystoneclient-0.7.1/python_keystoneclient.egg-info/PKG-INFO --- old/python-keystoneclient-0.7.0/python_keystoneclient.egg-info/PKG-INFO 2014-03-26 14:01:51.000000000 +0100 +++ new/python-keystoneclient-0.7.1/python_keystoneclient.egg-info/PKG-INFO 2014-03-27 15:10:47.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: python-keystoneclient -Version: 0.7.0 +Version: 0.7.1 Summary: Client Library for OpenStack Identity Home-page: http://www.openstack.org/ Author: OpenStack -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-heatclient for openSUSE:Factory
by root＠hilbert.suse.de 14 Apr '14

14 Apr '14

Hello community, here is the log from the commit of package python-heatclient for openSUSE:Factory checked in at 2014-04-14 20:40:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-heatclient (Old) and /work/SRC/openSUSE:Factory/.python-heatclient.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-heatclient" Changes: -------- --- /work/SRC/openSUSE:Factory/python-heatclient/python-heatclient.changes 2014-04-03 19:40:08.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-heatclient.new/python-heatclient.changes 2014-04-14 20:40:46.000000000 +0200 @@ -1,0 +2,34 @@ +Mon Apr 14 09:07:45 UTC 2014 - dmueller(a)suse.com + +- update to 0.2.9: + * Updated from global requirements + * Process provider templates for included files + * Support Python 3 + * Python 3: fix test_template_utils.py + * Skip timeout_mins when not specify + * get_file: encode non utf-8 encoding files via base64 + * get_file: do not read same url once again + * Resolve files in resource types + * Do not use the '+' operation with dict_items() + * Python3: fix a bytes/str issue + * Updated from global requirements + * Using common methods from oslo cliutils + * Python 3: decode bytes before feeding them to jsonutils.loads() + * Output warnings for deprecated commands + * Add stack-preview support + * Workaround failing pypy gate job + * Remove dependent module py3kcompat + * Python 3: Fix YamlEnvironmentTest tests + * Oslo: sync strutils + * Add new tests to cover most of the requests port + * Modify stack ID lookup to only use stacks:lookup + * Add timeout option to stack-update + * Deprecate create/adopt --create-timeout in favor of --timeout + * Remove unused versions define in template_format.py + * Rename --timeout global option and make it work + * Python3: fix test_stack_list_with_args() + * Pass bytes to NamedTemporaryFile.write() + * Enable --help for each command + + +------------------------------------------------------------------- Old: ---- python-heatclient-0.2.8.tar.gz New: ---- python-heatclient-0.2.9.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-heatclient.spec ++++++ --- /var/tmp/diff_new_pack.8GFgH6/_old 2014-04-14 20:40:46.000000000 +0200 +++ /var/tmp/diff_new_pack.8GFgH6/_new 2014-04-14 20:40:46.000000000 +0200 @@ -19,7 +19,7 @@ %define component heatclient Name: python-%{component} -Version: 0.2.8 +Version: 0.2.9 Release: 0 Summary: OpenStack Orchestration (Heat) API Client License: Apache-2.0 ++++++ python-heatclient-0.2.8.tar.gz -> python-heatclient-0.2.9.tar.gz ++++++ ++++ 3641 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 python-django_openstack_auth for openSUSE:Factory
by root＠hilbert.suse.de 14 Apr '14

14 Apr '14

Hello community, here is the log from the commit of package python-django_openstack_auth for openSUSE:Factory checked in at 2014-04-14 20:40:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-django_openstack_auth (Old) and /work/SRC/openSUSE:Factory/.python-django_openstack_auth.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-django_openstack_auth" Changes: -------- --- /work/SRC/openSUSE:Factory/python-django_openstack_auth/python-django_openstack_auth.changes 2014-01-23 15:54:02.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-django_openstack_auth.new/python-django_openstack_auth.changes 2014-04-14 20:40:20.000000000 +0200 @@ -1,0 +2,57 @@ +Tue Apr 8 14:50:25 UTC 2014 - dmueller(a)suse.com + +- fix requires on SLE11 + +------------------------------------------------------------------- +Tue Apr 8 14:12:53 UTC 2014 - dmueller(a)suse.com + +- update to 1.1.5: + * no real change, just fixing version number (for requires) + +------------------------------------------------------------------- +Fri Mar 7 11:32:52 UTC 2014 - speilicke(a)suse.com + +- Update to version django_openstack_auth-1.1.4.3.gdd98eca: + * Updated from global requirements + * Sort project list by name + 1.1.4 + * updating version specification + * Have tox install via setup.py develop + * Updated from global requirements + * Support Django 1.4, 1.5 and 1.6 + * Require user to be logged in when switching regions + * Fixed urls import + * Fix django.conf.urls.defaults imports + * Refresh request.user on session updates + * Pass OPENSTACK_SSL_CACERT setting to keystone + * Giving focus on username field on log in page + 1.1.3 + * Bump version for 1.1.3 + * Import translations from Transifex for Havana RC1 + * Add I18N related configurations + * Revoking token when switching tenant or loging out + * Add Apache2 licence header in data_v3.py + * Make auth backend use OPENSTACK_ENDPOINT_TYPE parameter from settings + * Missing check, supporting changes in horizon for middleware changes + * Update message translation files +- Add python_requires source service +- Fix dependencies + +------------------------------------------------------------------- +Thu Feb 13 13:43:05 UTC 2014 - dmueller(a)suse.com + +- added patches: + * 0001-Switch-over-to-oslosphinx.patch + +------------------------------------------------------------------- +Tue Feb 11 15:28:34 UTC 2014 - speilicke(a)suse.com + +- Replace git_tarballs source service with download_files and set_version + + Use upstream URL as source (enables verification) + +------------------------------------------------------------------- +Thu Feb 6 13:03:54 UTC 2014 - dmueller(a)suse.com + +- go back to the compat requirements name for sle11 + +------------------------------------------------------------------- Old: ---- django_openstack_auth-master.tar.gz New: ---- django_openstack_auth-1.1.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-django_openstack_auth.spec ++++++ --- /var/tmp/diff_new_pack.EabmoP/_old 2014-04-14 20:40:21.000000000 +0200 +++ /var/tmp/diff_new_pack.EabmoP/_new 2014-04-14 20:40:21.000000000 +0200 @@ -17,26 +17,31 @@ Name: python-django_openstack_auth -Version: 1.1.3.13.gb2eab84 +Version: 1.1.5 Release: 0 Summary: A Django auth backend for use with the OpenStack Keystone License: BSD-3-Clause Group: Development/Languages/Python Url: http://django_openstack_auth.readthedocs.org/ -Source: django_openstack_auth-master.tar.gz +Source: https://pypi.python.org/packages/source/d/django_openstack_auth/django_open… BuildRequires: python-devel -BuildRequires: python-pbr >= 0.5.21 +BuildRequires: python-pbr >= 0.6 # Documentation requirements: -BuildRequires: python-Sphinx -BuildRequires: python-oslo.sphinx +BuildRequires: python-Sphinx >= 1.1.2 +BuildRequires: python-oslosphinx # Test requirements: +BuildRequires: python-Babel >= 1.3 +%if 0%{?suse_version} && 0%{?suse_version} <= 1110 +BuildRequires: python-django >= 1.4 +Requires: python-django >= 1.4 +%else BuildRequires: python-Django >= 1.4 -#BuildRequires: python-hacking >= 0.8.0 -BuildRequires: python-keystoneclient >= 0.4.1 -BuildRequires: python-mox >= 0.5.3 Requires: python-Django >= 1.4 -Requires: python-keystoneclient >= 0.4.1 -Requires: python-pbr >= 0.5.21 +%endif +BuildRequires: python-keystoneclient >= 0.6.0 +BuildRequires: python-mox >= 0.5.3 +Requires: python-keystoneclient >= 0.6.0 +Requires: python-pbr >= 0.6 BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} && 0%{?suse_version} <= 1110 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} @@ -54,7 +59,7 @@ The current version is designed to work with the Keystone V2 API. %prep -%setup -q -n django_openstack_auth-1.1.3.13.gb2eab84 +%setup -q -n django_openstack_auth-%{version} %build python setup.py build ++++++ _service ++++++ --- /var/tmp/diff_new_pack.EabmoP/_old 2014-04-14 20:40:21.000000000 +0200 +++ /var/tmp/diff_new_pack.EabmoP/_new 2014-04-14 20:40:21.000000000 +0200 @@ -1,10 +1,12 @@ <services> - <service name="git_tarballs" mode="disabled"> - <param name="url">http://tarballs.openstack.org/django_openstack_auth/django_openstack_auth-m…</param> - <param name="email">opensuse-cloud(a)opensuse.org</param> - <param name="plain-version">True</param> + <service mode="disabled" name="download_files"> + <param name="changesgenerate">enable</param> + </service> + <service mode="disabled" name="set_version"> + <param name="basename">django_openstack_auth</param> + </service> + <service mode="disabled" name="python_requires"> </service> - <service name="refresh_patches" mode="disabled"> <param name="changesgenerate">enable</param> </service> ++++++ django_openstack_auth-master.tar.gz -> django_openstack_auth-1.1.5.tar.gz ++++++ ++++ 2030 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 python-ceilometerclient for openSUSE:Factory
by root＠hilbert.suse.de 14 Apr '14

14 Apr '14

Hello community, here is the log from the commit of package python-ceilometerclient for openSUSE:Factory checked in at 2014-04-14 20:39:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-ceilometerclient (Old) and /work/SRC/openSUSE:Factory/.python-ceilometerclient.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-ceilometerclient" Changes: -------- --- /work/SRC/openSUSE:Factory/python-ceilometerclient/python-ceilometerclient.changes 2014-03-09 18:44:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-ceilometerclient.new/python-ceilometerclient.changes 2014-04-14 20:39:58.000000000 +0200 @@ -2 +2 @@ -Fri Feb 14 10:52:48 UTC 2014 - speilicke(a)suse.com +Mon Apr 14 09:10:13 UTC 2014 - dmueller(a)suse.com @@ -3,0 +4,113 @@ +- update to 1.0.10: + * Ensure statistics aggregates are ordered with parameterized first + * Implementation of statistics aggregators + * Adds alarm time constraint support to ceilometer CLI + * Updated from global requirements + * Fix temporary pypy gate issue with setuptools + * Add complex query support for alarm history + * Add complex query support for alarms + * Checking the type of auth_token, and fixing it if necessary + * Deprecate 'alarm-update' + * Add complex query support for samples + * test created virtual env directory should git ignored + * Updated from global requirements + * Updated from global requirements + * py3kcompat: remove in python-ceilometerclient + * Python 3 compatibility + * Fix a typo in a comment in v2 client + * test_url_generation_with_proxy: do not use contextlib.nested() + * Ensure url sent to proxy don't have redundant / + * Remove unused mock in v2/test_shell.py + * fix help message of deprecated command + * Sync with Oslo + * Python 3: fix format_nested_list_of_dict() + * Remove tox locale overrides + * Improve help strings + +------------------------------------------------------------------- +Thu Mar 27 10:13:15 UTC 2014 - dmueller(a)suse.com + +- switch back to released version (1.0.9) + +------------------------------------------------------------------- +Thu Mar 27 01:50:23 UTC 2014 - cloud-devel(a)suse.de + +- Update to version python-ceilometerclient-1.0.9.39.gb99547b: + * Adds alarm time constraint support to ceilometer CLI + +------------------------------------------------------------------- +Wed Mar 26 01:51:48 UTC 2014 - cloud-devel(a)suse.de + +- Update to version python-ceilometerclient-1.0.9.37.g53d5a22: + * Add complex query support for alarm history + * Add complex query support for alarms + +------------------------------------------------------------------- +Sat Mar 22 01:49:17 UTC 2014 - cloud-devel(a)suse.de + +- Update to version python-ceilometerclient-1.0.9.33.g43bb64f: + * Updated from global requirements + * Deprecate 'alarm-update' + +------------------------------------------------------------------- +Fri Mar 21 01:38:59 UTC 2014 - cloud-devel(a)suse.de + +- Update to version python-ceilometerclient-1.0.9.30.gdd048f8: + * Fix temporary pypy gate issue with setuptools + * Checking the type of auth_token, and fixing it if necessary + * Add complex query support for samples + * fix help message of deprecated command + +------------------------------------------------------------------- +Tue Mar 4 00:46:36 UTC 2014 - cloud-devel(a)suse.de + +- Update to version python-ceilometerclient-1.0.9.23.g3e8045c: + * test created virtual env directory should git ignored + * Updated from global requirements + +------------------------------------------------------------------- +Thu Feb 27 01:34:53 UTC 2014 - cloud-devel(a)suse.de + +- Update to version python-ceilometerclient-1.0.9.20.gf7f145c: + * Updated from global requirements + * py3kcompat: remove in python-ceilometerclient + +------------------------------------------------------------------- +Sat Feb 22 01:40:35 UTC 2014 - cloud-devel(a)suse.de + +- Update to version python-ceilometerclient-1.0.9.17.g5b4563d: + * Python 3 compatibility + +------------------------------------------------------------------- +Fri Feb 21 01:40:12 UTC 2014 - cloud-devel(a)suse.de + +- Update to version python-ceilometerclient-1.0.9.15.g98a28a0: + * Improve help strings + +------------------------------------------------------------------- +Thu Feb 20 00:51:46 UTC 2014 - cloud-devel(a)suse.de + +- Update to version python-ceilometerclient-1.0.9.13.g02d9cea: + * Fix a typo in a comment in v2 client + * test_url_generation_with_proxy: do not use contextlib.nested() + +------------------------------------------------------------------- +Sun Feb 16 00:54:52 UTC 2014 - cloud-devel(a)suse.de + +- Update to version python-ceilometerclient-1.0.9.10.g97957ea: + * Remove unused mock in v2/test_shell.py + * Remove tox locale overrides + +------------------------------------------------------------------- +Fri Feb 14 08:24:29 UTC 2014 - cloud-devel(a)suse.de + +- Update to version python-ceilometerclient-1.0.9.6.g85c80f0: + * Ensure url sent to proxy don't have redundant / + +------------------------------------------------------------------- +Tue Feb 11 15:32:08 UTC 2014 - speilicke(a)suse.com + +- Update to version python-ceilometerclient-1.0.9.5.g0eed59f: + * Sync with Oslo + * Python 3: fix format_nested_list_of_dict() + 1.0.9 @@ -5,0 +119,209 @@ +- Fix requirements + +------------------------------------------------------------------- +Wed Jan 29 01:34:09 UTC 2014 - opensuse-cloud(a)opensuse.org + +- Update to version 1.0.8.60: + + Raise traceback on error when using CLI and -debug + + Update client to display data type of traits + + Remove unused import for print_function + + Modify ceilometer client cmd line help info + +------------------------------------------------------------------- +Tue Jan 28 00:52:11 UTC 2014 - opensuse-cloud(a)opensuse.org + +- Update to version 1.0.8.52: + + Fix typos picked up by misspellings + + Using common methods from oslo cliutils + + return sample info when creating sample with CLI + + Remove print debugs statements. + + Remove ununsed httplib2 requirement + +------------------------------------------------------------------- +Sat Jan 25 01:48:49 UTC 2014 - opensuse-cloud(a)opensuse.org + +- Update to version 1.0.8.42: + + Avoid discarding alarm-threshold-create --query option + +------------------------------------------------------------------- +Fri Jan 24 13:02:18 UTC 2014 - opensuse-cloud(a)opensuse.org + +- Update to version 1.0.8.40: + + replace assertTrue(isinstance) to assertIsInstance + + Using common method 'bool_from_string' from oslo strutils + + abbreviating --meter-name to -m in alarm commands + + Replace inheritance hierarchy with composition + + Add support for groupby in statistics for API v2 + + Enable hacking H233 rule + +------------------------------------------------------------------- +Mon Jan 20 01:06:33 UTC 2014 - opensuse-cloud(a)opensuse.org + +- Update to version 1.0.8.28: + + Remove dependencies on pep8, pyflakes and flake8 + +------------------------------------------------------------------- +Sat Jan 18 01:03:27 UTC 2014 - opensuse-cloud(a)opensuse.org + +- Update to version 1.0.8.26: + + fix optional parameter of creating sample + +------------------------------------------------------------------- +Fri Jan 17 01:01:18 UTC 2014 - opensuse-cloud(a)opensuse.org + +- Update to version 1.0.8.24: + + Remove unused imports + +------------------------------------------------------------------- +Thu Jan 16 12:23:18 UTC 2014 - dmueller(a)suse.com + +- fix requires + +------------------------------------------------------------------- +Thu Jan 16 00:51:48 UTC 2014 - opensuse-cloud(a)opensuse.org + +- Update to version 1.0.8.22: + + Python 3: fix test_sample_list + + client looking at wrong cacert argument name + + Supports bash_completion for ceilometerclient + +------------------------------------------------------------------- +Tue Jan 14 00:52:40 UTC 2014 - opensuse-cloud(a)opensuse.org + +- Update to version 1.0.8.16: + + Support the Event API + +------------------------------------------------------------------- +Fri Jan 10 11:48:28 UTC 2014 - opensuse-cloud(a)opensuse.org + +- Update to version 1.0.8.15: + + Fix the ceilometerlient log curl request incorrectly ++++ 157 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/python-ceilometerclient/python-ceilometerclient.changes ++++ and /work/SRC/openSUSE:Factory/.python-ceilometerclient.new/python-ceilometerclient.changes Old: ---- python-ceilometerclient-1.0.6.tar.gz New: ---- python-ceilometerclient-1.0.10.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-ceilometerclient.spec ++++++ --- /var/tmp/diff_new_pack.OyOirY/_old 2014-04-14 20:39:59.000000000 +0200 +++ /var/tmp/diff_new_pack.OyOirY/_new 2014-04-14 20:39:59.000000000 +0200 @@ -18,9 +18,8 @@ %define component ceilometerclient - Name: python-%{component} -Version: 1.0.6 +Version: 1.0.10 Release: 0 Url: https://github.com/openstack/python-ceilometerclient Summary: OpenStack Metering (Ceilometer) API Client @@ -29,19 +28,18 @@ Source: http://tarballs.openstack.org/python-ceilometerclient/python-ceilometerclie… BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: openstack-suse-macros -BuildRequires: python-base -BuildRequires: python-distribute +BuildRequires: python-devel BuildRequires: python-pbr +Requires: python-PrettyTable >= 0.7 +Requires: python-httplib2 +Requires: python-iso8601 >= 0.1.8 +Requires: python-keystoneclient >= 0.4.1 +Requires: python-six >= 1.4.1 %if 0%{?suse_version} && 0%{?suse_version} <= 1110 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %else BuildArch: noarch %endif -Requires: python-PrettyTable >= 0.6 -Requires: python-httplib2 -Requires: python-iso8601 >= 0.1.4 -Requires: python-keystoneclient >= 0.3.2 -Requires: python-pbr >= 0.5.21 %description This is a client library for Ceilometer built on the Ceilometer API. It @@ -57,12 +55,8 @@ Requires: python-discover %endif Requires: python-fixtures >= 0.3.14 -Requires: python-flake8 >= 2.0 -Requires: python-hacking >= 0.5.6 -Requires: python-mock >= 1.0 +Requires: python-hacking >= 0.8.0 Requires: python-mox >= 0.5.3 -Requires: python-pep8 >= 1.4.5 -Requires: python-pyflakes >= 0.7.2 Requires: python-python-subunit Requires: python-testrepository >= 0.0.17 Requires: python-testtools >= 0.9.32 @@ -71,7 +65,7 @@ This package contains testsuite files for %{name}. %prep -%setup -q -n python-ceilometerclient-%{version} +%setup -q %openstack_cleanup_prep echo %{version} > ceilometerclient/versioninfo ++++++ python-ceilometerclient-1.0.6.tar.gz -> python-ceilometerclient-1.0.10.tar.gz ++++++ ++++ 8722 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 openstack-quickstart for openSUSE:Factory
by root＠hilbert.suse.de 14 Apr '14

14 Apr '14

Hello community, here is the log from the commit of package openstack-quickstart for openSUSE:Factory checked in at 2014-04-14 20:38:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openstack-quickstart (Old) and /work/SRC/openSUSE:Factory/.openstack-quickstart.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openstack-quickstart" Changes: -------- --- /work/SRC/openSUSE:Factory/openstack-quickstart/openstack-quickstart.changes 2014-03-09 18:29:23.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.openstack-quickstart.new/openstack-quickstart.changes 2014-04-14 20:38:17.000000000 +0200 @@ -2 +2 @@ -Sat Feb 22 00:39:47 UTC 2014 - cloud-devel(a)suse.de +Thu Mar 20 01:42:55 UTC 2014 - cloud-devel(a)suse.de @@ -4,2 +4,3 @@ -- Update to latest git (72b2b3d): - + remove run_ssh on havana again +- Update to version 2013.2+git.1395248710.2704f7d: + + Fix start ordering issue + + Configure tempest more completely @@ -8 +9 @@ -Fri Feb 21 00:45:01 UTC 2014 - cloud-devel(a)suse.de +Sat Feb 22 01:35:37 UTC 2014 - cloud-devel(a)suse.de @@ -10,3 +11,2 @@ -- Update to latest git (76c0259): - + cleanup - + Fix Horizon setup +- Update to version 2013.2+git.1392994530.a5e30ad: + + Enable Neutron MeteringPlugin @@ -15 +15 @@ -Thu Feb 13 09:13:38 UTC 2014 - cloud-devel(a)suse.de +Fri Feb 21 00:45:29 UTC 2014 - cloud-devel(a)suse.de @@ -17,2 +17,2 @@ -- Update to latest git (71e5ddf): - + Enable use_namespaces consistently for dhcp and l3 agents +- Update to version 2013.2+git.1392910340.edcd268: + + Fix Horizon setup @@ -21 +21 @@ -Sun Feb 2 01:02:05 UTC 2014 - cloud-devel(a)suse.de +Wed Feb 19 00:49:05 UTC 2014 - cloud-devel(a)suse.de @@ -23,2 +23,4 @@ -- Update to latest git (cc1cb63): - + Install more neutron agents when running with tempest +- Update to version 2013.2+git.1392721072.72a499a: + + Cinder now needs dm_snapshot to be loaded + + Make Neutron discovery work in exception mode + + Cleanups @@ -27 +29 @@ -Wed Jan 29 09:12:33 UTC 2014 - speilicke(a)suse.com +Fri Feb 14 01:31:26 UTC 2014 - cloud-devel(a)suse.de @@ -29 +31,2 @@ -- Add refresh_patches source service +- Update to version 2013.2+git.1392282653.523cc53: + + Enable use_namespaces consistently for dhcp and l3 agents @@ -32 +35 @@ -Mon Jan 27 07:31:54 UTC 2014 - cloud-devel(a)suse.de +Sat Jan 25 11:16:39 UTC 2014 - dmueller(a)suse.com @@ -34,2 +37,3 @@ -- Update to latest git (5443a1f): - + fixup! Extend range for fixed network +- Update to version 2013.2+git.1390648558.984eeb5: + + Install more neutron agents when running with tempest + + Fix typo @@ -38 +42 @@ -Fri Jan 24 13:01:49 UTC 2014 - cloud-devel(a)suse.de +Fri Jan 24 13:20:10 UTC 2014 - cloud-devel(a)suse.de @@ -40,3 +44,2 @@ -- Update to latest git (27ea6a2): - + configure metadata agent - + Extend range for fixed network +- Update to version 2013.2+git.1390430134.14732ac: + + configure metadata agentExtend range for fixed network @@ -45 +48 @@ -Wed Jan 22 00:38:54 UTC 2014 - cloud-devel(a)suse.de +Tue Jan 21 01:36:46 UTC 2014 - cloud-devel(a)suse.de @@ -47,2 +50,2 @@ -- Update to latest git (ebdcec1): - + Install all neutron plugins for tempest run +- Update to version 2013.2+git.1390214669.7b65bb0: + + Install all neutron plugins for tempest runFix endpoint configuration in seednode @@ -51 +54 @@ -Thu Jan 16 01:11:56 UTC 2014 - cloud-devel(a)suse.de +Thu Jan 16 00:53:19 UTC 2014 - cloud-devel(a)suse.de @@ -53,3 +56,2 @@ -- Update to latest git (9a72985): - + Remove extranous database migration runs - + Set my_ip addresses properly +- Update to version 2013.2+git.1389788878.efbbef8: + + Remove extranous database migration runsSet my_ip addresses properly @@ -58 +60 @@ -Tue Jan 14 12:31:36 UTC 2014 - cloud-devel(a)suse.de +Tue Jan 14 12:31:02 UTC 2014 - cloud-devel(a)suse.de @@ -60 +62 @@ -- Update to latest git (cbcfc02): +- Update to version 2013.2+git.1389702574.476cb5a: @@ -64 +66 @@ -Tue Jan 14 10:38:06 UTC 2014 - cloud-devel(a)suse.de +Tue Jan 14 10:37:28 UTC 2014 - cloud-devel(a)suse.de @@ -66 +68 @@ -- Update to latest git (6b7a6d9): +- Update to version 2013.2+git.1389695705.4f42955: @@ -71 +73 @@ -Tue Jan 14 00:39:33 UTC 2014 - cloud-devel(a)suse.de +Tue Jan 14 00:43:43 UTC 2014 - cloud-devel(a)suse.de @@ -73,2 +75,2 @@ -- Update to latest git (a9dc3a1): - + Switch to Neutron handled security groups +- Update to version 2013.2+git.1389636724.cf07be4: + + Fix group names / enable neutron security groups @@ -75,0 +78,8 @@ + + Switch to Neutron handled security groups + + Setup ML2 Neutron plugin for demo setup + +------------------------------------------------------------------- +Fri Jan 10 10:37:06 UTC 2014 - dmueller(a)suse.com + +- Update to version 2013.2+git.1389348819.a572e1f: + + Setup Keystone catalog in SQL @@ -78 +87,0 @@ - + Setup ML2 Neutron plugin for demo setup @@ -81 +90 @@ -Thu Jan 2 18:55:22 UTC 2014 - cloud-devel(a)suse.de +Thu Jan 2 18:49:06 UTC 2014 - cloud-devel(a)suse.de @@ -83 +92 @@ -- Update to latest git (be6901c): +- Update to version 2013.2+git.1388415104.fbfaa0d: @@ -87 +96 @@ -Thu Dec 12 09:57:43 UTC 2013 - dmueller(a)suse.com +Thu Dec 12 09:52:35 UTC 2013 - dmueller(a)suse.com @@ -89 +98,3 @@ -- update to latest git state +- Update to version 2013.2+git.1386841867.f073be4: + + Don't try to run journalctl on SLE11 + + set virt_type in libvirt group @@ -92 +103 @@ -Tue Dec 10 01:36:18 UTC 2013 - cloud-devel(a)suse.de +Tue Dec 10 01:32:41 UTC 2013 - cloud-devel(a)suse.de @@ -94 +105 @@ -- Update to latest git (184a1d6): +- Update to latest git (3874301): @@ -98 +109 @@ -Thu Nov 21 01:11:38 UTC 2013 - cloud-devel(a)suse.de +Thu Nov 21 00:46:36 UTC 2013 - cloud-devel(a)suse.de @@ -100 +111 @@ -- Update to latest git (e613180): +- Update to latest git (045ef1b): @@ -101,0 +113,54 @@ + +------------------------------------------------------------------- +Tue Oct 29 10:11:28 UTC 2013 - speilicke(a)suse.com + +- Update to version 2013.2+git.1382872631.ace88d7: + + Create /srv/tftpboot and assign it to novaAlso create pxelinux.cfg + + Start dnsmasq manually and use it for tftp as well + + delete unneeded tftp stuff + + Fix dnsmasq command line + + Add missing destination dir + + Start baremetal deploy helper + + set libvirt_uri as explained in LP Bug 1226310 + + Keystone migrates db on startup, extra call is unnecessary +- Update devstack to version master: + + Enable keystone authentication in Ironicadd lib/stackforge to let us test wsme / pecan from git + + Start nova-compute with child cell conf + + Handle the CM service availability in tempest + + create an UNDO_REQUIREMENTS variable + + Removed dependency from dotcloud repos for the Nova docker driver + + put the stackforge library installation behind a conditional + +------------------------------------------------------------------- +Mon Oct 28 00:45:10 UTC 2013 - cloud-devel(a)suse.de + +- Update to latest git (ace88d7): + + set libvirt_uri as explained in LP Bug 1226310 + + Keystone migrates db on startup, extra call is unnecessary + +------------------------------------------------------------------- +Fri Oct 18 23:31:47 UTC 2013 - cloud-devel(a)suse.de + +- Update to latest git (4a12385): + + Start baremetal deploy helper + +------------------------------------------------------------------- +Mon Oct 14 12:08:20 UTC 2013 - cloud-devel(a)suse.de + +- Update to latest git (3a41525): + + Add Quickstart script to setup a TripleO Seed Node + + tripleo-setup-seednode: Start the missing nova services + + Upload deploy kernel and ramdisk to glance + + set neutron data in nova.conf + + Set securitygroup driver + host name to seed + + Use x86_64 consistently + + lower scheduler hints for successful baremetal scheduling + + set correct power_host options + + set tftp root properly + + setup undercloud image in glance + + Create /srv/tftpboot and assign it to nova + + Also create pxelinux.cfg + + Start dnsmasq manually and use it for tftp as well + + delete unneeded tftp stuff + + Fix dnsmasq command line + + Add missing destination dir Old: ---- openstack-quickstart-2013.2+git.1392990246.72b2b3d.tar.gz New: ---- _servicedata openstack-quickstart-2013.2+git.1395248710.2704f7d.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openstack-quickstart.spec ++++++ --- /var/tmp/diff_new_pack.ztW58e/_old 2014-04-14 20:38:18.000000000 +0200 +++ /var/tmp/diff_new_pack.ztW58e/_new 2014-04-14 20:38:18.000000000 +0200 @@ -17,7 +17,7 @@ Name: openstack-quickstart -Version: 2013.2+git.1392990246.72b2b3d +Version: 2013.2+git.1395248710.2704f7d Release: 0 Summary: OpenStack Quickstart License: MIT ++++++ _service ++++++ --- /var/tmp/diff_new_pack.ztW58e/_old 2014-04-14 20:38:18.000000000 +0200 +++ /var/tmp/diff_new_pack.ztW58e/_new 2014-04-14 20:38:18.000000000 +0200 @@ -1,18 +1,17 @@ <services> - <service name="tar_scm" mode="disabled"> + <service mode="disabled" name="tar_scm"> <param name="url">git://github.com/SUSE-Cloud/openstack-quickstart.git</param> <param name="scm">git</param> <param name="exclude">.git</param> <param name="versionformat">@PARENT_TAG@+git.%ct.%h</param> - <param name="revision">stable/havana</param> + <param name="revision">master</param> + <param name="changesgenerate">enable</param> </service> - - <service name="recompress" mode="disabled"> + <service mode="disabled" name="recompress"> <param name="file">openstack-quickstart-*git*.tar</param> <param name="compression">gz</param> </service> - - <service name="set_version" mode="disabled"> + <service mode="disabled" name="set_version"> <param name="basename">openstack-quickstart</param> </service> ++++++ _servicedata ++++++ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/SUSE-Cloud/openstack-quickstart.git</param> <param name="changesrevision">2704f7d139</param> </service> <service name="tar_scm"> <param name="url">git://github.com/openstack-dev/devstack.git</param> <param name="changesrevision">39807f4616</param> </service> </servicedata>++++++ openstack-quickstart-2013.2+git.1392990246.72b2b3d.tar.gz -> openstack-quickstart-2013.2+git.1395248710.2704f7d.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openstack-quickstart-2013.2+git.1392990246.72b2b3d/scripts/openstack-quickstart-demosetup new/openstack-quickstart-2013.2+git.1395248710.2704f7d/scripts/openstack-quickstart-demosetup --- old/openstack-quickstart-2013.2+git.1392990246.72b2b3d/scripts/openstack-quickstart-demosetup 2014-02-22 01:39:45.000000000 +0100 +++ new/openstack-quickstart-2013.2+git.1395248710.2704f7d/scripts/openstack-quickstart-demosetup 2014-03-20 02:42:40.000000000 +0100 @@ -9,6 +9,7 @@ ADMIN_PASSWORD=$pw SERVICE_HOST=$IP + echo "Setting up OpenStack demo controller..." function install_packages () { @@ -45,7 +46,9 @@ fi $i status if [ $? -eq 3 ]; then - journalctl -xn || : + if [ -n "$(type -p systemctl)" ]; then + journalctl -xn || : + fi echo "Service $1 is not running" exit 1 fi @@ -102,27 +105,6 @@ chmod 755 /etc/sysconfig/network/scripts/openstack-quickstart-neutron-$1 } -# iproute2 on 12.3 is broken, bnc#816215 -function update_iproute2_on_opensuse_12_3 () { - if grep -q 'openSUSE 12.3' /etc/SuSE-release; then - OUT=`zypper lr -u | grep 'http://download.opensuse.org/update/12.3/'` - echo $OUT | grep -q 'http://download.opensuse.org/update/12.3/' - if [[ $? -ne 0 ]] ; then - echo "Adding update repository" - zypper ar http://download.opensuse.org/update/12.3/ update12.3 - # TODO: add netfilter repo until update iproute2 will not appear in update repo - zypper ar http://download.opensuse.org/repositories/security:/netfilter/openSUSE_12.3/ netfilter12.3 - fi - echo "Updating iproute2 package" - zypper --gpg-auto-import-keys ref - zypper --gpg-auto-import-keys install -f -y iproute2 - fi -} - - - -update_iproute2_on_opensuse_12_3 - grep -q bash.openstackrc /etc/bash.bashrc.local ||\ echo "export HOST_IP=$IP . /etc/bash.openstackrc @@ -216,16 +198,11 @@ fi grep -q -e vmx -e svm /proc/cpuinfo || MODE=lxc - # use lxc or qemu, if kvm is unavailable if rpm -q openstack-nova-compute >/dev/null ; then if [ "$MODE" = lxc ] ; then - crudini --set /etc/nova/nova.conf DEFAULT libvirt_type lxc + crudini --set /etc/nova/nova.conf libvirt virt_type lxc install_packages lxc - # not sure what this is good for, cgroups is and should be mounted under /sys/fs/cgroup - #echo mount -t cgroup none /cgroup >> /etc/init.d/boot.local - #mkdir /cgroup - #mount -t cgroup none /cgroup else modprobe kvm-intel ; modprobe kvm-amd sed -i -e 's/$MODULES_LOADED_ON_BOOT="$/\1kvm-intel kvm-amd\ /' /etc/sysconfig/kernel @@ -234,18 +211,19 @@ sed -i -e 's/$MODULES_LOADED_ON_BOOT="$/\1nbd\ /' /etc/sysconfig/kernel fi -# disable firewall before playing with ip_forward stuff +# modprobe for snapshot support +modprobe dm_snapshot || : +# disable firewall before playing with ip_forward stuff +rm -f /usr/lib/python*/site-packages/nova-iptables.lock.lock # workaround bug rm -f /var/lock/SuSEfirewall2.booting # workaround openSUSE bug if test -e /sbin/SuSEfirewall2; then SuSEfirewall2 stop # interferes with openstack's network/firewall stop_and_disable_service SuSEfirewall2_setup stop_and_disable_service SuSEfirewall2_init fi - # activate ip-forwarding [ -e /etc/sysconfig/sysctl ] && sed -i -e 's;IP_FORWARD="no";IP_FORWARD="yes";' /etc/sysconfig/sysctl - if grep -q 'net.ipv4.ip_forward' /etc/sysctl.conf; then sed -i -e 's;net.ipv4.ip_forward.*;net.ipv4.ip_forward = 1;' /etc/sysctl.conf else @@ -449,7 +427,7 @@ crudini --set /etc/neutron/metadata_agent.ini DEFAULT metadata_proxy_shared_secret $metadata_secret if [ "x$with_tempest" = "xyes" ]; then - crudini --set /etc/neutron/neutron.conf DEFAULT service_plugins "neutron.services.loadbalancer.plugin.LoadBalancerPlugin, neutron.services.l3_router.l3_router_plugin.L3RouterPlugin, neutron.services.vpn.plugin.VPNDriverPlugin" + crudini --set /etc/neutron/neutron.conf DEFAULT service_plugins "neutron.services.loadbalancer.plugin.LoadBalancerPlugin, neutron.services.l3_router.l3_router_plugin.L3RouterPlugin, neutron.services.vpn.plugin.VPNDriverPlugin, neutron.services.metering.metering_plugin.MeteringPlugin" fi start_and_enable_service rabbitmq-server @@ -475,10 +453,7 @@ echo "Can't reach neutron server. Exiting !!!" >&2 exit 1 fi - neutron net-list - if [[ $? -eq 0 ]] ; then - break - fi + neutron net-list && break cnt=$(($cnt+1)) sleep 2 done @@ -551,9 +526,11 @@ insserv boot.lvm /etc/init.d/boot.lvm start fi - start_and_enable_service openstack-cinder-volume - start_and_enable_service openstack-cinder-scheduler start_and_enable_service openstack-cinder-api + sleep 1 + for s in scheduler volume ; do + start_and_enable_service openstack-cinder-$s + done fi setcreds admin $pw @@ -569,24 +546,26 @@ #----------------------------------------- if [ "x$with_tempest" = "xyes" -a -e /etc/tempest/tempest.conf ]; then - c=/etc/tempest/tempest.conf - crudini --set $c identity uri $KEYSTONE_PUBLIC_ENDPOINT - crudini --set $c identity uri_v3 $KEYSTONE_PUBLIC_ENDPOINT_V3 - crudini --set $c identity admin_username admin - crudini --set $c identity admin_password $pw - crudini --set $c identity alt_password $pw - crudini --set $c identity password $pw - #crudini --set $c compute allow_tenant_isolation true - crudini --set $c compute allow_tenant_isolation false - crudini --set $c compute fixed_network_name fixed - crudini --set $c compute network_for_ssh ext - # broken in tempest testsuite on havana :/ - crudini --set $c compute run_ssh false - crudini --set $c compute-admin password $pw - crudini --set $c network public_network_id $ext_network_id - crudini --set $c network public_router_id $(get_router_id) - crudini --set $c service_available neutron True - crudini --set $c service_available swift False - crudini --set $c stress max_instances 2 - crudini --set $c service_available horizon $with_horizon + crudini --set /etc/tempest/tempest.conf identity uri $KEYSTONE_PUBLIC_ENDPOINT + crudini --set /etc/tempest/tempest.conf identity uri_v3 $KEYSTONE_PUBLIC_ENDPOINT_V3 + crudini --set /etc/tempest/tempest.conf identity username demo + crudini --set /etc/tempest/tempest.conf identity tenant_name demo + crudini --set /etc/tempest/tempest.conf identity alt_password $pw + crudini --set /etc/tempest/tempest.conf identity password $pw + crudini --set /etc/tempest/tempest.conf identity admin_username admin + crudini --set /etc/tempest/tempest.conf identity admin_tenant_name admin + crudini --set /etc/tempest/tempest.conf identity admin_password $pw + crudini --set /etc/tempest/tempest.conf compute allow_tenant_isolation false + crudini --set /etc/tempest/tempest.conf compute fixed_network_name fixed + crudini --set /etc/tempest/tempest.conf compute network_for_ssh ext + crudini --set /etc/tempest/tempest.conf compute-admin username admin + crudini --set /etc/tempest/tempest.conf compute-admin tenant_name admin + crudini --set /etc/tempest/tempest.conf compute-admin password $pw + crudini --set /etc/tempest/tempest.conf network public_network_id $ext_network_id + crudini --set /etc/tempest/tempest.conf network public_router_id $(get_router_id) + crudini --set /etc/tempest/tempest.conf service_available neutron True + crudini --set /etc/tempest/tempest.conf service_available swift False + crudini --set /etc/tempest/tempest.conf stress max_instances 1 + crudini --set /etc/tempest/tempest.conf service_available horizon $with_horizon + crudini --set /etc/tempest/tempest.conf volume-feature-enabled backup false fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openstack-quickstart-2013.2+git.1392990246.72b2b3d/scripts/tripleo-setup-seednode new/openstack-quickstart-2013.2+git.1395248710.2704f7d/scripts/tripleo-setup-seednode --- old/openstack-quickstart-2013.2+git.1392990246.72b2b3d/scripts/tripleo-setup-seednode 1970-01-01 01:00:00.000000000 +0100 +++ new/openstack-quickstart-2013.2+git.1395248710.2704f7d/scripts/tripleo-setup-seednode 2014-03-20 02:42:40.000000000 +0100 @@ -0,0 +1,363 @@ +#!/bin/bash + +set -eux +cd / + +# Setup the insecure defaults + +REGION="regionOne" +PASSWORD="unset" +SERVICE_TOKEN="unset" +ENDPOINT="192.0.2.1" +ADMIN_EMAIL="admin(a)example.com" +DEBUG="" + +# Functions + +register-endpoint() +{ + DESCRIPTION=$1 + NAME=$2 + TYPE=$3 + PUBLIC_URL=$4 + + if [ "ec2" = "$TYPE" ]; then + SUFFIX="/services/Cloud" + ADMIN_SUFFIX="/services/Admin" + elif [ "image" = "$TYPE" ]; then + SUFFIX="/v1" + ADMIN_SUFFIX="$SUFFIX" + elif [ "baremetal" = "$TYPE" ]; then + SUFFIX="/" + ADMIN_SUFFIX="$SUFFIX" + elif [ "orchestration" = "$TYPE" ]; then + SUFFIX="/v1/%(tenant_id)s" + ADMIN_SUFFIX="$SUFFIX" + elif [ "identity" = "$TYPE" ]; then + SUFFIX="/v2.0" + ADMIN_SUFFIX="$SUFFIX" + elif [ "network" = "$TYPE" ]; then + SUFFIX="/" + ADMIN_SUFFIX="$SUFFIX" + elif [ "compute" = "$TYPE" ]; then + SUFFIX="/v2/\$(tenant_id)s" + ADMIN_SUFFIX="$SUFFIX" + else + echo "Unknown service type" >&2 + exit 1 + fi + + INTERNAL_URL="$PUBLIC_URL" + ADMIN_URL="$INTERNAL_URL" + + ADMIN_ROLE=$(keystone role-list | awk '/ admin / {print $2}') + if [ -z "$ADMIN_ROLE" ]; then + echo "Could not find admin role" >&2 + exit 1 + fi + + SERVICE_TENANT=$(keystone $DEBUG tenant-list | awk '/ service / {print $2}') + PASSWORD="unset" + SVC_USER=$(keystone $DEBUG user-create --name=$NAME --pass=$PASSWORD --tenant-id $SERVICE_TENANT --email=nobody(a)example.com | awk ' / id / {print $4}') + + keystone user-role-add $DEBUG --tenant-id $SERVICE_TENANT --user-id $SVC_USER --role-id $ADMIN_ROLE + + SERVICE_ID=$(keystone $DEBUG service-create --name=$NAME --type=$TYPE --description="$DESCRIPTION" | awk '/ id / {print $4}') + keystone endpoint-create $DEBUG --region "$REGION" --service-id $SERVICE_ID \ + --publicurl "${PUBLIC_URL}/${SUFFIX}" \ + --adminurl "${ADMIN_URL}/${ADMIN_SUFFIX}" \ + --internalurl "${INTERNAL_URL}/${SUFFIX}" + + echo "Service $TYPE created with password $PASSWORD" +} + + +# Setup an openSUSE package based seed cloud + +## ------------------------------------------------------------------------------- +## init-keystone -p unset unset 192.0.2.1 admin(a)example.com root(a)192.0.2.1 +## ------------------------------------------------------------------------------- + +export SERVICE_ENDPOINT=http://$ENDPOINT:35357/v2.0 +export SERVICE_TOKEN + +keystone-manage pki_setup --keystone-user openstack-keystone --keystone-group openstack-keystone +crudini --set /etc/keystone/keystone.conf DEFAULT admin_token $SERVICE_TOKEN +rcopenstack-keystone restart + +echo "Waiting for keystone to initialise..." +if ! keystone tenant-get admin; then + keystone tenant-create --name=admin +fi +ADMIN_TENANT_ID=$(keystone tenant-get admin | awk '$2=="id" {print $4}') +SERVICE_TENANT_ID=$(keystone tenant-create --name=service | awk '$2=="id" {print $4}') + +# Roles +ADMIN_ROLE_ID=$(keystone role-create --name=admin | awk '$2=="id" {print $4}') +MEMBER_ROLE_ID=$(keystone role-create --name=Member | awk '$2=="id" {print $4}') + +# Users +ADMIN_USER_ID=$(keystone user-create --name=admin \ + --pass="$PASSWORD" \ + --email="$ADMIN_EMAIL" | awk '$2=="id" {print $4}') + +# User Roles +keystone user-role-add --user-id $ADMIN_USER_ID --role-id $ADMIN_ROLE_ID --tenant-id $ADMIN_TENANT_ID + +register-endpoint "Keystone Identity Service" keystone identity http://$ENDPOINT:5000 -a http://$ENDPOINT:35357 + +## ------------------------------------------------------------------------------- +## setup-endpoints 192.0.2.1 --glance-password unset --heat-password unset --neutron-password unset --nova-password unset +## ------------------------------------------------------------------------------- + +CINDER_PASSWORD="unset" +HEAT_PASSWORD="unset" +GLANCE_PASSWORD="unset" +NEUTRON_PASSWORD="unset" +NOVA_PASSWORD="unset" + +PASSWORD=$HEAT_PASSWORD register-endpoint "Heat Service" heat orchestration http://$ENDPOINT:8004 +PASSWORD=$NEUTRON_PASSWORD register-endpoint "Neutron Service" neutron network http://$ENDPOINT:9696 +PASSWORD=$GLANCE_PASSWORD register-endpoint "Glance Image Service" glance image http://$ENDPOINT:9292 +register-endpoint $DEBUG "EC2 Compatibility Layer" ec2 ec2 http://$ENDPOINT:8773 +PASSWORD=$NOVA_PASSWORD register-endpoint "Nova Compute Service" nova compute http://$ENDPOINT:8774 + +## ------------------------------------------------------------------------------- + +keystone role-create --name heat_stack_user + +## ------------------------------------------------------------------------------- +## use regular keystone authentication + +cat - > ~/.seedrc <<EOF +export NOVA_VERSION=1.1 +export OS_PASSWORD=unset +export OS_AUTH_URL=http://192.0.2.1:5000/v2.0 +export OS_USERNAME=admin +export OS_TENANT_NAME=admin +export COMPUTE_API_VERSION=1.1 +export OS_NO_CACHE=True +export OS_CLOUDNAME=seed +EOF + +. ~/.seedrc + +if [ ! -e ~/.ssh/id_rsa.pub ]; then + ssh-keygen -t rsa -P '' -f ~/.ssh/id_rsa +fi + +for c in /etc/glance/glance-api.conf /etc/glance/glance-registry.conf \ + /etc/neutron/neutron.conf /etc/heat/heat.conf /etc/nova/nova.conf ; do + crudini --set $c keystone_authtoken auth_host "192.0.2.1" + crudini --set $c keystone_authtoken auth_port 35357 + crudini --set $c keystone_authtoken auth_protocol http + crudini --set $c keystone_authtoken auth_uri $OS_AUTH_URL + crudini --set $c keystone_authtoken admin_tenant_name service + crudini --set $c keystone_authtoken admin_user $OS_USERNAME + crudini --set $c keystone_authtoken admin_password $OS_PASSWORD +done + +for c in /etc/glance/glance-api.conf /etc/glance/glance-registry.conf ; do + crudini --set $c keystone_authtoken admin_user glance +done + +crudini --set /etc/neutron/neutron.conf keystone_authtoken admin_user neutron +crudini --set /etc/heat/heat.conf keystone_authtoken admin_user heat +crudini --set /etc/nova/nova.conf keystone_authtoken admin_user nova + +## ------------------------------------------------------------------------------- +## setup rabbitmq +## ------------------------------------------------------------------------------- + +rcrabbitmq-server restart + +## ------------------------------------------------------------------------------- +## setup glance +## ------------------------------------------------------------------------------- + +for c in /etc/glance/glance-api.conf /etc/glance/glance-registry.conf; do + crudini --set $c DEFAULT sql_connection 'sqlite:////var/lib/glance/glance.sqlite' +done + +rcopenstack-glance-api restart +rcopenstack-glance-registry restart + +KERNEL=/root/tripleo-deploy.x86_64-1.12.1.kernel.3.0.76-0.11-default +RAMDISK=/root/tripleo-deploy.x86_64-1.12.1.gz +deploy_kernel_id=$(glance image-create --name bm-vmlinuz --public --disk-format aki < $KERNEL \ + | grep ' id ' | awk '{print $4}') +deploy_ramdisk_id=$(glance image-create --name bm-initrd --public --disk-format ari < $RAMDISK \ + | grep ' id ' | awk '{print $4}') + +if [ ! -e /root/undercloud.qcow2 ]; then + qemu-img create -f qcow2 /root/undercloud.qcow2 10G +fi + + +## ------------------------------------------------------------------------------- +## setup neutron +## ------------------------------------------------------------------------------- + +c=/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini + +crudini --set $c vlans tenant_network_type 'vlan' +crudini --set $c vlans network_vlan_ranges 'ctlplane:1000:2000' +crudini --set $c linux_bridge physical_interface_mappings 'ctlplane:eth1' +crudini --set $c securitygroup firewall_driver 'neutron.agent.linux.iptables_firewall.IptablesFirewallDriver' + +rcopenstack-neutron restart + +## ------------------------------------------------------------------------------- +## setup heat +## ------------------------------------------------------------------------------- + +c=/etc/heat/heat.conf + +crudini --set $c DEFAULT heat_metadata_server_url 'http://192.0.2.1:8000' +crudini --set $c DEFAULT heat_waitcondition_server_url 'http://192.0.2.1:8000/v1/waitcondition' +crudini --set $c DEFAULT heat_watch_server_url 'http://192.0.2.1:8003' +crudini --set $c DEFAULT auth_encryption_key 'unset' + +crudini --set $c DEFAULT admin_tenant_name 'service' + +crudini --set $c ec2authtoken auth_uri 'http://192.0.2.1:5000/v2.0' + +rcopenstack-heat-api restart +rcopenstack-heat-api-cfn restart +rcopenstack-heat-engine restart + + +## ------------------------------------------------------------------------------- +## setup nova +## ------------------------------------------------------------------------------- + +c=/etc/nova/nova.conf + +crudini --set $c baremetal arch 'x86_64' +crudini --set $c baremetal power_manager 'nova.virt.baremetal.virtual_power_driver.VirtualPowerManager' +#crudini --set $c baremetal power_manager 'nova.virt.baremetal.fake.FakePowerManager' +crudini --set $c baremetal virtual_power_host_user 'stack' +crudini --set $c baremetal virtual_power_host_key '/opt/stack/boot-stack/virtual-power-key' +crudini --set $c baremetal virtual_power_ssh_host '192.168.122.1' +crudini --set $c baremetal virtual_power_type 'virsh' +crudini --set $c baremetal virtual_power_libvirt_uri 'qemu:///system' +crudini --set $c baremetal driver 'nova.virt.baremetal.pxe.PXE' +crudini --set $c baremetal instance_type_extra_specs 'cpu_arch:x86_64' +crudini --set $c baremetal sql_connection 'sqlite:////var/lib/nova/nova_bm.sqlite' +crudini --set $c baremetal tftp_root '/srv/tftpboot' + +crudini --set $c DEFAULT host 'seed' +crudini --set $c DEFAULT neutron_admin_password 'unset' +crudini --set $c DEFAULT neutron_admin_tenant_name 'service' +crudini --set $c DEFAULT metadata-proxy 'false' +crudini --set $c DEFAULT service-password 'unset' +crudini --set $c DEFAULT compute_driver 'baremetal.driver.BareMetalDriver' +crudini --set $c DEFAULT my_ip '192.0.2.1' +crudini --set $c DEFAULT firewall_driver 'nova.virt.firewall.NoopFirewallDriver' +crudini --set $c DEFAULT scheduler_host_manager 'nova.scheduler.baremetal_host_manager.BaremetalHostManager' +crudini --set $c DEFAULT ram_allocation_ratio '1.0' +crudini --set $c DEFAULT reserved_host_memory_mb '0' + +# Enable baremetal related services +mkdir -p /srv/tftpboot/pxelinux.cfg/ +cp /usr/share/syslinux/pxelinux.0 /srv/tftpboot/ +chown -R openstack-nova /srv/tftpboot + +dnsmasq --conf-file= --port=0 --enable-tftp --tftp-root=/srv/tftpboot \ + --dhcp-boot=pxelinux.0 --bind-interfaces --pid-file=/var/run/dnsmasq.pid \ + --interface=eth1 --dhcp-range=192.0.2.10,192.0.2.20 + +# baremetal driver is used +su openstack-nova -s /bin/sh -c "nova-baremetal-manage db sync" + +rcopenstack-nova-api restart +rcopenstack-nova-scheduler restart +rcopenstack-nova-conductor restart +rcopenstack-nova-baremetal-deploy-helper restart +rcopenstack-nova-compute restart + +for i in $(seq 1 10); do + sleep 1 + nova list &> /dev/null && break +done + +nova keypair-add --pub-key ~/.ssh/id_rsa.pub default + +# While we can't mix hypervisors, having non-baremetal flavors will just +# confuse things. +nova flavor-delete m1.tiny || true +nova flavor-delete m1.small || true +nova flavor-delete m1.medium || true +nova flavor-delete m1.large || true +nova flavor-delete m1.xlarge || true + +nova flavor-delete baremetal || true + +MEM=2048 +DISK=20 +CPU=1 +ARCH='x86_64' + +nova flavor-create baremetal auto $(($MEM/4)) $(($DISK/4)) $CPU +nova flavor-key baremetal set "cpu_arch"="$ARCH" \ + "baremetal:deploy_kernel_id"="$deploy_kernel_id" \ + "baremetal:deploy_ramdisk_id"="$deploy_ramdisk_id" + +glance image-create --name undercloud --public --disk-format qcow2 \ + --container-format bare --property kernel_id="$deploy_kernel_id" \ + --property ramdisk_id="$deploy_ramdisk_id" --file /root/undercloud.qcow2 + +## ------------------------------------------------------------------------------- +## setup-neutron 192.0.2.2 192.0.2.3 192.0.2.0/24 192.0.2.1 ctlplane +## ------------------------------------------------------------------------------- + +# Start of DHCP range +ALLOCATION_START="192.0.2.2" +# End of DHCP range +ALLOCATION_END="192.0.2.3" +# Network CIDR +NETWORK_CIDR="192.0.2.0/24" +# Where to route traffic +NETWORK_GATEWAY="192.0.2.1" +# If non-empty create a provider flat network with this name otherwise create a +# virtual network and setup a router etc. +PHYSICAL_NETWORK="ctlplane" +# Start of floating range +FLOATING_START="" +# End of floating range +FLOATING_END="" +# Floating CIDR +FLOATING_CIDR="" + +ALLOCATION_POOL="start=${ALLOCATION_START},end=${ALLOCATION_END}" + +TENANT_ID=$(keystone tenant-list | grep ' admin ' | awk '{print $2}') + +if [ -n "$PHYSICAL_NETWORK" ] ; then + # Underclouds + NET_NAME=$PHYSICAL_NETWORK + NET_EXTRA="--tenant_id $TENANT_ID --provider:network_type flat --provider:physical_network $PHYSICAL_NETWORK" + SUBNET_EXTRA="--tenant_id $TENANT_ID" +else + # Overclouds + NET_NAME="default-net" + NET_EXTRA="--shared" + SUBNET_EXTRA="" +fi + +NET_ID=$(neutron net-create $NET_NAME $NET_EXTRA | grep ' id ' | awk '{print $4}') +SUBNET_ID=$(neutron subnet-create $SUBNET_EXTRA --ip_version 4 ${ALLOCATION_POOL:+--allocation-pool $ALLOCATION_POOL} ${NETWORK_GATEWAY:+--gateway $NETWORK_GATEWAY} $NET_ID $NETWORK_CIDR | grep ' id ' | awk '{print $4}') + +if [ -z "$PHYSICAL_NETWORK" ] ; then + neutron router-create default-router + neutron router-interface-add default-router $SUBNET_ID +fi + +if [ -n "$FLOATING_START" -a -n "$FLOATING_END" -a -n "$FLOATING_CIDR" ] ; then + neutron net-create ext-net --router:external=True + SUBNET_ID=$(neutron subnet-create ext-net $FLOATING_CIDR --disable-dhcp \ + --allocation-pool start=$FLOATING_START,end=$FLOATING_END) + neutron router-gateway-set default-router ext-net +fi + + -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libreoffice for openSUSE:Factory
by root＠hilbert.suse.de 14 Apr '14

14 Apr '14

Hello community, here is the log from the commit of package libreoffice for openSUSE:Factory checked in at 2014-04-14 20:37:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libreoffice (Old) and /work/SRC/openSUSE:Factory/.libreoffice.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libreoffice" Changes: -------- --- /work/SRC/openSUSE:Factory/libreoffice/libreoffice.changes 2014-04-11 13:39:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice.changes 2014-04-14 20:37:30.000000000 +0200 @@ -1,0 +2,12 @@ +Fri Apr 11 14:14:14 UTC 2014 - tchvatal(a)suse.com + +- Remove googledoc extension as it is uttery broken and this is + safer. + +------------------------------------------------------------------- +Fri Apr 11 11:43:01 UTC 2014 - tchvatal(a)suse.com + +- Require link-to-ooo-home script properly in postun phase. + Fixes bnc#749059. + +------------------------------------------------------------------- Old: ---- 27211596cf0ad97cab7321239406fde0-gdocs_3.0.1_modified.oxt gdocs_3.0.0.diff gdocs_3.0.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice.spec ++++++ --- /var/tmp/diff_new_pack.JMNRv6/_old 2014-04-14 20:37:36.000000000 +0200 +++ /var/tmp/diff_new_pack.JMNRv6/_new 2014-04-14 20:37:36.000000000 +0200 @@ -26,7 +26,6 @@ %global langpack_langs %{nil} # extensions %define ct2n_version 1.3.2 -%define gdocs_version 3.0.1 %define numbertext_version 0.9.5 # Urls %define external_url http://dev-www.libreoffice.org/src/ @@ -49,16 +48,10 @@ # create compat symlinks from %{_datadir} to %{_prefix}/lib(64); used by noarch packages Source300: link-to-ooo-home # prebuilt extensions -Source401: %{external_url}/27211596cf0ad97cab7321239406fde0-gdocs_%{gdocs_version}_modified.oxt Source402: %{external_url}/b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_%{numbertext_version}.oxt # used extensions sources Source450: %{external_url}/451ccf439a36a568653b024534669971-ConvertTextToNumber-%{ct2n_version}.oxt Source452: %{external_url}/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2 -# unused extensions sources -# FIXME: this is just because of license; we do not build gdocs from sources now -# gdocs sources -Source500: gdocs_3.0.0.tar.bz2 -Source501: gdocs_3.0.0.diff # Internal bundled stuff we can't remove # XMLSec is patched over and over in here Source2000: %{external_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz @@ -296,6 +289,7 @@ Group: Productivity/Office/Suite Supplements: packageand(libreoffice:kdebase3-session) Requires(post): %{name} = %{version} +Requires(postun): %{name} = %{version} Provides: libreoffice-icon-themes = %{version} Obsoletes: libreoffice-icon-themes < %{version} BuildArch: noarch @@ -309,6 +303,7 @@ Group: Productivity/Office/Suite Supplements: libreoffice Requires(post): %{name} = %{version} +Requires(postun): %{name} = %{version} Provides: libreoffice-icon-themes = %{version} Obsoletes: libreoffice-icon-themes < %{version} BuildArch: noarch @@ -322,6 +317,7 @@ Group: Productivity/Office/Suite Supplements: libreoffice Requires(post): %{name} = %{version} +Requires(postun): %{name} = %{version} Provides: libreoffice-icon-themes = %{version} Obsoletes: libreoffice-icon-themes < %{version} BuildArch: noarch @@ -335,6 +331,7 @@ Group: Productivity/Office/Suite Supplements: packageand(libreoffice:kdebase4-workspace) Requires(post): %{name} = %{version} +Requires(postun): %{name} = %{version} Provides: libreoffice-icon-themes = %{version} Obsoletes: libreoffice-icon-themes < %{version} BuildArch: noarch @@ -348,6 +345,7 @@ Group: Productivity/Office/Suite Supplements: libreoffice Requires(post): %{name} = %{version} +Requires(postun): %{name} = %{version} Provides: libreoffice-icon-themes = %{version} Obsoletes: libreoffice-icon-themes < %{version} BuildArch: noarch @@ -361,6 +359,7 @@ Group: Productivity/Office/Suite Supplements: packageand(libreoffice:gnome-session) Requires(post): %{name} = %{version} +Requires(postun): %{name} = %{version} Provides: libreoffice-icon-themes = %{version} Obsoletes: libreoffice-icon-themes < %{version} BuildArch: noarch @@ -622,7 +621,6 @@ %description writer-extensions This package provides extensions for LibreOffice Writer: -- Google Docs, Zoho, and WebDAV Export/Import - MediaWiki Publisher # Symlinking macro for /usr/lib64 and /usr/share packing @@ -719,6 +717,7 @@ Group: Productivity/Office/Suite \ Requires: %{name} = %{version} \ Requires(post,): %{name} = %{version} \ +Requires(postun,): %{name} = %{version} \ Provides: locale(libreoffice:%{lang}) \ BuildArch: noarch \ %{-m:Requires: libreoffice-thesaurus-%{-m*}}%{!-m:%{-M:Requires: libreoffice-thesaurus-%{lang}}} \ @@ -956,7 +955,6 @@ --enable-hardlink-deliver \ --enable-ext-ct2n \ --enable-ext-nlpsolver \ - --enable-ext-google-docs \ --enable-ext-numbertext \ --enable-ext-wiki-publisher \ --enable-ext-mariadb-connector \ @@ -1266,7 +1264,6 @@ %files writer-extensions %defattr(-,root,root) -%{_libdir}/%{name}/share/extensions/gdocs %{_libdir}/%{name}/share/extensions/wiki-publisher %files icon-theme-crystal -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libcdr for openSUSE:Factory
by root＠hilbert.suse.de 14 Apr '14

14 Apr '14

Hello community, here is the log from the commit of package libcdr for openSUSE:Factory checked in at 2014-04-14 20:28:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libcdr (Old) and /work/SRC/openSUSE:Factory/.libcdr.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libcdr" Changes: -------- --- /work/SRC/openSUSE:Factory/libcdr/libcdr.changes 2014-04-11 13:36:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libcdr.new/libcdr.changes 2014-04-14 20:28:10.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Apr 10 10:36:05 UTC 2014 - fstrba(a)suse.com + +- Update to upstream version 0.0.16 + * Brownbag release + * Upstream relicensing to MPL-2.0 + +------------------------------------------------------------------- Old: ---- libcdr-0.0.15.tar.xz New: ---- libcdr-0.0.16.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libcdr.spec ++++++ --- /var/tmp/diff_new_pack.LGNQzS/_old 2014-04-14 20:28:11.000000000 +0200 +++ /var/tmp/diff_new_pack.LGNQzS/_new 2014-04-14 20:28:11.000000000 +0200 @@ -18,10 +18,10 @@ %define libname libcdr-0_0-0 Name: libcdr -Version: 0.0.15 +Version: 0.0.16 Release: 0 Summary: Library for parsing the Corel Draw file format structure -License: LGPL-2.0+ or GPL-2.0+ or MPL-1.1 +License: MPL-2.0 Group: Productivity/Publishing/Word Url: http://www.freedesktop.org/wiki/Software/libcdr Source0: http://dev-www.libreoffice.org/src/libcdr-%{version}.tar.xz ++++++ libcdr-0.0.15.tar.xz -> libcdr-0.0.16.tar.xz ++++++ ++++ 3762 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 java-1_7_0-openjdk for openSUSE:Factory
by root＠hilbert.suse.de 14 Apr '14

14 Apr '14

Hello community, here is the log from the commit of package java-1_7_0-openjdk for openSUSE:Factory checked in at 2014-04-14 20:26:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/java-1_7_0-openjdk (Old) and /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "java-1_7_0-openjdk" Changes: -------- --- /work/SRC/openSUSE:Factory/java-1_7_0-openjdk/java-1_7_0-openjdk.changes 2014-04-09 13:13:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/java-1_7_0-openjdk.changes 2014-04-14 20:26:48.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Apr 11 19:06:05 CEST 2014 - mls(a)suse.de + +- fix split provides: fix double '/', sever -> server + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-1_7_0-openjdk.spec ++++++ --- /var/tmp/diff_new_pack.q9rafY/_old 2014-04-14 20:26:50.000000000 +0200 +++ /var/tmp/diff_new_pack.q9rafY/_new 2014-04-14 20:26:50.000000000 +0200 @@ -422,7 +422,7 @@ # from http://en.opensuse.org/openSUSE:Package_dependencies#Splitting_off_a_sub-pa… # provides a libjvm.so to ensure update is working well -Provides: %{name}:/%{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/sever/libjvm.so +Provides: %{name}:%{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/server/libjvm.so %description headless This Java 7 compatible Java Runtime Environment is based on -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gstreamer-editing-services for openSUSE:Factory
by root＠hilbert.suse.de 14 Apr '14

14 Apr '14

Hello community, here is the log from the commit of package gstreamer-editing-services for openSUSE:Factory checked in at 2014-04-14 20:25:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gstreamer-editing-services (Old) and /work/SRC/openSUSE:Factory/.gstreamer-editing-services.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gstreamer-editing-services" Changes: -------- --- /work/SRC/openSUSE:Factory/gstreamer-editing-services/gstreamer-editing-services.changes 2014-03-18 15:12:28.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gstreamer-editing-services.new/gstreamer-editing-services.changes 2014-04-14 20:25:17.000000000 +0200 @@ -1,0 +2,13 @@ +Sat Apr 12 18:01:36 UTC 2014 - zaitor(a)opensuse.org + +- Update to version 1.2.0: + + Bugs fixed: bgo#673040, bgo#651806, bgo#432662, bgo#644943, + bgo#645385, bgo#646293, bgo#669827, bgo#669959, bgo#672751, + bgo#673038, bgo#673714, bgo#677048, bgo#679941, bgo#681774, + bgo#692864, bgo#695267, bgo#696226, bgo#701115, bgo#702424, + bgo#702426, bgo#702605, bgo#703152, bgo#706855, bgo#707914, + bgo#709777, bgo#710168, bgo#710172, bgo#710390, bgo#721111, + bgo#724337, bgo#726365, bgo#678558, bgo#663869. +- Drop ges-extra-semicolon.patch: Fixed upstream. + +------------------------------------------------------------------- Old: ---- ges-extra-semicolon.patch gstreamer-editing-services-1.1.90.tar.xz New: ---- gstreamer-editing-services-1.2.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gstreamer-editing-services.spec ++++++ --- /var/tmp/diff_new_pack.wKI2wQ/_old 2014-04-14 20:25:18.000000000 +0200 +++ /var/tmp/diff_new_pack.wKI2wQ/_new 2014-04-14 20:25:18.000000000 +0200 @@ -18,15 +18,13 @@ Name: gstreamer-editing-services -Version: 1.1.90 +Version: 1.2.0 Release: 0 Summary: GStreamer Editing Services License: GPL-3.0+ and LGPL-2.1+ Group: Multimedia Url: http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer-editing-… Source: http://gstreamer.freedesktop.org/src/%{name}/%{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM http://cgit.freedesktop.org/gstreamer/gst-editing-services/commit/?id=4dbda… -Patch0: ges-extra-semicolon.patch BuildRequires: gcc-c++ BuildRequires: gobject-introspection-devel >= 0.9.6 BuildRequires: pkgconfig(gio-2.0) >= 2.16 @@ -103,7 +101,6 @@ %prep %setup -q -%patch0 -p1 %build %configure \ ++++++ gstreamer-editing-services-1.1.90.tar.xz -> gstreamer-editing-services-1.2.0.tar.xz ++++++ ++++ 10950 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 efl for openSUSE:Factory
by root＠hilbert.suse.de 14 Apr '14

14 Apr '14

Hello community, here is the log from the commit of package efl for openSUSE:Factory checked in at 2014-04-14 20:25:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/efl (Old) and /work/SRC/openSUSE:Factory/.efl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "efl" Changes: -------- --- /work/SRC/openSUSE:Factory/efl/efl.changes 2014-04-09 13:12:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.efl.new/efl.changes 2014-04-14 20:25:12.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Apr 12 08:28:42 UTC 2014 - schwab(a)suse.de + +- Only use valgrind when it exists + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ efl.spec ++++++ --- /var/tmp/diff_new_pack.F8LwlA/_old 2014-04-14 20:25:13.000000000 +0200 +++ /var/tmp/diff_new_pack.F8LwlA/_new 2014-04-14 20:25:13.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package efl # -# Copyright (c) 2011 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 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %define build_doc 1 # Build doc needs to be defined for build doc man to work %define build_doc_man 0 @@ -54,12 +55,12 @@ Name: efl Version: 1.9.2 -Release: 1 +Release: 0 # TODO: split package to separate packages and specify licenses correctly -License: BSD-2-Clause and LGPL-2.1 and Zlib Summary: Enlightenment Foundation Libraries - set of libraries used (not only) by E17 -Url: http://enlightenment.org +License: BSD-2-Clause and LGPL-2.1 and Zlib Group: Development/Libraries/C and C++ +Url: http://enlightenment.org Source: %{name}-%{version}.tar.bz2 BuildRequires: autoconf >= 2.5 BuildRequires: automake @@ -74,7 +75,9 @@ BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: python >= 2.5 +%ifarch %ix86 x86_64 ppc ppc64 ppc64le s390x armv7l armv7hl armv6l armv6hl BuildRequires: valgrind +%endif BuildRequires: pkgconfig(alsa) %if %physics_present @@ -83,9 +86,11 @@ BuildRequires: pkgconfig(check) BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(dri) +BuildRequires: pkgconfig(egl) BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(fribidi) +BuildRequires: pkgconfig(glesv2) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(libexif) @@ -101,8 +106,6 @@ BuildRequires: pkgconfig(sdl) BuildRequires: pkgconfig(sndfile) BuildRequires: pkgconfig(x11) -BuildRequires: pkgconfig(egl) -BuildRequires: pkgconfig(glesv2) BuildRequires: pkgconfig(xcb-composite) BuildRequires: pkgconfig(xcb-damage) BuildRequires: pkgconfig(xcb-dpms) @@ -137,7 +140,6 @@ BuildRequires: pkgconfig(xtst) BuildRequires: pkgconfig(zlib) - %if %harfbuzz_present BuildRequires: pkgconfig(harfbuzz) %endif @@ -150,8 +152,8 @@ %endif %if %{gstreamer_present} BuildRequires: pkgconfig(gstreamer-0.10) -BuildRequires: pkgconfig(gstreamer-plugins-base-0.10) BuildRequires: pkgconfig(gstreamer-1.0) +BuildRequires: pkgconfig(gstreamer-plugins-base-0.10) BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) %endif %if 0%{?mandriva_version} != 201010 && 0%{?centos_version} != 600 && 0%{?sles_version} != 11 @@ -190,26 +192,26 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %{?systemd_requires} - %description EFL is library collection providing various functionality used (not onyl) by Enlightenment 17, Terminology, Tizen mobile platform and much more. %package devel Summary: Headers, pkgconfig files and other files for development with EFL +License: BSD-2-Clause and LGPL-2.1 and Zlib Group: Development/Libraries/C and C++ -Requires: glibc-devel Requires: gettext-devel Requires: giflib-devel +Requires: glibc-devel %if %physics_present Requires: pkgconfig(bullet) %endif Requires: pkgconfig(dbus-1) Requires: pkgconfig(dri) +Requires: pkgconfig(egl) Requires: pkgconfig(fontconfig) Requires: pkgconfig(freetype2) Requires: pkgconfig(fribidi) -Requires: pkgconfig(egl) Requires: pkgconfig(glesv2) Requires: pkgconfig(glib-2.0) Requires: pkgconfig(libcurl) @@ -270,8 +272,8 @@ %endif %if %{gstreamer_present} Requires: pkgconfig(gstreamer-0.10) -Requires: pkgconfig(gstreamer-plugins-base-0.10) Requires: pkgconfig(gstreamer-1.0) +Requires: pkgconfig(gstreamer-plugins-base-0.10) Requires: pkgconfig(gstreamer-plugins-base-1.0) %endif %if %pulse_present @@ -281,7 +283,6 @@ Requires: %{name} = %{version} Requires: libecore1 = %{version} Requires: libedje1 = %{version} -Requires: libeldbus1 = %{version} Requires: libeet1 = %{version} Requires: libeeze1 = %{version} Requires: libefreet1 = %{version} @@ -289,25 +290,26 @@ Requires: libefreet_trash1 = %{version} Requires: libeina1 = %{version} Requires: libeio1 = %{version} +Requires: libeldbus1 = %{version} Requires: libembryo1 = %{version} Requires: libemotion1 = %{version} Requires: libeo1 = %{version} %if %physics_present Requires: libephysics1 = %{version} %endif +Requires: edje = %{version} +Requires: embryo = %{version} Requires: libethumb1 = %{version} Requires: libethumb_client1 = %{version} Requires: libevas1 = %{version} -Requires: edje = %{version} -Requires: embryo = %{version} Provides: ecore-devel = %{version} -Provides: edje-devel = %{version} Provides: edbus-devel = %{version} -Provides: eina-devel = %{version} -Provides: eio-devel = %{version} +Provides: edje-devel = %{version} Provides: eet-devel = %{version} Provides: eeze-devel = %{version} Provides: efreet-devel = %{version} +Provides: eina-devel = %{version} +Provides: eio-devel = %{version} Provides: embryo-devel = %{version} Provides: emotion-devel = %{version} %if %physics_present @@ -317,13 +319,13 @@ Provides: ethumb-devel = %{version} Provides: evas-devel = %{version} Obsoletes: ecore-devel < %{version} -Obsoletes: edje-devel < %{version} Obsoletes: edbus-devel < %{version} -Obsoletes: eina-devel < %{version} -Obsoletes: eio-devel < %{version} +Obsoletes: edje-devel < %{version} Obsoletes: eet-devel < %{version} Obsoletes: eeze-devel < %{version} Obsoletes: efreet-devel < %{version} +Obsoletes: eina-devel < %{version} +Obsoletes: eio-devel < %{version} Obsoletes: embryo-devel < %{version} Obsoletes: emotion-devel < %{version} Obsoletes: eo-devel < %{version} @@ -337,8 +339,8 @@ Headers, pkgconfig files and other files needed for development with EFL. %package -n libecore1 -License: BSD-2-Clause Summary: Ecore, part of EFL +License: BSD-2-Clause Group: Development/Libraries/C and C++ %description -n libecore1 @@ -346,23 +348,25 @@ convenient things for a programmer, to save time and effort. %package -n libedje1 -License: BSD-2-Clause and GPL-2.0 Summary: Edje, part of EFL +License: BSD-2-Clause and GPL-2.0 Group: System/Libraries + %description -n libedje1 Abstract GUI layout and animation object library. Part of Enlightenment Foundation Libraries. %package -n libeldbus1 -License: LGPL-2.1 Summary: ELDbus, part of EFL +License: LGPL-2.1 Group: System/Libraries + %description -n libeldbus1 ELDbus is a wrapper around libdbus for the Enlightenment Foundation Libraries %package -n libeet1 Summary: Eet, part of EFL -Group: Development/Libraries/C and C++ License: BSD-2-Clause +Group: Development/Libraries/C and C++ %description -n libeet1 Eet is a tiny library designed to write an arbitrary set of chunks of @@ -378,8 +382,8 @@ read by any architecture. %package -n libeeze1 -License: BSD-2-Clause Summary: Eeze, part of EFL +License: BSD-2-Clause Group: System/Libraries %description -n libeeze1 @@ -399,16 +403,16 @@ reduce the complexity of managing devices. %package -n libefreet1 -License: BSD-2-Clause Summary: Efreet, part of EFL +License: BSD-2-Clause Group: System/Libraries %description -n libefreet1 Standards handling for FreeDesktop.org standards. %package -n libefreet_mime1 -License: BSD-2-Clause Summary: Efreet, part of EFL +License: BSD-2-Clause Group: System/Libraries Conflicts: libefreet1 < 1.8 @@ -416,8 +420,8 @@ Standards handling for FreeDesktop.org mime types. %package -n libefreet_trash1 -License: BSD-2-Clause Summary: Efreet, part of EFL +License: BSD-2-Clause Group: System/Libraries Conflicts: libefreet1 < 1.8 @@ -425,24 +429,24 @@ Standards handling for FreeDesktop.org trash. %package -n libeina1 -License: LGPL-2.1 Summary: Eina, part of EFL +License: LGPL-2.1 Group: Development/Libraries/C and C++ %description -n libeina1 Eina is library handling various data types. %package -n libeio1 -License: LGPL-2.1 Summary: Eio, part of EFL +License: LGPL-2.1 Group: Development/Libraries/C and C++ %description -n libeio1 Extension of ecore for parallel I/O operations. Part of Enlightenment Foundation Libraries. %package -n libembryo1 -License: BSD-2-Clause and Zlib Summary: Embryo, part of EFL +License: BSD-2-Clause and Zlib Group: Development/Libraries/C and C++ %description -n libembryo1 @@ -452,8 +456,8 @@ untouched. %package -n libemotion1 -License: BSD-2-Clause Summary: Emotion, part of EFL +License: BSD-2-Clause Group: Development/Libraries/C and C++ %description -n libemotion1 @@ -461,16 +465,16 @@ Currently the supported backends for this %package -n libeo1 -License: LGPL-2.1 Summary: Eo, part of EFL +License: LGPL-2.1 Group: Development/Libraries/C and C++ %description -n libeo1 Eo is library providing basic E object in OOP way of programming. %package -n libethumb1 -License: LGPL-2.1 Summary: EThumb, part of EFL +License: LGPL-2.1 Group: Development/Libraries/C and C++ %description -n libethumb1 @@ -478,8 +482,8 @@ %if %physics_present %package -n libephysics1 -License: LGPL-2.1 Summary: EPhysics, part of EFL +License: LGPL-2.1 Group: Development/Libraries/C and C++ %description -n libephysics1 @@ -487,8 +491,8 @@ %endif %package -n libevas1 -License: BSD-2-Clause Summary: Evas, part of EFL +License: BSD-2-Clause Group: Development/Libraries/C and C++ %description -n libevas1 @@ -499,25 +503,25 @@ %package -n libethumb_client1 Summary: EThumb Client, part of EFL -Group: System/Libraries License: LGPL-2.1 +Group: System/Libraries %description -n libethumb_client1 Shared library of ethumb client %package -n edje -License: BSD-2-Clause Summary: Abstract GUI layout and animation object library +License: BSD-2-Clause Group: Development/Libraries/C and C++ -Requires: libedje1 = %{version} Requires: embryo = %{version} +Requires: libedje1 = %{version} %description -n edje Abstract GUI layout and animation object library. Part of Enlightenment Foundation Libraries. %package -n embryo -License: BSD-2-Clause Summary: Abstract GUI layout and animation object library +License: BSD-2-Clause Group: Development/Libraries/C and C++ Requires: libembryo1 = %{version} @@ -530,8 +534,8 @@ %if %{build_doc} %if %{build_doc_man} %package doc-man -License: BSD-2-Clause Summary: EFL reference man pages +License: BSD-2-Clause Group: Documentation/Man %description doc-man @@ -539,8 +543,8 @@ %endif #build_doc_man %package doc-html -License: BSD-2-Clause Summary: EFL reference man pages +License: BSD-2-Clause Group: Documentation/HTML %description doc-html @@ -549,6 +553,7 @@ %package examples Summary: Examples of EFL usage +License: BSD-2-Clause and LGPL-2.1 and Zlib Group: Documentation/Man %description examples @@ -556,6 +561,7 @@ %package testsuite Summary: EFL testsuite +License: BSD-2-Clause and LGPL-2.1 and Zlib Group: Development/Libraries/C and C++ Requires: libefreet1 = %{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 apache-commons-parent for openSUSE:Factory
by root＠hilbert.suse.de 14 Apr '14

14 Apr '14

Hello community, here is the log from the commit of package apache-commons-parent for openSUSE:Factory checked in at 2014-04-14 20:24:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apache-commons-parent (Old) and /work/SRC/openSUSE:Factory/.apache-commons-parent.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "apache-commons-parent" Changes: -------- --- /work/SRC/openSUSE:Factory/apache-commons-parent/apache-commons-parent.changes 2013-09-11 13:39:31.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.apache-commons-parent.new/apache-commons-parent.changes 2014-04-14 20:25:00.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Apr 14 13:28:48 UTC 2014 - darin(a)darins.net + +- add xz buildrequires for sles +- add buildroot for sles + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apache-commons-parent.spec ++++++ --- /var/tmp/diff_new_pack.2Q8TwP/_old 2014-04-14 20:25:00.000000000 +0200 +++ /var/tmp/diff_new_pack.2Q8TwP/_new 2014-04-14 20:25:00.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package apache-commons-parent # -# 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 @@ -31,10 +31,12 @@ # tar caf commons-parent-32.tar.xz commons-parent-32 Source0: %{short_name}-%{version}.tar.xz +BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch BuildRequires: java-devel >= 1.6.0 BuildRequires: javapackages-tools +BuildRequires: xz Requires: java >= 1.6.0 Requires: javapackages-tools -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mlocate for openSUSE:13.1:Update
by root＠hilbert.suse.de 14 Apr '14

14 Apr '14

Hello community, here is the log from the commit of package mlocate for openSUSE:13.1:Update checked in at 2014-04-14 14:51:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/mlocate (Old) and /work/SRC/openSUSE:13.1:Update/.mlocate.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mlocate" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.v98YNO/_old 2014-04-14 14:51:07.000000000 +0200 +++ /var/tmp/diff_new_pack.v98YNO/_new 2014-04-14 14:51:07.000000000 +0200 @@ -1 +1 @@ -<link package='mlocate.2682' cicount='copy' /> +<link package='mlocate.2710' 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 apache2 for openSUSE:13.1:Update
by root＠hilbert.suse.de 14 Apr '14

14 Apr '14

Hello community, here is the log from the commit of package apache2 for openSUSE:13.1:Update checked in at 2014-04-14 14:50:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/apache2 (Old) and /work/SRC/openSUSE:13.1:Update/.apache2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "apache2" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.0DZC2B/_old 2014-04-14 14:50:42.000000000 +0200 +++ /var/tmp/diff_new_pack.0DZC2B/_new 2014-04-14 14:50:42.000000000 +0200 @@ -1 +1 @@ -<link package='apache2.2616' cicount='copy' /> +<link package='apache2.2711' 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 pidgin-sipe for openSUSE:Factory
by root＠hilbert.suse.de 14 Apr '14

14 Apr '14

Hello community, here is the log from the commit of package pidgin-sipe for openSUSE:Factory checked in at 2014-04-14 12:33:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pidgin-sipe (Old) and /work/SRC/openSUSE:Factory/.pidgin-sipe.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pidgin-sipe" Changes: -------- --- /work/SRC/openSUSE:Factory/pidgin-sipe/pidgin-sipe.changes 2014-02-05 13:45:49.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.pidgin-sipe.new/pidgin-sipe.changes 2014-04-14 12:33:15.000000000 +0200 @@ -1,0 +2,18 @@ +Sun Apr 13 20:58:31 UTC 2014 - zaitor(a)opensuse.org + +- Update to version 1.18.1: + + sf#238: Fixed false "not delivered" in conference. + + sf#237: HTML escaping not removed from URL. + + sf#210: Conference call ends with error message. + + Fix endless loop with failed HTTP Basic authentication. + + Fix crash when gstreamer nice plugin is missing. + + Fix EWS autodiscover for some Office 365 users. + + purple: fix missing "Copy to" in buddy menu. + + purple/adium: ignore empty search values. + + adium: + - Fix group chat UI. + - Implement BEAST mitigations for 10.8.5. + + Add indication when user is connected from a mobile device. + + Updated translations. + +------------------------------------------------------------------- Old: ---- pidgin-sipe-1.18.0.tar.bz2 New: ---- pidgin-sipe-1.18.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pidgin-sipe.spec ++++++ --- /var/tmp/diff_new_pack.2KMYnG/_old 2014-04-14 12:33:15.000000000 +0200 +++ /var/tmp/diff_new_pack.2KMYnG/_new 2014-04-14 12:33:15.000000000 +0200 @@ -19,13 +19,13 @@ %define build_telepathy 1 Name: pidgin-sipe -Version: 1.18.0 +Version: 1.18.1 Release: 0 Summary: Pidgin protocol plugin to connect to MS Office Communicator License: GPL-2.0+ Group: Productivity/Networking/Instant Messenger Url: http://sipe.sourceforge.net/ -Source: http://downloads.sourceforge.net/project/sipe/sipe/pidgin-sipe-1.18.0/%{nam… +Source: http://downloads.sourceforge.net/project/sipe/sipe/pidgin-sipe-1.18.1/%{nam… BuildRequires: gettext-devel BuildRequires: glib2-devel >= 2.12.0 BuildRequires: gmime-devel ++++++ pidgin-sipe-1.18.0.tar.bz2 -> pidgin-sipe-1.18.1.tar.bz2 ++++++ ++++ 3756 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 openstack-trove for openSUSE:Factory
by root＠hilbert.suse.de 14 Apr '14

14 Apr '14

Hello community, here is the log from the commit of package openstack-trove for openSUSE:Factory checked in at 2014-04-14 12:33:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openstack-trove (Old) and /work/SRC/openSUSE:Factory/.openstack-trove.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openstack-trove" Changes: -------- --- /work/SRC/openSUSE:Factory/openstack-trove/openstack-trove.changes 2014-04-08 15:11:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.openstack-trove.new/openstack-trove.changes 2014-04-14 12:33:07.000000000 +0200 @@ -1,0 +2,10 @@ +Thu Apr 10 17:29:38 UTC 2014 - dmueller(a)suse.com + +- remove extras dependency + +------------------------------------------------------------------- +Mon Apr 7 15:04:24 UTC 2014 - dmueller(a)suse.com + +- switch over to icehouse release + +------------------------------------------------------------------- Old: ---- trove-2014.1.b3.tar.gz New: ---- trove-milestone-proposed.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openstack-trove.spec ++++++ --- /var/tmp/diff_new_pack.MipWSt/_old 2014-04-14 12:33:08.000000000 +0200 +++ /var/tmp/diff_new_pack.MipWSt/_new 2014-04-14 12:33:08.000000000 +0200 @@ -21,13 +21,13 @@ %define username %{component} Name: openstack-%{component} -Version: 2014.1.b3 +Version: 2014.1.dev62.g3582409 Release: 0 Summary: Openstack DBaaS (Trove) License: Apache-2.0 Group: System/Management Url: https://launchpad.net/trove -Source: http://tarballs.openstack.org/trove/trove-2014.1.b3.tar.gz +Source: http://tarballs.openstack.org/trove/trove-milestone-proposed.tar.gz Source1: %{name}.init Source2: %{name}.logrotate %if 0%{?suse_version} > 1230 @@ -72,23 +72,22 @@ Requires: python-cinderclient >= 1.0.6 Requires: python-designateclient >= 1.0.0 Requires: python-eventlet >= 0.13.0 -Requires: python-extras Requires: python-heatclient >= 0.2.3 -Requires: python-iso8601 >= 0.1.8 -Requires: python-jsonschema >= 1.3.0 -Requires: python-keystoneclient >= 0.4.1 +Requires: python-iso8601 >= 0.1.9 +Requires: python-jsonschema >= 2.0.0 +Requires: python-keystoneclient >= 0.7.0 Requires: python-kombu >= 2.4.8 Requires: python-lxml >= 2.3 Requires: python-netaddr >= 0.7.6 -Requires: python-novaclient >= 2.15.0 +Requires: python-novaclient >= 2.17.0 Requires: python-oslo.config >= 1.2.0 Requires: python-passlib -Requires: python-pexpect +Requires: python-pexpect >= 3.1 Requires: python-proboscis >= 1.2.5.3 Requires: python-sqlalchemy-migrate >= 0.8.2 -Requires: python-swiftclient >= 1.5 +Requires: python-swiftclient >= 1.6 Requires: python-troveclient -Requires: python-wsgi_intercept +Requires: python-wsgi_intercept >= 0.6.1 %description -n python-trove This package contains the core code of OpenStack Trove. @@ -143,14 +142,14 @@ Requires: python-nose Requires: python-nosexcover Requires: python-openstack.nose_plugin >= 0.7 -Requires: python-testrepository >= 0.0.17 -Requires: python-testtools >= 0.9.32 +Requires: python-testrepository >= 0.0.18 +Requires: python-testtools >= 0.9.34 %description test This package contains testsuite files for %{name}. %prep -%setup -q -n %{component}-%{version} +%setup -q -n %{component}-2014.1.dev62.g3582409 %openstack_cleanup_prep %build -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit leechcraft for openSUSE:Factory
by root＠hilbert.suse.de 14 Apr '14

14 Apr '14

Hello community, here is the log from the commit of package leechcraft for openSUSE:Factory checked in at 2014-04-14 12:32:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/leechcraft (Old) and /work/SRC/openSUSE:Factory/.leechcraft.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "leechcraft" Changes: -------- --- /work/SRC/openSUSE:Factory/leechcraft/leechcraft-doc.changes 2014-01-15 10:12:38.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.leechcraft.new/leechcraft-doc.changes 2014-04-14 12:33:00.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Apr 5 11:56:18 UTC 2014 - dap.darkness(a)gmail.com + +- 0.6.65 release. + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/leechcraft/leechcraft.changes 2014-03-11 17:27:32.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.leechcraft.new/leechcraft.changes 2014-04-14 12:33:00.000000000 +0200 @@ -1,0 +2,31 @@ +Sat Apr 5 11:56:18 UTC 2014 - dap.darkness(a)gmail.com + +- 0.6.65 release: + * LMP audio player ReplayGain support; + * Azoth, the IM client, server history support (XEP-0313); + * XMPP Message Carbons support (XEP-0280); + * Monocle, the document reader, now supports annotated documents; + * PDF seamless scrolling without freezing the UI; + * The LHTR visual hypertext editor now gained + support for the image sources plugins (Blasq); + * HTML editor now supports syntax highlighting; + * Aggregator now supports renaming feeds; + * LackMan now supports vim-style navigation + and using Space key to toggle packages; + * MusicZombie now fetches all information about a single artist + in one request; + * New Life now supports importing history from Opera; + * Popishu text editor now supports the recoverable tabs concept; + * SB2 now supports hiding quarks by default; + * /etc/os-release is now properly parsed. +- New plugins were enabled: + * CertMgr is the new SSL manager; + * CPU load is a monitoring quark; + * Ooronee handles images and text dropped onto it; + * Rosenthal is a core spell checker. +- Deleted leechcraft-0.6.60-monocle-arm.patch as merged. +- Added leechcraft-monocle-gcc47.patch + to prevent names constructor error. +- Shellopen plugin amd mediacalls became obsoleted. + +------------------------------------------------------------------- Old: ---- leechcraft-0.6.60-monocle-arm.patch leechcraft-0.6.60.tar.xz New: ---- leechcraft-0.6.65.tar.xz leechcraft-monocle-gcc47.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ leechcraft-doc.spec ++++++ --- /var/tmp/diff_new_pack.v0mAw6/_old 2014-04-14 12:33:01.000000000 +0200 +++ /var/tmp/diff_new_pack.v0mAw6/_new 2014-04-14 12:33:01.000000000 +0200 @@ -17,7 +17,7 @@ Name: leechcraft-doc -Version: 0.6.60 +Version: 0.6.65 Release: 0 Summary: Modular Internet Client Documentation License: BSL-1.0 ++++++ leechcraft.spec ++++++ --- /var/tmp/diff_new_pack.v0mAw6/_old 2014-04-14 12:33:01.000000000 +0200 +++ /var/tmp/diff_new_pack.v0mAw6/_new 2014-04-14 12:33:01.000000000 +0200 @@ -28,7 +28,7 @@ %endif Name: leechcraft -Version: 0.6.60 +Version: 0.6.65 Release: 0 Summary: Modular Internet Client License: BSL-1.0 @@ -38,10 +38,8 @@ # PATCH-FIX-OPENSUSE to prevent oS 12.2' gcc build issue: # "error: the value of 'w' is not usable in a constant expression". Patch1: leechcraft-azoth-gcc47.patch -# PATCH-FIX-UPSTREAM to prevent arm6-7 build issue: -# "error: no matching function for call to 'max(double&, qreal)'"; -# https://github.com/0xd34df00d/leechcraft/commit/ef3fdc -Patch2: leechcraft-0.6.60-monocle-arm.patch +# PATCH-FIX-OPENSUSE vs. names constructor error. +Patch3: leechcraft-monocle-gcc47.patch BuildRequires: Qross-devel %if 0%{?suse_version} > 1230 @@ -66,6 +64,9 @@ BuildRequires: libotr-devel BuildRequires: libqscintilla-devel BuildRequires: libqt4-sql +%if 0%{?suse_version} > 1310 +BuildRequires: libqxt-devel +%endif BuildRequires: libsensors4-devel BuildRequires: libtidy-devel %if 0%{?suse_version} == 1310 @@ -121,7 +122,7 @@ BuildRequires: pkgconfig(poppler-cpp) BuildRequires: pkgconfig(poppler-qt4) BuildRequires: pkgconfig(qca2) -BuildRequires: pkgconfig(qxmpp) >= 0.7.4 +BuildRequires: pkgconfig(qxmpp) >= 0.8 BuildRequires: pkgconfig(udev) BuildRequires: pkgconfig(xcomposite) BuildRequires: pkgconfig(xdamage) @@ -164,6 +165,8 @@ Requires: %{name} = %{version} Requires: %{name}-visualnotifications = %{version} Recommends: %{name}-soundnotifications = %{version} +Provides: %{name}-shellopen = %{version} +Obsoletes: %{name}-shellopen < %{version} %description advancednotifications This package provides an advanced notifications plugin for Leechcraft. @@ -302,6 +305,7 @@ %if 0%{?suse_version} > 1310 %package azoth-astrality Summary: LeechCraft Azoth - Telepathy Module +License: BSL-1.0 Group: Productivity/Networking/Other Requires: %{name}-azoth = %{version} Requires: telepathy-haze @@ -320,7 +324,6 @@ * Nick resolution. %endif - %package azoth-autoidler Summary: LeechCraft Azoth - Automatic Change of Status Module License: BSL-1.0 @@ -550,6 +553,7 @@ License: BSL-1.0 Group: Productivity/Networking/Other Requires: %{name}-azoth = %{version} +Requires: %{name}-rosenthal = %{version} %description azoth-rosenthal This package provides a spell checker plugin for LeechCraft Azoth. @@ -637,8 +641,7 @@ License: BSL-1.0 Group: Productivity/Networking/Other Requires: %{name}-azoth = %{version} -Requires: libqxmpp0 >= 0.7.4 -Recommends: libqxmpp0 >= 0.7.6 +Requires: libqxmpp0 >= 0.8 Provides: %{name}-azoth-protocolplugin %description azoth-xoox @@ -794,7 +797,9 @@ Group: Productivity/Networking/Other Requires: %{name} = %{version} Requires: %{name}-blogique-subplugin = %{version} +%if 0%{?suse_version} >= 1230 Recommends: %{name}-lhtr +%endif %description blogique This package provides a modular Blogging client plugin for LeechCraft. @@ -829,6 +834,29 @@ It provides LiveJournal support. +%package certmgr +Summary: LeechCraft SSL certificates Module +License: BSL-1.0 +Group: Productivity/Networking/Other +Requires: %{name} = %{version} + +%description certmgr +This package provides an SSL certificates manager plugin. + + +%package cpuload +Summary: LeechCraft CPU Usage Monitoring Module +License: BSL-1.0 +Group: Productivity/Networking/Other +Requires: %{name} = %{version} +Requires: %{name}-sb2 = %{version} + +%description cpuload +This package provides a quark for monitoring the CPU usage +for LeechCraft SB2. Monitoring memory and swap will also +be probably added later. For now it uses /proc/stat. + + %package cstp Summary: LeechCraft HTTP Module License: BSL-1.0 @@ -930,6 +958,7 @@ License: BSL-1.0 Group: Productivity/Networking/Other Provides: %{name}-fenet-compton = %{version} +Recommends: %{name}-cpuload Recommends: %{name}-hotsensors Recommends: %{name}-kbswitch Recommends: %{name}-krigstask @@ -938,6 +967,7 @@ Recommends: %{name}-lemon Recommends: %{name}-liznoo Recommends: %{name}-mellonetray +Requires: %{name}-ooronee Recommends: %{name}-sb2 Recommends: %{name}-tpi Recommends: %{name}-vrooby @@ -1233,6 +1263,7 @@ This package provides another Network Monitor plugin for Leechcraft. +%if 0%{?suse_version} >= 1230 %package lhtr Summary: LeechCraft HTML WYSIWYG editor Module License: BSL-1.0 @@ -1244,7 +1275,7 @@ This package provides a HTML WYSIWYG editor plugin for Leechcraft. It can be usable with mail and blog modules. - +%endif %package liznoo Summary: LeechCraft Power managment module @@ -1278,6 +1309,7 @@ Recommends: %{name}-lyricsprovider Recommends: %{name}-gacts = %{version} Recommends: %{name}-scrobbler +Suggests: %{name}-lastfmscrobble Recommends: %{name}-musiczombie = %{version} Recommends: ffmpeg %if %{lmp_gstreamer_1_0} @@ -1565,6 +1597,24 @@ * Liferea: feeds list. +%package ooronee +Summary: LeechCraft Text and Images Handler Module +License: BSL-1.0 +Group: Productivity/Networking/Other +Requires: %{name}-sb2 = %{version} +Recommends: %{name}-blasq +Recommends: %{name}-imgaste +Recommends: %{name}-pogooglue +Recommends: %{name}-seekthru + +%description ooronee +This package provides a quark handling text and images +dropped on it for Leechcraft. + +The dropped data is then sent to a data filter chosen by the user. +See more at http://leechcraft.org/concepts-data-filters + + %package otlozhu Summary: LeechCraft ToDo manager Module License: BSL-1.0 @@ -1786,6 +1836,7 @@ %package qrosp Summary: LeechCraft Qross Module +License: BSL-1.0 Group: Productivity/Networking/Other Requires: %{name} = %{version} Requires: libqrosspython1 @@ -1794,6 +1845,18 @@ This package contains a scripting support plugin for Leechcraft. +%package rosenthal +Summary: LeechCraft - Spell Checker Module +License: BSL-1.0 +Group: Productivity/Networking/Other +Requires: %{name} = %{version} + +%description rosenthal +This package provides a spell checker plugin for LeechCraft. + +It is based on Hunspell or Myspell dictionaries. + + %package sb2 Summary: LeechCraft SideBar2 Module License: BSL-1.0 @@ -1879,20 +1942,6 @@ * Show results in HTML format with a suitable plugin like Poshuku. -%package shellopen -Summary: LeechCraft Shellopen Module -License: BSL-1.0 -Group: Productivity/Networking/Other -Requires: %{name} = %{version} - -%description shellopen -This package provides an opening files with external apps for LeechCraft. - -It allows to open files and handle entities with external applications. -For example, you may choose to open a video file with your favorite media -player instead of LC's one. - - %package summary Summary: LeechCraft Summary info Module License: BSL-1.0 @@ -1965,10 +2014,11 @@ %package textogroose Summary: LeechCraft Script-Based Lyrics Module +License: BSL-1.0 Group: Productivity/Networking/Other Requires: %{name}-http = %{version} -Requires: %{name}-summaryrepresentation = %{version} Requires: %{name}-qrosp +Requires: %{name}-summaryrepresentation = %{version} Provides: %{name}-lyricsprovider %description textogroose @@ -2081,7 +2131,9 @@ %if 0%{?suse_version} <= 1220 %patch1 -p1 %endif -%patch2 -p1 +%if 0%{?suse_version} <= 1230 +%patch3 -p1 +%endif #removing non-free icons rm -rf src/plugins/azoth/share/azoth/iconsets/clients/default @@ -2103,8 +2155,11 @@ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DSTRICT_LICENSING=True \ -DENABLE_ADVANCEDNOTIFICATIONS=True \ + -DENABLE_AGGREGATOR=True \ + -DENABLE_AGGREGATOR_WEBACCESS=False \ -DENABLE_AUSCRIE=True \ -DENABLE_AZOTH=True \ + -DENABLE_AZOTH_ACETAMIDE=True \ %if 0%{?suse_version} > 1310 -DENABLE_AZOTH_ASTRALITY=True \ %else @@ -2113,18 +2168,30 @@ -DENABLE_AZOTH_OTROID=True \ -DENABLE_AZOTH_SHX=True \ -DENABLE_AZOTH_VELVETBIRD=True \ + -DENABLE_AZOTH_WOODPECKER=True \ -DENABLE_AZOTH_ZHEET=True \ - -DENABLE_MEDIACALLS=True \ + -DENABLE_MEDIACALLS=False \ -DENABLE_BLACKDASH=False \ + -DENABLE_BLASQ=True \ + -DENABLE_BLASQ_VANGOG=True \ -DENABLE_BLOGIQUE=True \ + -DENABLE_CERTMGR=True \ -DENABLE_CHOROID=False \ + -DENABLE_CPULOAD=True \ + -DENABLE_DEVMON=True \ + -DENABLE_DLNIWE=False \ -DENABLE_DOLOZHEE=True \ -DENABLE_DUMBEEP=True \ -DDUMBEEP_WITH_PHONON=True \ -DENABLE_GACTS=True \ +%if 0%{?suse_version} > 1310 + -DWITH_GACTS_BUNDLED_QXT=False \ +%else -DWITH_GACTS_BUNDLED_QXT=True \ +%endif -DENABLE_GLANCE=True \ -DENABLE_GMAILNOTIFIER=True \ + -DENABLE_HARBINGER=True \ -DENABLE_HOTSENSORS=False \ -DENABLE_HOTSTREAMS=True \ %if 0%{?suse_version} > 1230 @@ -2132,15 +2199,22 @@ %else -DENABLE_HTTHARE=False \ %endif + -DENABLE_IMGASTE=True \ -DENABLE_KBSWITCH=True \ -DENABLE_KNOWHOW=True \ + -DENABLE_KRIGSTASK=True \ -DENABLE_LACKMAN=True \ -DENABLE_LADS=False \ -DENABLE_LASTFMSCROBBLE=True \ + -DENABLE_LAUGHTY=True \ -DENABLE_LAUNCHY=True \ -DENABLE_LEMON=True \ +%if 0%{?suse_version} >= 1230 -DENABLE_LHTR=True \ -DWITH_LHTR_HTML=True \ +%else + -DENABLE_LHTR=False \ +%endif -DENABLE_LIZNOO=True \ -DENABLE_LMP=True \ -DENABLE_LMP_GRAFFITI=True \ @@ -2154,6 +2228,7 @@ %if 0%{?lmp_gstreamer_1_0} -DUSE_GSTREAMER_10=True \ %endif + -DENABLE_MELLONETRAY=True \ -DENABLE_MONOCLE=True \ %if 0%{?suse_version} == 1310 %ifarch %ix86 x86_64 %arm @@ -2170,6 +2245,7 @@ -DENABLE_NACHEKU=False \ -DENABLE_NETSTOREMANAGER=True \ -DENABLE_NEWLIFE=True \ + -DENABLE_OORONEE=True \ -DENABLE_OTLOZHU=True \ -DENABLE_OTLOZHU_SYNC=False \ -DENABLE_PINTAB=True \ @@ -2180,9 +2256,10 @@ -DUSE_POSHUKU_CLEANWEB_PCRE=True \ -DENABLE_QROSP=True \ -DENABLE_SB2=True \ + -DENABLE_SCROBLIBRE=True \ -DENABLE_SECMAN=True \ -DENABLE_SHAITAN=False \ - -DENABLE_SHELLOPEN=True \ + -DENABLE_SHELLOPEN=False \ -DENABLE_SNAILS=False \ -DENABLE_SYNCER=False \ -DENABLE_TABSESSMANAGER=True \ @@ -2263,7 +2340,8 @@ %files aggregator %defattr(-,root,root) %{settings_dir}/aggregatorsettings.xml -%{translations_dir}/%{name}_aggregator*.qm +%{translations_dir}/%{name}_aggregator_??.qm +%{translations_dir}/%{name}_aggregator_??_??.qm %{plugin_dir}/*%{name}_aggregator.so %files aggregator-bodyfetch @@ -2418,7 +2496,6 @@ %defattr(-,root,root) %{plugin_dir}/*%{name}_azoth_rosenthal.so %{translations_dir}/%{name}_azoth_rosenthal* -%{settings_dir}/azothrosenthalsettings.xml %files azoth-shx %defattr(-,root,root) @@ -2523,6 +2600,17 @@ %{_datadir}/%{name}/settings/blogiquemetidasettings.xml %{_datadir}/%{name}/translations/%{name}_blogique_metida*.qm +%files certmgr +%defattr(-,root,root) +%{_libdir}/%{name}/plugins/lib%{name}_certmgr.so +%{_datadir}/%{name}/settings/certmgrsettings.xml +%{_datadir}/%{name}/translations/%{name}_certmgr*.qm + +%files cpuload +%defattr(-,root,root) +%{_libdir}/%{name}/plugins/lib%{name}_cpuload.so +%{_datadir}/%{name}/qml/cpuload + %files cstp %defattr(-,root,root) %{settings_dir}/cstpsettings.xml @@ -2691,11 +2779,13 @@ %{_datadir}/%{name}/qml/lemon/ %{_datadir}/%{name}/translations/%{name}_lemon_*.qm +%if 0%{?suse_version} >= 1230 %files lhtr %defattr(-,root,root) %{_libdir}/%{name}/plugins/lib%{name}_lhtr.so %{_datadir}/%{name}/translations/%{name}_lhtr_*.qm %{_datadir}/%{name}/settings/lhtrsettings.xml +%endif %files liznoo %defattr(-,root,root) @@ -2805,6 +2895,12 @@ %{translations_dir}/%{name}_newlife*.qm %{plugin_dir}/*%{name}_newlife.so +%files ooronee +%defattr(-,root,root) +%{_libdir}/%{name}/plugins/lib%{name}_ooronee.so +%{_datadir}/%{name}/settings/ooroneesettings.xml +%{_datadir}/%{name}/qml/ooronee + %files otlozhu %defattr(-,root,root) %{_libdir}/%{name}/plugins/lib%{name}_otlozhu.so @@ -2887,6 +2983,12 @@ %defattr(-,root,root) %{_libdir}/%{name}/plugins/lib%{name}_qrosp.so +%files rosenthal +%defattr(-,root,root) +%{_libdir}/%{name}/plugins/lib%{name}_rosenthal.so +%{_datadir}/%{name}/translations/%{name}_rosenthal* +%{_datadir}/%{name}/settings/rosenthalsettings.xml + %files sb2 %defattr(-,root,root) %{_libdir}/%{name}/plugins/lib%{name}_sb2.so @@ -2915,11 +3017,6 @@ %{translations_dir}/%{name}_seekthru*.qm %{plugin_dir}/*%{name}_seekthru.so -%files shellopen -%defattr(-,root,root) -%{translations_dir}/%{name}_shellopen*.qm -%{plugin_dir}/*%{name}_shellopen.so - %files summary %defattr(-,root,root) %{translations_dir}/%{name}_summary*.qm ++++++ leechcraft-0.6.60.tar.xz -> leechcraft-0.6.65.tar.xz ++++++ ++++ 98424 lines of diff (skipped) ++++++ leechcraft-monocle-gcc47.patch ++++++ diff --git a/src/plugins/monocle/annitem.cpp b/src/plugins/monocle/annitem.cpp index 3c62097..9c9c9c9 100644 --- a/src/plugins/monocle/annitem.cpp +++ b/src/plugins/monocle/annitem.cpp @@ -63,88 +63,7 @@ namespace Monocle AnnBaseItem* MakeItem (const IAnnotation_ptr& ann, QGraphicsItem *parent) { - switch (ann->GetAnnotationType ()) - { - case AnnotationType::Text: - return new TextAnnItem (std::dynamic_pointer_cast<ITextAnnotation> (ann), parent); - case AnnotationType::Highlight: - return new HighAnnItem (std::dynamic_pointer_cast<IHighlightAnnotation> (ann), parent); - case AnnotationType::Link: - return new LinkAnnItem (std::dynamic_pointer_cast<ILinkAnnotation> (ann), parent); - case AnnotationType::Other: - qWarning () << Q_FUNC_INFO - << "unknown annotation type with contents" - << ann->GetText (); - return nullptr; - } - - qWarning () << Q_FUNC_INFO - << "unhandled annotation type " - << static_cast<int> (ann->GetAnnotationType ()) - << "with contents" - << ann->GetText (); - return nullptr; } - - HighAnnItem::HighAnnItem (const IHighlightAnnotation_ptr& ann, QGraphicsItem *parent) - : AnnBaseGraphicsItem { ann, parent } - , Polys_ { ToPolyData (ann->GetPolygons ()) } - { - for (const auto& data : Polys_) - { - addToGroup (data.Item_); - data.Item_->setPen (Qt::NoPen); - - Bounding_ |= data.Poly_.boundingRect (); - - data.Item_->setCursor (Qt::PointingHandCursor); - } - } - - void HighAnnItem::SetSelected (bool selected) - { - AnnBaseItem::SetSelected (selected); - - const auto& pen = selected ? QPen { QColor { 255, 234, 0 }, 2 } : Qt::NoPen; - const auto& brush = selected ? QBrush { QColor { 255, 213, 0, 64 } } : QBrush {}; - for (const auto& data : Polys_) - { - data.Item_->setPen (pen); - data.Item_->setBrush (brush); - } - } - - void HighAnnItem::UpdateRect (const QRectF& rect) - { - setPos (rect.topLeft ()); - for (auto data : Polys_) - { - auto poly = data.Poly_; - - if (!Bounding_.width () || !Bounding_.height ()) - continue; - - const auto xScale = rect.width () / Bounding_.width (); - const auto yScale = rect.height () / Bounding_.height (); - const auto xTran = rect.x () - Bounding_.x () * xScale - rect.left (); - const auto yTran = rect.y () - Bounding_.y () * yScale - rect.top (); - - data.Item_->setPolygon (poly * QMatrix { xScale, 0, 0, yScale, xTran, yTran }); - } - } - - QList<HighAnnItem::PolyData> HighAnnItem::ToPolyData (const QList<QPolygonF>& polys) - { - QList<PolyData> result; - for (const auto& poly : polys) - result.append ({ poly, new QGraphicsPolygonItem }); - return result; - } - - LinkAnnItem::LinkAnnItem (const ILinkAnnotation_ptr& ann, QGraphicsItem *item) - : AnnRectGraphicsItem { ann, ann->GetLink (), item } - { - } } } diff --git a/src/plugins/monocle/annitem.h b/src/plugins/monocle/annitem.h index adf81ce..9ea982c 100644 --- a/src/plugins/monocle/annitem.h +++ b/src/plugins/monocle/annitem.h @@ -63,84 +63,5 @@ namespace Monocle AnnBaseItem* MakeItem (const IAnnotation_ptr&, QGraphicsItem*); - template<typename T> - class AnnBaseGraphicsItem : public AnnBaseItem - , public T - { - QPointF PressedPos_; - public: - template<typename... TArgs> - AnnBaseGraphicsItem (const IAnnotation_ptr& ann, TArgs... args) - : AnnBaseItem { ann } - , T { args... } - { - } - protected: - void mousePressEvent (QGraphicsSceneMouseEvent *event) - { - PressedPos_ = event->pos (); - T::mousePressEvent (event); - event->accept (); - } - - void mouseReleaseEvent (QGraphicsSceneMouseEvent *event) - { - if (Handler_ && - (event->pos () - PressedPos_).manhattanLength () < 4) - Handler_ (BaseAnn_); - - T::mouseReleaseEvent (event); - } - }; - - template<typename T> - class AnnRectGraphicsItem : public AnnBaseGraphicsItem<T> - { - public: - using AnnBaseGraphicsItem<T>::AnnBaseGraphicsItem; - - void SetSelected (bool selected) - { - AnnBaseItem::SetSelected (selected); - T::setPen (selected ? QPen { QColor { 255, 234, 0 }, 2 } : Qt::NoPen); - } - - void UpdateRect (const QRectF& rect) - { - T::setRect (rect); - } - }; - - class TextAnnItem : public AnnRectGraphicsItem<QGraphicsRectItem> - { - public: - using AnnRectGraphicsItem<QGraphicsRectItem>::AnnRectGraphicsItem; - }; - - class HighAnnItem : public AnnBaseGraphicsItem<QGraphicsItemGroup> - { - struct PolyData - { - QPolygonF Poly_; - QGraphicsPolygonItem *Item_; - }; - const QList<PolyData> Polys_; - - QRectF Bounding_; - public: - HighAnnItem (const IHighlightAnnotation_ptr&, QGraphicsItem*); - - void SetSelected (bool); - - void UpdateRect (const QRectF& rect); - private: - static QList<PolyData> ToPolyData (const QList<QPolygonF>&); - }; - - class LinkAnnItem : public AnnRectGraphicsItem<LinkItem> - { - public: - LinkAnnItem (const ILinkAnnotation_ptr&, QGraphicsItem*); - }; } } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit goffice for openSUSE:Factory
by root＠hilbert.suse.de 14 Apr '14

14 Apr '14

Hello community, here is the log from the commit of package goffice for openSUSE:Factory checked in at 2014-04-14 12:32:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/goffice (Old) and /work/SRC/openSUSE:Factory/.goffice.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "goffice" Changes: -------- --- /work/SRC/openSUSE:Factory/goffice/goffice.changes 2014-04-05 21:23:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.goffice.new/goffice.changes 2014-04-14 12:32:52.000000000 +0200 @@ -1,0 +2,14 @@ +Sun Apr 13 19:48:34 UTC 2014 - zaitor(a)opensuse.org + +- Update to version 0.10.14: + + Improve conditional format roundtrip through ODF (part of + bgo#725852). + + Fix canvas drawing problem. + + Work on conditional formats for ODF. + + Implement numbered colours in number formats. + + Fix plugin deactivation. + + Plug leaks. + + Fix rounding problem. + + Use musl code for dtoa. Adapt to round-ties-away-from-0. + +------------------------------------------------------------------- Old: ---- goffice-0.10.13.tar.xz New: ---- goffice-0.10.14.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ goffice.spec ++++++ --- /var/tmp/diff_new_pack.PlQAxL/_old 2014-04-14 12:32:52.000000000 +0200 +++ /var/tmp/diff_new_pack.PlQAxL/_new 2014-04-14 12:32:52.000000000 +0200 @@ -17,7 +17,7 @@ Name: goffice -Version: 0.10.13 +Version: 0.10.14 Release: 0 Summary: GLib/GTK+ Set of Document-Centric Objects and Utilities License: GPL-2.0 or GPL-3.0 ++++++ goffice-0.10.13.tar.xz -> goffice-0.10.14.tar.xz ++++++ ++++ 10122 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 gnumeric for openSUSE:Factory
by root＠hilbert.suse.de 14 Apr '14

14 Apr '14

Hello community, here is the log from the commit of package gnumeric for openSUSE:Factory checked in at 2014-04-14 12:32:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnumeric (Old) and /work/SRC/openSUSE:Factory/.gnumeric.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnumeric" Changes: -------- --- /work/SRC/openSUSE:Factory/gnumeric/gnumeric.changes 2014-04-05 21:19:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gnumeric.new/gnumeric.changes 2014-04-14 12:32:45.000000000 +0200 @@ -1,0 +2,18 @@ +Sun Apr 13 19:49:53 UTC 2014 - zaitor(a)opensuse.org + +- Update to version 1.12.14: + + Improve format import from ODF files. + + Plug leaks. + + xlsx conditional format fixes (bgo#726202). + + Fix semantics of conditional format operators (bgo#726806). + + Fix xlsx quotes in formula strings (bgo#726824). + + Fix xls export of rich text. + + Fix problems with large, circular farms of VLOOKUP etc + (bgo#723894). + + Let goffice handle conditional number formats. + + Attempt a workaround for Ubuntu scroll bars. + + Fix odf parse problems. + + Fix array editing. + + Fix column/row header colouring problem (bgo#728007). + +------------------------------------------------------------------- Old: ---- gnumeric-1.12.13.tar.xz New: ---- gnumeric-1.12.14.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnumeric.spec ++++++ --- /var/tmp/diff_new_pack.D32suc/_old 2014-04-14 12:32:46.000000000 +0200 +++ /var/tmp/diff_new_pack.D32suc/_new 2014-04-14 12:32:46.000000000 +0200 @@ -17,7 +17,7 @@ Name: gnumeric -Version: 1.12.13 +Version: 1.12.14 Release: 0 Summary: Spreadsheet Application License: GPL-2.0 or GPL-3.0 ++++++ gnumeric-1.12.13.tar.xz -> gnumeric-1.12.14.tar.xz ++++++ /work/SRC/openSUSE:Factory/gnumeric/gnumeric-1.12.13.tar.xz /work/SRC/openSUSE:Factory/.gnumeric.new/gnumeric-1.12.14.tar.xz differ: char 26, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit efax-gtk for openSUSE:Factory
by root＠hilbert.suse.de 14 Apr '14

14 Apr '14

Hello community, here is the log from the commit of package efax-gtk for openSUSE:Factory checked in at 2014-04-14 12:25:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/efax-gtk (Old) and /work/SRC/openSUSE:Factory/.efax-gtk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "efax-gtk" Changes: -------- --- /work/SRC/openSUSE:Factory/efax-gtk/efax-gtk.changes 2013-06-17 10:03:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.efax-gtk.new/efax-gtk.changes 2014-04-14 12:25:58.000000000 +0200 @@ -1,0 +2,13 @@ +Sun Apr 13 19:34:44 UTC 2014 - zaitor(a)opensuse.org + +- Update to version 3.2.13: + + Fix API breakage in GTK+-3.12 (the buttons of GtkDialog objects + have been made internal instead of non-internal children of the + action area box). + + Put icon in efax and efax-gtk about dialogs (dialogs.cpp). + + Replace AC_CONFIG_HEADER macro with AC_CONFIG_HEADERS when + configuring. + + Update build system to automake-1.13.3. + + Update desktop file. + +------------------------------------------------------------------- Old: ---- efax-gtk-3.2.12.src.tgz New: ---- efax-gtk-3.2.13.src.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ efax-gtk.spec ++++++ --- /var/tmp/diff_new_pack.ipHggh/_old 2014-04-14 12:25:59.000000000 +0200 +++ /var/tmp/diff_new_pack.ipHggh/_new 2014-04-14 12:25:59.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package efax-gtk # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2011-2012 Malcolm Lewis malcolmlewis(a)opensuse.org # # All modifications and additions to the file contributed by third parties @@ -18,7 +18,7 @@ Name: efax-gtk -Version: 3.2.12 +Version: 3.2.13 Release: 0 Summary: GTK+ front end for the efax program License: GPL-2.0+ ++++++ efax-gtk-3.2.12.src.tgz -> efax-gtk-3.2.13.src.tgz ++++++ ++++ 3049 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 cacti for openSUSE:Factory
by root＠hilbert.suse.de 14 Apr '14

14 Apr '14

Hello community, here is the log from the commit of package cacti for openSUSE:Factory checked in at 2014-04-14 12:25:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cacti (Old) and /work/SRC/openSUSE:Factory/.cacti.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cacti" Changes: -------- --- /work/SRC/openSUSE:Factory/cacti/cacti.changes 2014-04-13 13:14:50.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cacti.new/cacti.changes 2014-04-14 12:25:49.000000000 +0200 @@ -1,0 +2,17 @@ +Sun Apr 13 20:21:53 UTC 2014 - aj(a)ajaissle.de + +- Add cacti-0.8.8b_security.patch: + - Fixes [bnc#870821]: + - CVE-2014-2326: Unspecified HTML Injection Vulnerability + - Fixes CVE-2014-2328: + - Unspecified Remote Command Execution Vulnerability + - Fixes [bnc#872008]: + - CVE-2014-2708: Unspecified SQL Injection Vulnerability + - CVE-2014-2709: Unspecified Remote Command Execution Vulnerability + +- Add cacti-0.8.8b_CVE-2013-5588_CVE-2013-5589.patch: + - Fixes [bnc#837440]: + - CVE-2013-5588: HTML Injection Vulnerability + - CVE-2013-5589: SQL Injection Vulnerability + +------------------------------------------------------------------- New: ---- cacti-0.8.8b_CVE-2013-5588_CVE-2013-5589.patch cacti-0.8.8b_security.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cacti.spec ++++++ --- /var/tmp/diff_new_pack.ECNrQG/_old 2014-04-14 12:25:50.000000000 +0200 +++ /var/tmp/diff_new_pack.ECNrQG/_new 2014-04-14 12:25:50.000000000 +0200 @@ -35,6 +35,10 @@ Patch0: %{name}-%{version}-cacti-log-path.patch # PATCH-FIX-OPENSUSE cacti-0.8.8-cacti-script.patch Patch1: %{name}-%{version}-cacti-script.patch +# PATCH-FIX-OPENSUSE cacti-0.8.8b_security.patch -- Fix security issues +Patch2: cacti-0.8.8b_security.patch +# PATCH-FIX-OPENSUSE cacti-0.8.8b_CVE-2013-5588_CVE-2013-5589.patch +Patch3: cacti-0.8.8b_CVE-2013-5588_CVE-2013-5589.patch Provides: cacti-system %if 0%{?suse_version} BuildRequires: apache2-devel @@ -103,6 +107,8 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 +%patch3 -p3 %build #nothing to build ++++++ cacti-0.8.8b_CVE-2013-5588_CVE-2013-5589.patch ++++++ --- cacti/branches/0.8.8/host.php 2013/08/13 19:34:11 7419 +++ cacti/branches/0.8.8/host.php 2013/08/18 03:41:24 7420 @@ -149,6 +149,9 @@ if ($_POST["snmp_version"] == 3 && ($_POST["snmp_password"] != $_POST["snmp_password_confirm"])) { raise_message(4); }else{ + input_validate_input_number(get_request_var_post("id")); + input_validate_input_number(get_request_var_post("host_template_id")); + $host_id = api_device_save($_POST["id"], $_POST["host_template_id"], $_POST["description"], trim($_POST["hostname"]), $_POST["snmp_community"], $_POST["snmp_version"], $_POST["snmp_username"], $_POST["snmp_password"], --- cacti/branches/0.8.8/install/index.php 2013/08/13 19:34:11 7419 +++ cacti/branches/0.8.8/install/index.php 2013/08/18 03:41:24 7420 @@ -310,27 +310,28 @@ } /* pre-processing that needs to be done for each step */ -if (empty($_REQUEST["step"])) { - $_REQUEST["step"] = 1; -}else{ - if ($_REQUEST["step"] == "1") { - $_REQUEST["step"] = "2"; - }elseif (($_REQUEST["step"] == "2") && ($_REQUEST["install_type"] == "1")) { - $_REQUEST["step"] = "3"; - }elseif (($_REQUEST["step"] == "2") && ($_REQUEST["install_type"] == "3")) { - $_REQUEST["step"] = "8"; - }elseif (($_REQUEST["step"] == "8") && ($old_version_index <= array_search("0.8.5a", $cacti_versions))) { - $_REQUEST["step"] = "9"; - }elseif ($_REQUEST["step"] == "8") { - $_REQUEST["step"] = "3"; - }elseif ($_REQUEST["step"] == "9") { - $_REQUEST["step"] = "3"; - }elseif ($_REQUEST["step"] == "3") { - $_REQUEST["step"] = "4"; +if (isset($_REQUEST["step"]) && $_REQUEST["step"] > 0) { + $step = intval($_REQUEST["step"]); + if ($step == "1") { + $step = "2"; + } elseif (($step == "2") && ($_REQUEST["install_type"] == "1")) { + $step = "3"; + } elseif (($step == "2") && ($_REQUEST["install_type"] == "3")) { + $step = "8"; + } elseif (($step == "8") && ($old_version_index <= array_search("0.8.5a", $cacti_versions))) { + $step = "9"; + } elseif ($step == "8") { + $step = "3"; + } elseif ($step == "9") { + $step = "3"; + } elseif ($step == "3") { + $step = "4"; } +} else { + $step = 1; } -if ($_REQUEST["step"] == "4") { +if ($step == "4") { include_once("../lib/data_query.php"); include_once("../lib/utility.php"); @@ -366,7 +367,7 @@ header ("Location: ../index.php"); exit; -}elseif (($_REQUEST["step"] == "8") && ($_REQUEST["install_type"] == "3")) { +}elseif (($step == "8") && ($_REQUEST["install_type"] == "3")) { /* if the version is not found, die */ if (!is_int($old_version_index)) { print " <p style='font-family: Verdana, Arial; font-size: 16px; font-weight: bold; color: red;'>Error</p> @@ -505,7 +506,7 @@ </tr> <tr> <td width="100%" style="font-size: 12px;"> - <?php if ($_REQUEST["step"] == "1") { ?> + <?php if ($step == "1") { ?> <p>Thanks for taking the time to download and install cacti, the complete graphing solution for your network. Before you can start making cool graphs, there are a few @@ -530,7 +531,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.</p> - <?php }elseif ($_REQUEST["step"] == "2") { ?> + <?php }elseif ($step == "2") { ?> <p>Please select the type of installation</p> @@ -551,7 +552,7 @@ print "Server Operating System Type: " . $config["cacti_server_os"] . "<br>"; ?> </p> - <?php }elseif ($_REQUEST["step"] == "3") { ?> + <?php }elseif ($step == "3") { ?> <p>Make sure all of these values are correct before continuing.</p> <?php @@ -609,7 +610,7 @@ is an upgrade. You can change any of the settings on this screen at a later time by going to "Cacti Settings" from within Cacti.</p> - <?php }elseif ($_REQUEST["step"] == "8") { ?> + <?php }elseif ($step == "8") { ?> <p>Upgrade results:</p> @@ -659,7 +660,7 @@ print $upgrade_results; ?> - <?php }elseif ($_REQUEST["step"] == "9") { ?> + <?php }elseif ($step == "9") { ?> <p style='font-size: 16px; font-weight: bold; color: red;'>Important Upgrade Notice</p> @@ -673,7 +674,7 @@ <?php }?> - <p align="right"><input type="image" src="install_<?php if ($_REQUEST["step"] == "3") {?>finish<?php }else{?>next<?php }?>.gif" alt="<?php if ($_REQUEST["step"] == "3"){?>Finish<?php }else{?>Next<?php }?>"></p> + <p align="right"><input type="image" src="install_<?php if ($step == "3") {?>finish<?php }else{?>next<?php }?>.gif" alt="<?php if ($step == "3"){?>Finish<?php }else{?>Next<?php }?>"></p> </td> </tr> </table> @@ -681,7 +682,7 @@ </tr> </table> -<input type="hidden" name="step" value="<?php print $_REQUEST["step"];?>"> +<input type="hidden" name="step" value="<?php print $step;?>"> </form> --- cacti/branches/0.8.8/lib/api_device.php 2013/08/13 19:34:11 7419 +++ cacti/branches/0.8.8/lib/api_device.php 2013/08/18 03:41:24 7420 @@ -107,7 +107,7 @@ $_host_template_id = db_fetch_cell("select host_template_id from host where id=$id"); } - $save["id"] = $id; + $save["id"] = form_input_validate($id, "id", "^[0-9]+$", false, 3); $save["host_template_id"] = form_input_validate($host_template_id, "host_template_id", "^[0-9]+$", false, 3); $save["description"] = form_input_validate($description, "description", "", false, 3); $save["hostname"] = form_input_validate(trim($hostname), "hostname", "", false, 3); ++++++ cacti-0.8.8b_security.patch ++++++ diff -ruBbd cacti-0.8.8b/cdef.php cacti-0.8.8b.patched/cdef.php --- cacti-0.8.8b/cdef.php 2013-08-06 22:31:19.000000000 -0400 +++ cacti-0.8.8b.patched/cdef.php 2014-04-04 21:39:04.000000000 -0400 @@ -431,7 +431,7 @@ <a class="linkEditMain" href="<?php print htmlspecialchars("cdef.php?action=item_edit&id=" . $cdef_item["id"] . "&cdef_id=" . $cdef["id"]);?>">Item #<?php print htmlspecialchars($i);?></a> </td> <td> - <em><?php $cdef_item_type = $cdef_item["type"]; print $cdef_item_types[$cdef_item_type];?></em>: <strong><?php print get_cdef_item_name($cdef_item["id"]);?></strong> + <em><?php $cdef_item_type = $cdef_item["type"]; print $cdef_item_types[$cdef_item_type];?></em>: <strong><?php print htmlspecialchars(get_cdef_item_name($cdef_item["id"]));?></strong> </td> <td> <a href="<?php print htmlspecialchars("cdef.php?action=item_movedown&id=" . $cdef_item["id"] . "&cdef_id=" . $cdef["id"]);?>"><img src="images/move_down.gif" border="0" alt="Move Down"></a> diff -ruBbd cacti-0.8.8b/graph_xport.php cacti-0.8.8b.patched/graph_xport.php --- cacti-0.8.8b/graph_xport.php 2013-08-06 22:31:19.000000000 -0400 +++ cacti-0.8.8b.patched/graph_xport.php 2014-04-04 21:39:04.000000000 -0400 @@ -47,43 +47,48 @@ $graph_data_array = array(); +/* ================= input validation ================= */ +input_validate_input_number(get_request_var("local_graph_id")); +input_validate_input_number(get_request_var("rra_id")); +/* ==================================================== */ + /* override: graph start time (unix time) */ -if (!empty($_GET["graph_start"]) && $_GET["graph_start"] < 1600000000) { - $graph_data_array["graph_start"] = $_GET["graph_start"]; +if (!empty($_GET["graph_start"]) && is_numeric($_GET["graph_start"] && $_GET["graph_start"] < 1600000000)) { + $graph_data_array["graph_start"] = get_request_var("graph_start"); } /* override: graph end time (unix time) */ -if (!empty($_GET["graph_end"]) && $_GET["graph_end"] < 1600000000) { - $graph_data_array["graph_end"] = $_GET["graph_end"]; +if (!empty($_GET["graph_end"]) && is_numeric($_GET["graph_end"]) && $_GET["graph_end"] < 1600000000) { + $graph_data_array["graph_end"] = get_request_var("graph_end"); } /* override: graph height (in pixels) */ -if (!empty($_GET["graph_height"]) && $_GET["graph_height"] < 3000) { - $graph_data_array["graph_height"] = $_GET["graph_height"]; +if (!empty($_GET["graph_height"]) && is_numeric($_GET["graph_height"]) && $_GET["graph_height"] < 3000) { + $graph_data_array["graph_height"] = get_request_var("graph_height"); } /* override: graph width (in pixels) */ -if (!empty($_GET["graph_width"]) && $_GET["graph_width"] < 3000) { - $graph_data_array["graph_width"] = $_GET["graph_width"]; +if (!empty($_GET["graph_width"]) && is_numeric($_GET["graph_width"]) && $_GET["graph_width"] < 3000) { + $graph_data_array["graph_width"] = get_request_var("graph_width"); } /* override: skip drawing the legend? */ if (!empty($_GET["graph_nolegend"])) { - $graph_data_array["graph_nolegend"] = $_GET["graph_nolegend"]; + $graph_data_array["graph_nolegend"] = get_request_var("graph_nolegend"); } /* print RRDTool graph source? */ if (!empty($_GET["show_source"])) { - $graph_data_array["print_source"] = $_GET["show_source"]; + $graph_data_array["print_source"] = get_request_var("show_source"); } -$graph_info = db_fetch_row("SELECT * FROM graph_templates_graph WHERE local_graph_id='" . $_REQUEST["local_graph_id"] . "'"); +$graph_info = db_fetch_row("SELECT * FROM graph_templates_graph WHERE local_graph_id='" . get_request_var("local_graph_id") . "'"); /* for bandwidth, NThPercentile */ $xport_meta = array(); /* Get graph export */ -$xport_array = @rrdtool_function_xport($_GET["local_graph_id"], $_GET["rra_id"], $graph_data_array, $xport_meta); +$xport_array = @rrdtool_function_xport($_GET["local_graph_id"], get_request_var("rra_id"), $graph_data_array, $xport_meta); /* Make graph title the suggested file name */ if (is_array($xport_array["meta"])) { diff -ruBbd cacti-0.8.8b/lib/graph_export.php cacti-0.8.8b.patched/lib/graph_export.php --- cacti-0.8.8b/lib/graph_export.php 2013-08-06 22:31:19.000000000 -0400 +++ cacti-0.8.8b.patched/lib/graph_export.php 2014-04-04 21:39:05.000000000 -0400 @@ -339,7 +339,7 @@ chdir($stExportDir); /* set the initial command structure */ - $stExecute = 'ncftpput -R -V -r 1 -u '.$aFtpExport['username'].' -p '.$aFtpExport['password']; + $stExecute = 'ncftpput -R -V -r 1 -u ' . cacti_escapeshellarg($aFtpExport['username']) . ' -p ' . cacti_escapeshellarg($aFtpExport['password']); /* if the user requested passive mode, use it */ if ($aFtpExport['passive']) { @@ -347,7 +347,7 @@ } /* setup the port, server, remote directory and all files */ - $stExecute .= ' -P ' . $aFtpExport['port'] . ' ' . $aFtpExport['server'] . ' ' . $aFtpExport['remotedir'] . "."; + $stExecute .= ' -P ' . cacti_escapeshellarg($aFtpExport['port']) . ' ' . cacti_escapeshellarg($aFtpExport['server']) . ' ' . cacti_escapeshellarg($aFtpExport['remotedir']) . "."; /* run the command */ $iExecuteReturns = 0; diff -ruBbd cacti-0.8.8b/lib/rrd.php cacti-0.8.8b.patched/lib/rrd.php --- cacti-0.8.8b/lib/rrd.php 2013-08-06 22:31:18.000000000 -0400 +++ cacti-0.8.8b.patched/lib/rrd.php 2014-04-04 21:39:04.000000000 -0400 @@ -865,13 +865,13 @@ /* basic graph options */ $graph_opts .= "--imgformat=" . $image_types{$graph["image_format_id"]} . RRD_NL . - "--start=$graph_start" . RRD_NL . - "--end=$graph_end" . RRD_NL . + "--start=" . cacti_escapeshellarg($graph_start) . RRD_NL . + "--end=" . cacti_escapeshellarg($graph_end) . RRD_NL . "--title=" . cacti_escapeshellarg($graph["title_cache"]) . RRD_NL . "$rigid" . - "--base=" . $graph["base_value"] . RRD_NL . - "--height=$graph_height" . RRD_NL . - "--width=$graph_width" . RRD_NL . + "--base=" . cacti_escapeshellarg($graph["base_value"]) . RRD_NL . + "--height=" . cacti_escapeshellarg($graph_height) . RRD_NL . + "--width=" . cacti_escapeshellarg($graph_width) . RRD_NL . "$scale" . "$unit_value" . "$unit_exponent_value" . @@ -1606,8 +1606,8 @@ /* basic export options */ $xport_opts = - "--start=$xport_start" . RRD_NL . - "--end=$xport_end" . RRD_NL . + "--start=" . cacti_escapeshellarg($xport_start) . RRD_NL . + "--end=" . cacti_escapeshellarg($xport_end) . RRD_NL . "--maxrows=10000" . RRD_NL; $xport_defs = ""; @@ -1997,7 +1997,7 @@ $stacked_columns["col" . $j] = ($graph_item_types{$xport_item["graph_type_id"]} == "STACK") ? 1 : 0; $j++; - $txt_xport_items .= "XPORT:" . $data_source_name . ":" . str_replace(":", "", cacti_escapeshellarg($legend_name)) ; + $txt_xport_items .= "XPORT:" . cacti_escapeshellarg($data_source_name) . ":" . str_replace(":", "", cacti_escapeshellarg($legend_name)) ; }else{ $need_rrd_nl = FALSE; } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit oxygen-gtk3 for openSUSE:Factory
by root＠hilbert.suse.de 14 Apr '14

14 Apr '14

Hello community, here is the log from the commit of package oxygen-gtk3 for openSUSE:Factory checked in at 2014-04-14 12:08:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/oxygen-gtk3 (Old) and /work/SRC/openSUSE:Factory/.oxygen-gtk3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "oxygen-gtk3" Changes: -------- --- /work/SRC/openSUSE:Factory/oxygen-gtk3/oxygen-gtk3.changes 2014-03-09 18:32:35.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.oxygen-gtk3.new/oxygen-gtk3.changes 2014-04-14 12:08:35.000000000 +0200 @@ -1,0 +2,19 @@ +Sun Apr 13 20:34:57 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Update to 1.3.5 + * made more widgets 'transparent' via css, to get the proper + background gradient behind + * fix crash with menubar animations when invalid menubar was passed + * fixed updates for treeviews embedded in scrolled-windows + * added (still not perfect) support for firefox compiled against gtk3 +- Drop 0001-make-sure-parent-is-registered-to-innerShadowEngine-.patch, + merged upstream + +------------------------------------------------------------------- +Tue Mar 18 17:45:10 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Added crashfix from upstream: + 0001-make-sure-parent-is-registered-to-innerShadowEngine-.patch, + kde#331879 + +------------------------------------------------------------------- Old: ---- oxygen-gtk3-1.3.4.tar.bz2 New: ---- oxygen-gtk3-1.3.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ oxygen-gtk3.spec ++++++ --- /var/tmp/diff_new_pack.HBujoB/_old 2014-04-14 12:08:35.000000000 +0200 +++ /var/tmp/diff_new_pack.HBujoB/_new 2014-04-14 12:08:35.000000000 +0200 @@ -17,7 +17,7 @@ Name: oxygen-gtk3 -Version: 1.3.4 +Version: 1.3.5 Release: 0 Summary: A Port of the default KDE Widget Theme (Oxygen), to GTK 3.x License: LGPL-2.1+ ++++++ oxygen-gtk3-1.3.4.tar.bz2 -> oxygen-gtk3-1.3.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.3.4/CMakeLists.txt new/oxygen-gtk3-1.3.5/CMakeLists.txt --- old/oxygen-gtk3-1.3.4/CMakeLists.txt 2014-03-07 16:20:03.000000000 +0100 +++ new/oxygen-gtk3-1.3.5/CMakeLists.txt 2014-04-10 08:47:47.000000000 +0200 @@ -13,7 +13,7 @@ set( CPACK_PACKAGE_VENDOR "hugo.pereira(a)free.fr" ) set( CPACK_PACKAGE_VERSION_MAJOR "1" ) set( CPACK_PACKAGE_VERSION_MINOR "3" ) -set( CPACK_PACKAGE_VERSION_PATCH "4" ) +set( CPACK_PACKAGE_VERSION_PATCH "5" ) set( CPACK_SOURCE_IGNORE_FILES "build" "^${PROJECT_SOURCE_DIR}.*/.git/" ) ################################## diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.3.4/src/oxygenthemingengine.cpp new/oxygen-gtk3-1.3.5/src/oxygenthemingengine.cpp --- old/oxygen-gtk3-1.3.4/src/oxygenthemingengine.cpp 2014-03-07 16:20:03.000000000 +0100 +++ new/oxygen-gtk3-1.3.5/src/oxygenthemingengine.cpp 2014-04-10 08:47:33.000000000 +0200 @@ -251,7 +251,8 @@ gtk_widget_path_is_type( path, GTK_TYPE_LIST_BOX ) || gtk_widget_path_is_type( path, GTK_TYPE_VIEWPORT ) || gtk_widget_path_is_type( path, GTK_TYPE_EVENT_BOX ) || - gtk_widget_path_is_type( path, GTK_TYPE_PANED ) + gtk_widget_path_is_type( path, GTK_TYPE_PANED ) || + Gtk::g_object_is_a( G_OBJECT( widget ), "GdlDockItemGrip" ) ) ) { @@ -703,7 +704,10 @@ } // make sure child is registered - if( borderStyle == GTK_BORDER_STYLE_INSET && gtk_scrolled_window_get_shadow_type( GTK_SCROLLED_WINDOW( widget ) ) == GTK_SHADOW_IN ) + if( + borderStyle == GTK_BORDER_STYLE_INSET && + gtk_scrolled_window_get_shadow_type( GTK_SCROLLED_WINDOW( widget ) ) == GTK_SHADOW_IN && + Style::instance().animations().innerShadowEngine().contains( widget ) ) { Style::instance().animations().innerShadowEngine().registerChild( widget, gtk_bin_get_child( GTK_BIN( widget ) ) ); } } else if( @@ -1432,7 +1436,8 @@ if( gtk_scrolled_window_get_shadow_type( scrolledWindow ) != GTK_SHADOW_IN ) { gtk_scrolled_window_set_shadow_type( scrolledWindow, GTK_SHADOW_IN ); - Style::instance().animations().innerShadowEngine().registerChild( child, gtk_bin_get_child( GTK_BIN( child ) ) ); + if( Style::instance().animations().innerShadowEngine().contains( child ) ) + { Style::instance().animations().innerShadowEngine().registerChild( child, gtk_bin_get_child( GTK_BIN( child ) ) ); } } return; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit oxygen-gtk2 for openSUSE:Factory
by root＠hilbert.suse.de 14 Apr '14

14 Apr '14

Hello community, here is the log from the commit of package oxygen-gtk2 for openSUSE:Factory checked in at 2014-04-14 12:05:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/oxygen-gtk2 (Old) and /work/SRC/openSUSE:Factory/.oxygen-gtk2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "oxygen-gtk2" Changes: -------- --- /work/SRC/openSUSE:Factory/oxygen-gtk2/oxygen-gtk2.changes 2014-03-28 16:27:17.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.oxygen-gtk2.new/oxygen-gtk2.changes 2014-04-14 12:05:07.000000000 +0200 @@ -1,0 +2,11 @@ +Sun Apr 13 20:30:25 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Update to version 1.4.5 + * background and shadows in libreoffice + * improved detection of empty areas for window dragging + * fix bluring behind tooltips in KDE on 64 bits machines + * fix calculation of the tabs area +- Droped 0001-make-sure-parent-is-registered-to-innerShadowEngine-.patch, + merged upstream + +------------------------------------------------------------------- Old: ---- 0001-make-sure-parent-is-registered-to-innerShadowEngine-.patch oxygen-gtk2-1.4.4.tar.bz2 New: ---- oxygen-gtk2-1.4.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ oxygen-gtk2.spec ++++++ --- /var/tmp/diff_new_pack.NGoJgr/_old 2014-04-14 12:05:08.000000000 +0200 +++ /var/tmp/diff_new_pack.NGoJgr/_new 2014-04-14 12:05:08.000000000 +0200 @@ -17,7 +17,7 @@ Name: oxygen-gtk2 -Version: 1.4.4 +Version: 1.4.5 Release: 0 Summary: A Port of the default KDE Widget Theme (Oxygen), to GTK 2.x License: LGPL-2.1+ @@ -25,8 +25,6 @@ Url: https://projects.kde.org/projects/playground/artwork/oxygen-gtk/ Source0: http://download.kde.org/stable/%{name}/%{version}/src/%{name}-%{version}.ta… Source100: baselibs.conf -# PATCH-FIX-UPSTREAM 0001-make-sure-parent-is-registered-to-innerShadowEngine-.patch -- kde#331879 -Patch0: 0001-make-sure-parent-is-registered-to-innerShadowEngine-.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: pkgconfig(cairo) @@ -93,7 +91,6 @@ %prep %setup -q -%patch0 -p1 %build mkdir -p build ++++++ oxygen-gtk2-1.4.4.tar.bz2 -> oxygen-gtk2-1.4.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.4.4/CMakeLists.txt new/oxygen-gtk2-1.4.5/CMakeLists.txt --- old/oxygen-gtk2-1.4.4/CMakeLists.txt 2014-03-07 16:26:45.000000000 +0100 +++ new/oxygen-gtk2-1.4.5/CMakeLists.txt 2014-04-10 08:41:36.000000000 +0200 @@ -13,7 +13,7 @@ set( CPACK_PACKAGE_VENDOR "hugo.pereira(a)free.fr" ) set( CPACK_PACKAGE_VERSION_MAJOR "1" ) set( CPACK_PACKAGE_VERSION_MINOR "4" ) -set( CPACK_PACKAGE_VERSION_PATCH "4" ) +set( CPACK_PACKAGE_VERSION_PATCH "5" ) set( CPACK_SOURCE_IGNORE_FILES "build" "^${PROJECT_SOURCE_DIR}.*/.git/" ) ################################## diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.4.4/src/oxygenstylewrapper.cpp new/oxygen-gtk2-1.4.5/src/oxygenstylewrapper.cpp --- old/oxygen-gtk2-1.4.4/src/oxygenstylewrapper.cpp 2014-03-07 16:26:39.000000000 +0100 +++ new/oxygen-gtk2-1.4.5/src/oxygenstylewrapper.cpp 2014-04-10 08:40:28.000000000 +0200 @@ -1669,7 +1669,10 @@ } // register to inner shadow engine - if( shadow == GTK_SHADOW_IN && gtk_scrolled_window_get_shadow_type( GTK_SCROLLED_WINDOW( widget ) ) == GTK_SHADOW_IN ) + if( + shadow == GTK_SHADOW_IN && + gtk_scrolled_window_get_shadow_type( GTK_SCROLLED_WINDOW( widget ) ) == GTK_SHADOW_IN && + Style::instance().animations().innerShadowEngine().contains( widget ) ) { Style::instance().animations().innerShadowEngine().registerChild( widget, gtk_bin_get_child( GTK_BIN( widget ) ) ); } } else if( @@ -2074,7 +2077,8 @@ if( gtk_scrolled_window_get_shadow_type( scrolledWindow ) != GTK_SHADOW_IN ) { gtk_scrolled_window_set_shadow_type( scrolledWindow, GTK_SHADOW_IN ); - Style::instance().animations().innerShadowEngine().registerChild( child, gtk_bin_get_child( GTK_BIN( child ) ) ); + if( Style::instance().animations().innerShadowEngine().contains( child ) ) + { Style::instance().animations().innerShadowEngine().registerChild( child, gtk_bin_get_child( GTK_BIN( child ) ) ); } } return; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit homerun for openSUSE:Factory
by root＠hilbert.suse.de 14 Apr '14

14 Apr '14

Hello community, here is the log from the commit of package homerun for openSUSE:Factory checked in at 2014-04-14 12:04:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/homerun (Old) and /work/SRC/openSUSE:Factory/.homerun.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "homerun" Changes: -------- --- /work/SRC/openSUSE:Factory/homerun/homerun.changes 2014-03-12 14:46:06.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.homerun.new/homerun.changes 2014-04-14 12:04:24.000000000 +0200 @@ -1,0 +2,25 @@ +Sun Apr 13 20:21:21 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Update to 1.2.3 + + This release enables compatibility with the revamped desktop + search stack in KDE SC 4.13. It is required for desktop search + to work when Homerun is used in KDE SC 4.13, both in the + fullscreen version of Homerun (where desktop search is exposed + via the "KRunner" and "Runner: Desktop Search" sources) and in + Homerun Kicker. Existing user configurations continue to work + seamlessly, and versions older than 4.13 remain supported as well. +- Changes since 1.2.2 + + Fixed a bug causing icon setting changes from the configuration + dialog of the Homerun Launcher applet to fail. +- Changes since 1.2.1 + + Fixed a bug causing duplicates to appear in the "All Applications" + section of the "All Installed Applications with Filters" source. + + Fixed a bug causing the "All Applications" section to disappear + from the sidebar entries of "All Installed Applications with + Filters" sources when the system applications database changes + at runtime. + + Fixed a bug causing sections of icons to overlap on tabs. + + Revamped config handling for the "Homerun Launcher" widget to + allow vendors to use Plasma Desktop Scripting for its configuration. + +------------------------------------------------------------------- Old: ---- homerun-1.2.0.tar.xz New: ---- homerun-1.2.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ homerun.spec ++++++ --- /var/tmp/diff_new_pack.TjziM2/_old 2014-04-14 12:04:24.000000000 +0200 +++ /var/tmp/diff_new_pack.TjziM2/_new 2014-04-14 12:04:24.000000000 +0200 @@ -21,10 +21,10 @@ Summary: Fullscreen Launcher for KDE License: (GPL-2.0 or GPL-3.0) and (LGPL-2.1 or LGPL-3.0) Group: System/GUI/KDE -Version: 1.2.0 +Version: 1.2.3 Release: 0 %define sonum 0 -Source0: http://download.kde.org/stable/homerun/src/%{name}-%{version}.tar.xz +Source0: http://download.kde.org/stable/%{name}/src/%{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://userbase.kde.org/Homerun BuildRequires: kdebase4-workspace-devel >= 4.10.0 ++++++ homerun-1.2.0.tar.xz -> homerun-1.2.3.tar.xz ++++++ ++++ 9191 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 rubygem-ohai for openSUSE:Factory
by root＠hilbert.suse.de 14 Apr '14

14 Apr '14

Hello community, here is the log from the commit of package rubygem-ohai for openSUSE:Factory checked in at 2014-04-14 10:56:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-ohai (Old) and /work/SRC/openSUSE:Factory/.rubygem-ohai.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-ohai" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-ohai/rubygem-ohai.changes 2013-11-07 08:48:41.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rubygem-ohai.new/rubygem-ohai.changes 2014-04-14 10:56:44.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Apr 13 15:25:48 UTC 2014 - e.istomin(a)edss.ee + +- updated to version 7.0.2 + +------------------------------------------------------------------- Old: ---- ohai-6.20.0.gem New: ---- ohai-7.0.2.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-ohai.spec ++++++ --- /var/tmp/diff_new_pack.ktuoms/_old 2014-04-14 10:56:44.000000000 +0200 +++ /var/tmp/diff_new_pack.ktuoms/_new 2014-04-14 10:56:44.000000000 +0200 @@ -17,7 +17,7 @@ Name: rubygem-ohai -Version: 6.20.0 +Version: 7.0.2 Release: 0 %define mod_name ohai %define mod_full_name %{mod_name}-%{version} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rubygem-mixlib-shellout for openSUSE:Factory
by root＠hilbert.suse.de 14 Apr '14

14 Apr '14

Hello community, here is the log from the commit of package rubygem-mixlib-shellout for openSUSE:Factory checked in at 2014-04-14 10:56:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-mixlib-shellout (Old) and /work/SRC/openSUSE:Factory/.rubygem-mixlib-shellout.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-mixlib-shellout" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-mixlib-shellout/rubygem-mixlib-shellout.changes 2013-12-06 09:48:19.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rubygem-mixlib-shellout.new/rubygem-mixlib-shellout.changes 2014-04-14 10:56:31.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Apr 13 15:25:32 UTC 2014 - e.istomin(a)edss.ee + +- updated to version 1.4.0, no changelog + +------------------------------------------------------------------- Old: ---- mixlib-shellout-1.3.0.gem New: ---- mixlib-shellout-1.4.0.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-mixlib-shellout.spec ++++++ --- /var/tmp/diff_new_pack.GzCUnG/_old 2014-04-14 10:56:32.000000000 +0200 +++ /var/tmp/diff_new_pack.GzCUnG/_new 2014-04-14 10:56:32.000000000 +0200 @@ -17,7 +17,7 @@ Name: rubygem-mixlib-shellout -Version: 1.3.0 +Version: 1.4.0 Release: 0 %define mod_name mixlib-shellout %define mod_full_name %{mod_name}-%{version} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-neutronclient for openSUSE:Factory
by root＠hilbert.suse.de 14 Apr '14

14 Apr '14

Hello community, here is the log from the commit of package python-neutronclient for openSUSE:Factory checked in at 2014-04-14 10:56:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-neutronclient (Old) and /work/SRC/openSUSE:Factory/.python-neutronclient.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-neutronclient" Changes: -------- --- /work/SRC/openSUSE:Factory/python-neutronclient/python-neutronclient.changes 2014-03-28 13:17:54.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-neutronclient.new/python-neutronclient.changes 2014-04-14 10:56:25.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Apr 9 13:40:18 UTC 2014 - dmueller(a)suse.com + +- fix requires + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-neutronclient.spec ++++++ --- /var/tmp/diff_new_pack.3d99Cj/_old 2014-04-14 10:56:26.000000000 +0200 +++ /var/tmp/diff_new_pack.3d99Cj/_new 2014-04-14 10:56:26.000000000 +0200 @@ -48,10 +48,10 @@ Requires: python-argparse Requires: python-cliff >= 1.4.3 Requires: python-httplib2 >= 0.7.5 -Requires: python-iso8601 >= 0.1.9 -Requires: python-pbr >= 0.6 +Requires: python-iso8601 >= 0.1.4 +Requires: python-pbr >= 0.5.21 Requires: python-simplejson >= 2.0.9 -Requires: python-six >= 1.5.2 +Requires: python-six >= 1.4.1 Provides: python-quantumclient = 2.2.3.1 Obsoletes: python-quantumclient < 2.2.3.1 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -78,8 +78,8 @@ Requires: python-fixtures >= 0.3.14 Requires: python-mox >= 0.5.3 Requires: python-python-subunit >= 0.0.18 -Requires: python-testrepository >= 0.0.18 -Requires: python-testtools >= 0.9.34 +Requires: python-testrepository >= 0.0.17 +Requires: python-testtools >= 0.9.32 %description test This package contains testsuite files for %{name}. -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit openstack-nova for openSUSE:Factory
by root＠hilbert.suse.de 14 Apr '14

14 Apr '14

Hello community, here is the log from the commit of package openstack-nova for openSUSE:Factory checked in at 2014-04-14 10:56:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openstack-nova (Old) and /work/SRC/openSUSE:Factory/.openstack-nova.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openstack-nova" Changes: -------- --- /work/SRC/openSUSE:Factory/openstack-nova/openstack-nova-doc.changes 2013-10-18 19:23:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.openstack-nova.new/openstack-nova-doc.changes 2014-04-14 10:56:21.000000000 +0200 @@ -2 +2 @@ -Thu Oct 17 14:52:27 UTC 2013 - speilicke(a)suse.com +Fri Mar 7 08:55:19 UTC 2014 - speilicke(a)suse.com @@ -4 +4,391 @@ -- Don't require python-Cheeta, upstream moved to Jinja2 +- Update to version nova-2014.1.dev61.gc08cc38: + * Store neutron port status in VIF model + * Correct network_model tests and __eq__ operator + * Make network_cache more robust with neutron + * Fix BDM legacy usage with objects + * Fix anti-affinity race condition on boot + * Initial scheduler support for instance_groups + * Add get_hosts to InstanceGroup object + * Add instance to instance group in compute.api + * Add add_members to InstanceGroup object + * Remove run-time dependency on fixtures module by the nova baremetal + * Make compute manager prune instance events on delete and migrate + * Make compute manager's virtapi support waiting for events + * Add os-server-external-events V3 API + * Add os-server-external-events API + * Add external_instance_event() method to compute manager + * Move _poll_volume_usage periodic task to BDM objects + * Move instance_resize code paths to BDM objects + * Make swap_volume code path use BDM objects + * Move detach_volume and remove_vol_connection to BDM objects + * Move instance delete to new-world BDM objects + * Fix development environment docs for redhat-based systems + * VMware: create datastore utility functions + * Address the comments of the merged image handler patch + 2014.1.b3 + * VMware: refactor _get_volume_uuid + * notifier middleware broken by oslo.messaging + * Prevent thrashing when deploying many bm instances + +------------------------------------------------------------------- +Thu Mar 6 01:04:57 UTC 2014 - cloud-devel(a)suse.de + +- Update to version nova-2014.1.dev1058.g107acb3: + * Ignore the image name when booting from volume + * Fixing host_ip configuration help message + * No longer call check_uptodate.sh in pep8 + * Adding image multiple location support + * Add a missing space in a log message + * Sync the latest DB code from oslo-incubator + * VMware Driver update correct disk usage stat + * Move vbd plug/unplug into session object + * Move the metrics update to get_metrics + * Fix incorrect kwargs 'reason' for HTTPBadRequest + * changed quantum to neutron in vif-openstack + +------------------------------------------------------------------- +Wed Mar 5 08:47:11 UTC 2014 - cloud-devel(a)suse.de + +- Update to version nova-2014.1.dev1036.gf11071b: + * regenerate the config file to support 1.3.0a9 + * Move all shelve code paths to BDM objects + * Move rebuild to BDM objects + * sync sslutils to not conflict with oslo.messaging + * Refactor xenapi/host.py to new call_xenapi pattern + * Updated from global requirements + * Restore get_available_resource method in docker driver + * Move xenapi/agent.py to new call_xenapi style + * xenapi: changes the debug log formatting + * xenapi: stop destroy_vdi errors masking real error + * Sync latest config file generator from oslo-incubator + * VMware: support instance objects + * VMware: add instance detail to detach log message + * Fixes the Hyper-V VolumeOpsTestCase base class + +------------------------------------------------------------------- +Tue Mar 4 01:21:00 UTC 2014 - cloud-devel(a)suse.de + +- Update to version nova-2014.1.dev1012.gfb6ac06: + * Support configuring libvirt watchdog from flavors + * Add watchdog device support to libvirt driver + * Sync latest Guru Meditation Reports from Oslo + * Adds get_console_connect_info API + * When a claim is rejected, explain why + * Refactor pool.py to remove calls to call_xenapi + * xenapi: make session calls more discoverable + * Remove and recreate interface if already exists + * Prevent caller from specifying id during Aggregate.create() + * Removing redundant validation for rebuild request + * Ensure parent dir exists while injecting files + * Fix upper bound checking for flavor create parameters + * Explicity teardown on error in libguestfs setup() + * Fix run_tests.sh lockutils when run with -d + +------------------------------------------------------------------- +Mon Mar 3 11:22:02 UTC 2014 - cloud-devel(a)suse.de + +- Update to version nova-2014.1.dev984.g80e8555: + * Fixes api samples for V2 os-assisted-volume-snapshots + * Remove log_handler module from oslo-incubator sync + * Remove deleted module flakes from openstack-common.conf + * xenapi plugins: Make sure subprocesses finish executing + * Downgrade the log level for floating IP associate + * Adds create backup server extension for the V3 API + * Add boolean convertor to "create multiple servers" API + * Add comment/doc about utils.mkfs in rootwrap + * Add mkfs to the baremetal-deploy-helper rootwrap + * Add super call to db Base class + +------------------------------------------------------------------- +Sun Mar 2 00:36:35 UTC 2014 - cloud-devel(a)suse.de + +- Update to version nova-2014.1.dev964.ge19b294: + * Make compute manager use InstanceInfoCache object for deletes + * Deprecate conductor instance_type_get() and remove from VirtAPI + * Make restore_instance pass the Instance object to compute manager + * Use uuid instead of name for lvm backend + * Update Oslo wiki link in README + * Make error notifications more consistent + * Adds unit test for etc/nova/policy.json data + * Make resource_tracker use Flavor object + * Make compute manager use Flavor object + * Make baremetal driver use Flavor object instead of VirtAPI + * Add support for tenant_id based authentication with Neutron + * Enable flake8 H404 checking + * Imported Translations from Transifex + * Use oslo-common's logging fixture + * Re-Sync oslo-incubator fixtures + * Updated from global requirements + * Update pre_live_migration to take instance object + * Remove unused method inject_file() + * Remove db query from deallocate_fixed_ip + * update deallocate_for_instance to take instance obj + * Update server_diagnostics to use instance object + * Remove trailing comma from sample JSON + * Add pack_action_start/finish helper to InstanceAction object + * libvirt: remove explicit /dev/random rng default + * libvirt: setting a correct driver name for iscsi volumes + * Catch HostBinaryNotFound exception when updating a service + * VMware: fix datastore selection when token is returned + * Introduce Guru Meditation Reports into Nova + * Use image from the api in run_instance, if present + * Cleanup v3 test_versions + +------------------------------------------------------------------- +Thu Feb 27 00:42:37 UTC 2014 - cloud-devel(a)suse.de + +- Update to version nova-2014.1.dev885.gd3368a9: + * Add a caching scheduler driver + * libvirt: image property variable already defined + * Remove blank space after print + * libvirt: Enable custom video RAM setting + * Rewrite InstanceActionEvent object testcase using mock + * Clean up _make_*_list in object models to use base.obj_make_list + * Document virt driver methods that take Instance objects + * Make interface attach and detach use objects + * Pass instance object to soft_delete() and get_info() + * libvirt: host specific virtio-rng backend + * VMware: remove unused parameter from _wait_for_task + * Hyper-V log cleanups + * Update ubuntu dev env instructions + * Make webob.exc.HTTPForbidden return correct message + * Remove unused variables in the xenapi.vmops module + * Fix import order in log_handler + * Emit message which merged user-supplied argument in log_handler + * Typo in the name 'libvirt_snapshot_compression' + * Fix InstanceNotFound error in _delete_instance_files + * Remove unused methods + * DB: logging exceptions should use save_and_reraise + * Replace detail for explanation msgs on webob exceptions + * Clean IMAGE_SNAPSHOT_PENDING state on compute manager start up + * V2 Pause: treat case when driver does not implement the operation + * Add missing translation support + * Catch NotImplementedError in get_spice_console in v2/v3 API + * Minor changes to make certificates test cases use HTTPRequestV3 + +------------------------------------------------------------------- +Wed Feb 26 00:52:03 UTC 2014 - cloud-devel(a)suse.de + +- Update to version nova-2014.1.dev831.gc3c21bd: + * VMware: add a test for driver capabilities + * VMware: ensure that datastore name exists prior to deleting disk + * Move compute's _get_instance_volume_block_device_info to BDM objects + * Use disk_bus and device_type in attaching volumes + * Add device bus and type to virt attach_volume call + * Make volume attach use objects + * compute: invalid gettext message format + * VMware: fix the VNC port allocation + * vmware: driver races to create instance images + * Revert "VMware: fix race for datastore directory existence" + * Use instance object for delete + * libvirt: adding a random number generator device to instances + * Serialize the notification payload in json + * Disable IGMP snooping on hybrid Linux bridge + * VMware: improve unit test time + * Objectify instance_action for cell scheduler + * VMware: fix missing datastore regex with ESX driver + * Make exception message more friendly + * Fix unhandled InvalidServerState exceptions in server start/stop + * Make nova/quota use keypair objects + +------------------------------------------------------------------- +Tue Feb 25 01:23:31 UTC 2014 - cloud-devel(a)suse.de + ++++ 198 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/openstack-nova/openstack-nova-doc.changes ++++ and /work/SRC/openSUSE:Factory/.openstack-nova.new/openstack-nova-doc.changes --- /work/SRC/openSUSE:Factory/openstack-nova/openstack-nova.changes 2014-02-11 10:41:43.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.openstack-nova.new/openstack-nova.changes 2014-04-14 10:56:21.000000000 +0200 @@ -2 +2 @@ -Mon Feb 03 01:17:12 UTC 2014 - cloud-devel(a)suse.de +Tue Apr 8 11:57:48 UTC 2014 - dmueller(a)suse.com @@ -4,3 +4 @@ -- Rebased patches: - + nova-vmware-hypervisor-version.patch (only offset) - + neutron-performance.patch (only offset) +- add 0001-Start-ping-listener-also-for-postgresql.patch (bnc#872361) @@ -9 +7 @@ -Mon Feb 3 01:17:08 UTC 2014 - opensuse-cloud(a)opensuse.org +Thu Apr 3 17:30:24 UTC 2014 - dmueller(a)suse.com @@ -11,3 +9 @@ -- Update to version 2013.2.2.dev46.g2c44ed7+git.1391390228.2c44ed7: - + Fix interface-attach removes existing interfaces from db - + VMware: fix bug when more than one datacenter exists +- add 0001-libvirt-Make-nwfilter-driver-use-right-filterref.patch @@ -16 +12,223 @@ -Sun Feb 2 01:18:34 UTC 2014 - opensuse-cloud(a)opensuse.org +Tue Apr 1 09:09:37 UTC 2014 - speilicke(a)suse.com + +- Add 0001-Drop-nova-rpc-zmq-receiver-man-page.patch: Does what it's + named after + +------------------------------------------------------------------- +Tue Apr 1 08:00:17 UTC 2014 - speilicke(a)suse.com + +- Update to version 2014.1.rc1: + * Fix getting instance events on subsequent attempts + * Make conductor expect ActionEventNotFound for action methods + * Remove zmq-receiver from setup.cfg + * Add a note about deprecated group filters + * Fix the section name in CONTRIBUTING.rst + * Add new style instance group scheduler filters + * Automatically create groups that do not exist + * Add InstanceGroup.get_by_name() + * Add nova.conf.sample to gitignore + * Use binding:vif_details to control firewall + * Disable volume attach/detach for suspended instances + * Updated from global requirements + * Persist image format to a file, to prevent attacks based on changing it + * Imported Translations from Transifex + * postgres incompatibility in InstanceGroup.get_hosts() + * Add missing test for None in sqlalchemy query filter + * Use correct project/user id in conductor.manager + * fix the extension of README in etc/nova + * Tell pip to install packages it sees globally + * Change exception type from HTTPBadRequest to HTTPForbidden + * Don't attempt to fill faults for instance_list if FlavorNotFound + * Fix availability-zone option miss when creates an instance + * Updated Setting up Developer Environment for Ubuntu + * Change libvirt close callback to use green thread + * Re-work how debugger CLI opts are registered + * Imported Translations from Transifex + * VMware: fix booting from volume + * Do not add current tenant to private flavor access + * Disable oslo.messaging debug logs + * Update vm_mode when rebuilding instance with new image + * VMware: fix list_instances for multi-node driver + * VMware: Add utility method to retrieve remote objects + * Refactors unit tests of image service detail() + * Refactors nova.image.glance unit tests for show() + * Revert deprecation warning on Neutron auth + * V2 API: remove unused imports + * Rename _post_live_migration instance_ref arg + * Add a decorator decorator that checks func args + * Updated from global requirements + * Instance groups: cleanup + * Fix inconsistent quota usage for security group + * Fix service API and cells + * Remove unnecessary stubbing in test_services + * VMware: fix exception when no objects are returned + * Don't allow empty or 0 volume size for images + * Wait till message handling is done on service stop + * Fix the rpc module import in the service module + * Revert "VMware Driver update correct disk usage stat" + * Catch HostBinaryNotFound exception in V2 API + * Raise error on nova-api if missing subnets/fixed_ips on networks/port + * Fix the explanations of HTTPNotFound for new APIs + * Remove the nova.config.sample file + * Refuse to block migrate instances with config drive + * Catch NotImplementedError on Network Associate + * VMware: add a file to help config the firewall for vnc + * Change initial delay for servicegroup api reporting + * Fix KeyError if neutron security group is not TCP/UDP/ICMP and no ports + * Prevent rescheduling on block device failure + * Check if nfs/glusterfs export is already mounted + * Make compute API resize methods use Quotas objects + * Remove commented out code in test_cinder_cloud + * Update quantum to neutron in comment + * Add deleted_at attribute in glance stub on delete() + * Add API sample files of "unshelve a server" API + * Remove unused method from fake_network.py + * Don't refresh network cache for instances building or deleting + * GlanceImageService static methods to module scope + * Remove XenAPI driver deprecation warning log message + * VMware: bug fix for host operations when using VMwareVCDriver + * xenapi: boot from volume without image_ref + * Use HTTPRequestV3 instead of HTTPRequest in v3 API tests + * Cells: Send instance object for instance_delete_everywhere + * Fix "computeFault" when v3 API "GET /versions/:(id)" is called + * VMware: ensure that the task completed for resize operation + * Cells API calls return 501 when cells disabled + * Add version 2.0 of conductor rpc interface + * Added missing raise statement when checking the config driver format + * Make NovaObject report changed-ness of its children + * Increase volume creation max waiting time + * VMware: fix rescue disk location when image is not linked clone + * Fix comment for block_migration in nova/virt/libvirt/driver.py + * Don't import library guestfs directly + * Correct inheritance of nova.volume.cinder.API + * VMware: enable booting an ISO with root disk size 0 + * Remove bad log message in get_remote_image_service + * Raise NotImplementedError in NeutronV2 API + * Remove block_device_mapping_destroy() from conductor API + * Make sure instance saves network_info when we go ACTIVE + * Fix sqlalchemy utils test cases for SA 0.9.x + * Fix equal_any() DB API helper + * Remove migration_update() from conductor API + * Remove instance_get() from conductor API + * Remove aggregate_get_by_host() from conductor API + * add support for host driver cleanup during shutdown + * Add security_group_rule to objects registry + * Remove aggregate_get() from conductor API + * Delete meaningless lines in test_server_metadata.py + * Imported Translations from Transifex + * Move log statement to expose actually info_cache value + * Fix input validation for V2 API server group API extension + * Adds test for rebuild in compute api + * Specify spacing on periodic_tasks in manager.py + * network_info cache should be cleared before being rescheduled + * Don't sync [system_]metadata down to cells on instance.save() + * Fixes the Hyper-V agent individual disk metrics + * Fix docstring for shelve_offload_instance in compute manager + * Block database access in nova-network binary + * Make nova-network use conductor for security groups refresh + * Make nova-network use quotas object + * Reverts change to default state_path + * Fix raise_http_conflict_for_instance_invalid_state docstring + * Cells: Pass instance objects to update/delete_instance_metadata + * Don't detach root device volume + * Revert "Adding image multiple location support" + * Revert "Move libvirt RBD utilities to a new file" + * Revert "enable cloning for rbd-backed ephemeral disks" + * Add helper method for injecting data in an image + * Add helper method for checking if VM is booting from a volume + * Libvirt: Repair metadata injection into guests + * Make linux_net use objects for last fixed ip query + * Add get_by_network() to FixedIPList + * Update aggregate should not allow duplicated names + * Recover from REBOOT-* state on compute manager start-up + * VMware: raise an exception for unsupported disk formats + * VMware: ensure that deprecation does not appear for VC driver + * rename ExtensionsResource to ExtensionsController + * Ensure is_image_available handles V2 Glance API + * libvirt: fix blockinfo get_device_name helper + * Log Content-Type/Accept API request info + * Remove the docker driver + * xenapi: Speed up tests by not waiting on conductor + * Updated from global requirements + * xenapi: Fix test_rescue test to ensure assertions are valid + * VMware: image cache aging + * Add py27local tox target + * Fix broken API os-migrations + * Catch FloatingIpNotFoundForHost exception + * Fix get_download_hander() typo + * Handle IpAddressGenerationClient neutron + * Delete ERROR+DELETING VMs during compute startup + * VMware: delete vm snapshot after nova snapshot + * Fix difference between mysql & psql of flavor-show + * Add version 3.0 of scheduler rpc interface + * Make libvirt wait for neutron to confirm plugging before boot + * Task cleanup_running_deleted_instances can now use slave + * Do not add HPET timer config to non x86 targets + * Instance groups: only display valid instances for policy members + * Don't allow reboot when instance in rebooting_hard + * Fix typo and add test for refresh_instance_security_rules + * Add declaration of 'refresh_instance_security_rules' to virt driver + * Remove mention of removed dhcp_options_enabled + * Fix compute_node stats + * Fix: Unshelving an instance uses original image + * Noted that tox is the preferred unit tester + * Use instance object instead of _instance_update() + * Remove compute virtapi BDM methods + * enable cloning for rbd-backed ephemeral disks + * Move libvirt RBD utilities to a new file + * Fixup debug log statements in the nova compute manager + * Use debug level logging during unit tests + * Fix debug message formatting in server_external_events + * VMware: VimException __str__ attempts to concatenate string to list + * Mark ESX driver as deprecated + * Volume operations should be blocked for non-null task state + * xenapi: fix spawn servers with ephemeral disks + * Fixes NoneType vcpu list returned by Libvirt driver + * Add conversion type to LOG.exception's string + * Remove compute API get_instance_bdms method + * Move run_instance compute to BDM objects + * Move live migration callbacks to BDM objects + * Instance groups: validate policy configuration ++++ 2095 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/openstack-nova/openstack-nova.changes ++++ and /work/SRC/openSUSE:Factory/.openstack-nova.new/openstack-nova.changes Old: ---- 0001-Claim-IPv6-is-unsupported-if-no-interface-with-IPv6-.patch 0001-Fix-for-qemu-nbd-hang.patch 0001-Further-harden-boto-version-checking-in-EC2-tests.patch neutron-performance.patch nova-stable-havana.tar.gz nova-vmware-hypervisor-version.patch suse-cleanup-api-paste.diff New: ---- 0001-Drop-nova-rpc-zmq-receiver-man-page.patch 0001-Start-ping-listener-also-for-postgresql.patch 0001-libvirt-Make-nwfilter-driver-use-right-filterref.patch nova-2014.1.rc1.tar.gz nova.conf.sample ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openstack-nova-doc.spec ++++++ --- /var/tmp/diff_new_pack.82xNKL/_old 2014-04-14 10:56:22.000000000 +0200 +++ /var/tmp/diff_new_pack.82xNKL/_new 2014-04-14 10:56:22.000000000 +0200 @@ -17,25 +17,24 @@ %define component nova -%define majorversion 2012.2.3 Name: openstack-%{component}-doc -Version: 2013.2.2.dev46.g2c44ed7+git.1391390228.2c44ed7 +Version: 2014.1.rc1 Release: 0 Summary: OpenStack Compute (Nova) - Documentation License: Apache-2.0 Group: Documentation/HTML Url: http://openstack.org/projects/compute/ -Source: nova-stable-havana.tar.gz +Source: http://tarballs.openstack.org/nova/nova-%{version}.tar.gz BuildRequires: graphviz BuildRequires: openstack-suse-macros +BuildRequires: python-Babel +BuildRequires: python-Cheetah BuildRequires: python-PasteDeploy BuildRequires: python-Sphinx BuildRequires: python-WebOb BuildRequires: python-base BuildRequires: python-boto -BuildRequires: python-d2to1 -BuildRequires: python-distribute BuildRequires: python-eventlet BuildRequires: python-feedparser BuildRequires: python-iso8601 @@ -43,11 +42,12 @@ BuildRequires: python-lxml BuildRequires: python-mox BuildRequires: python-netaddr -BuildRequires: python-oslo.sphinx +BuildRequires: python-oslosphinx BuildRequires: python-paste BuildRequires: python-pbr BuildRequires: python-pyOpenSSL BuildRequires: python-routes +BuildRequires: python-six BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -60,7 +60,7 @@ This package contains documentation files for openstack-nova. %prep -%setup -q -n nova-2013.2.2.dev46.g2c44ed7 +%setup -q -n %{component}-%{version} %openstack_cleanup_prep %build ++++++ openstack-nova.spec ++++++ --- /var/tmp/diff_new_pack.82xNKL/_old 2014-04-14 10:56:22.000000000 +0200 +++ /var/tmp/diff_new_pack.82xNKL/_new 2014-04-14 10:56:22.000000000 +0200 @@ -18,19 +18,21 @@ %define component nova -%define groupname openstack-%{component} -%define username openstack-%{component} +%define groupname %{component} +%define username %{component} Name: openstack-%{component} -Version: 2013.2.2.dev46.g2c44ed7+git.1391390228.2c44ed7 +Version: 2014.1.rc1 Release: 0 Summary: OpenStack Compute (Nova) License: Apache-2.0 Group: System/Management Url: https://launchpad.net/nova -Source: nova-stable-havana.tar.gz +Source: http://tarballs.openstack.org/nova/nova-%{version}.tar.gz Source1: %{name}.init Source2: %{name}.logrotate +# NOTE(saschpe): Instead of 'tox -e genconfig'. Should stay stable during Icehouse cycle: +Source3: nova.conf.sample Source4: openstack-nova-manage.sh Source6: openstack-nova-vncproxy.init Source8: openstack-nova-network-init-bnc777488.patch @@ -39,7 +41,6 @@ Source10: %name.conf BuildRequires: systemd %endif - Source11: openstack-nova-novncproxy.init Source12: nova-sudoers Source13: openstack-nova-polkit.rules @@ -51,27 +52,22 @@ # https://bugs.launchpad.net/nova/+bug/1202199 # https://review.openstack.org/#/c/37477/ Patch7: 0001-Always-set-model-netfront-for-xen-over-libvirt.patch -# PATCH-FIX-SUSE dmueller(a)suse.com -- remove deprecated settings from api-paste -Patch8: suse-cleanup-api-paste.diff Patch9: 0001-Robustify-determination-of-root-directory.patch -Patch10: 0001-Claim-IPv6-is-unsupported-if-no-interface-with-IPv6-.patch -# https://review.openstack.org/#/c/34685 -Patch11: nova-vmware-hypervisor-version.patch -Patch12: 0001-Further-harden-boto-version-checking-in-EC2-tests.patch -# Backports of several patches: https://review.openstack.org/#/c/52954/ https://review.openstack.org/#/c/56075/ https://review.openstack.org/#/c/56174/ https://review.openstack.org/#/c/59243/ -Patch30: neutron-performance.patch -Patch31: 0001-Fix-for-qemu-nbd-hang.patch +# PATCH-FIX-UPSTREAM speilicke(a)suse.com -- https://review.openstack.org/#/c/84383/ +Patch10: 0001-Drop-nova-rpc-zmq-receiver-man-page.patch +Patch11: 0001-libvirt-Make-nwfilter-driver-use-right-filterref.patch +Patch12: 0001-Start-ping-listener-also-for-postgresql.patch BuildRequires: crudini BuildRequires: fdupes BuildRequires: openstack-suse-macros BuildRequires: openstack-suse-sudo BuildRequires: python-base -BuildRequires: python-distribute -BuildRequires: python-oslo.config -BuildRequires: python-oslo.sphinx -BuildRequires: python-pbr +BuildRequires: python-oslo.config >= 1.2.0 +BuildRequires: python-pbr >= 0.6 # Documentation requirements: -BuildRequires: python-Sphinx +BuildRequires: python-Babel >= 1.3 +BuildRequires: python-Sphinx >= 1.1.2 +BuildRequires: python-oslosphinx %if 0%{?suse_version} > 1110 # to make orphaned-file-tests happy BuildRequires: polkit-default-privs @@ -121,27 +117,30 @@ Requires: python-amqplib >= 0.6.1 Requires: python-anyjson >= 0.3.3 Requires: python-argparse -Requires: python-boto >= 2.4.0 +Requires: python-boto >= 2.12.0 Requires: python-cinderclient >= 1.0.6 Requires: python-eventlet >= 0.13.0 Requires: python-glanceclient >= 0.9.0 Requires: python-greenlet >= 0.3.2 -Requires: python-iso8601 >= 0.1.8 -Requires: python-jsonschema >= 1.3.0 -Requires: python-keystoneclient >= 0.3.2 +Requires: python-iso8601 >= 0.1.9 +Requires: python-jsonschema >= 2.0.0 +Requires: python-keystoneclient >= 0.7.0 Requires: python-kombu >= 2.4.8 Requires: python-lxml >= 2.3 Requires: python-netaddr >= 0.7.6 -Requires: python-neutronclient >= 2.3.0 -Requires: python-paramiko >= 1.8.0 -Requires: python-pbr >= 0.5.21 +Requires: python-neutronclient >= 2.3.4 +Requires: python-oslo.messaging >= 1.3.0a9 +Requires: python-oslo.rootwrap +Requires: python-paramiko >= 1.9.0 +Requires: python-pbr >= 0.6 Requires: python-pyasn1 -Requires: python-six >= 1.4.1 -Requires: python-sqlalchemy-migrate >= 0.7.2 -Requires: python-stevedore >= 0.10 +Requires: python-pycadf >= 0.4.1 +Requires: python-six >= 1.5.2 +Requires: python-sqlalchemy-migrate >= 0.8.2 +Requires: python-stevedore >= 0.14 Requires: python-suds >= 0.4 Requires: python-websockify >= 0.5.1 -Requires: python-xml +Requires: python-wsgiref >= 0.1.2 %description -n python-nova This package contains the core Python module of OpenStack Nova. @@ -160,7 +159,8 @@ %package conductor Summary: OpenStack Compute (Nova) - Conductor Group: System/Management -Requires: %{name} = %{version} +# prereq for creating the right openstack-nova user/group +PreReq: %{name} = %{version} Requires: python-pyasn1 %description conductor @@ -169,16 +169,17 @@ %package cells Summary: OpenStack Compute (Nova) - Cells Group: System/Management -Requires: %{name} = %{version} +# prereq for creating the right openstack-nova user/group +PreReq: %{name} = %{version} %description cells This package contains the Cells support of OpenStack Nova - %package cert Summary: OpenStack Compute (Nova) - Certificate Manager Group: System/Management -Requires: %{name} = %{version} +# prereq for creating the right openstack-nova user/group +PreReq: %{name} = %{version} %description cert This package contains the certificate manager of OpenStack Nova. @@ -186,7 +187,8 @@ %package console Summary: Openstack Compute (Nova) - Console Access Group: System/Management -Requires: %{name} = %{version} +# prereq for creating the right openstack-nova user/group +PreReq: %{name} = %{version} %description console This package contains the console access service for OpenStack Nova. @@ -194,7 +196,8 @@ %package consoleauth Summary: Openstack Compute (Nova) - Console Authentification Service Group: System/Management -Requires: %{name} = %{version} +# prereq for creating the right openstack-nova user/group +PreReq: %{name} = %{version} %description consoleauth This package contains the console authentification service for OpenStack Nova. @@ -220,7 +223,8 @@ %package network Summary: OpenStack Compute (Nova) - Network Group: System/Management -Requires: %{name} = %{version} +# prereq for creating the right openstack-nova user/group +PreReq: %{name} = %{version} Requires: dnsmasq %if 0%{?suse_version} > 1230 Requires: dnsmasq-utils @@ -233,7 +237,8 @@ %package novncproxy Summary: OpenStack Compute (Nova) - Websocket Proxy Group: System/Management -Requires: %{name} = %{version} +# prereq for creating the right openstack-nova user/group +PreReq: %{name} = %{version} Requires: novnc %description novncproxy @@ -242,7 +247,8 @@ %package objectstore Summary: OpenStack Compute (Nova) - Object Store Group: System/Management -Requires: %{name} = %{version} +# prereq for creating the right openstack-nova user/group +PreReq: %{name} = %{version} %description objectstore This package contains the objectstore service for OpenStack. @@ -250,7 +256,8 @@ %package scheduler Summary: OpenStack Compute (Nova) - Scheduler Group: System/Management -Requires: %{name} = %{version} +# prereq for creating the right openstack-nova user/group +PreReq: %{name} = %{version} %description scheduler This package contains the scheduler for OpenStack. @@ -258,7 +265,8 @@ %package vncproxy Summary: OpenStack Compute (Nova) - VNC Proxy Group: System/Management -Requires: %{name} = %{version} +# prereq for creating the right openstack-nova user/group +PreReq: %{name} = %{version} %description vncproxy This package contains the vnc-proxy service for OpenStack. @@ -266,7 +274,8 @@ %package -n openstack-xen-plugins Summary: OpenStack Compute (Nova) - XenAPI support Group: System/Management -Requires: %{name} = %{version} +# prereq for creating the right openstack-nova user/group +PreReq: %{name} = %{version} %description -n openstack-xen-plugins This package contains the XenAPI support for OpenStack. @@ -274,42 +283,37 @@ %package test Summary: OpenStack Compute (Nova) - Testsuite Group: System/Management -Requires: %{name} = %{version} +# prereq for creating the right openstack-nova user/group +PreReq: %{name} = %{version} Requires: curl +Requires: openstack-xen-plugins = %{version} Requires: python-cinderclient >= 1.0.6 -Requires: python-coverage >= 3.6 %if 0%{?suse_version} && 0%{?suse_version} <= 1110 Requires: python-discover %endif Requires: python-feedparser Requires: python-fixtures >= 0.3.14 -Requires: python-flake8 >= 2.0 -Requires: python-hacking >= 0.5.6 Requires: python-mock >= 1.0 Requires: python-mox >= 0.5.3 -Requires: python-pep8 >= 1.4.5 Requires: python-psycopg2 -Requires: python-pyflakes >= 0.7.2 -Requires: python-python-subunit -Requires: python-testrepository >= 0.0.17 -Requires: python-testtools >= 0.9.32 +Requires: python-python-subunit >= 0.0.18 +Requires: python-testrepository >= 0.0.18 +Requires: python-testtools >= 0.9.34 %description test The OpenStack Nova testsuite. It is used to verify the functionality of OpenStack Nova and its components. %prep -%setup -q -n nova-2013.2.2.dev46.g2c44ed7 +%setup -q -n %{component}-%{version} +cp %{SOURCE3} etc/nova %patch1 -p1 %patch2 -p1 %patch7 -p1 -%patch8 %patch9 -p1 %patch10 -p1 %patch11 -p1 -%patch12 -p1 -%patch30 -p1 -%patch31 -p1 +%patch12 %openstack_cleanup_prep %build @@ -327,8 +331,8 @@ install -d -m 755 %{buildroot}%{_localstatedir}/lib/nova/networks install -d -m 755 %{buildroot}%{_localstatedir}/lib/nova/tmp install -d -m 755 %{buildroot}%{_localstatedir}/log/nova +install -d -m 700 %{buildroot}%{_localstatedir}/run/nova install -d -m 700 %{buildroot}%{_localstatedir}/cache/nova -install -d -m 700 %{buildroot}%{_localstatedir}/run/%{component} %if 0%{?suse_version} > 1230 install -D -m 644 %{SOURCE10} %{buildroot}/%_tmpfilesdir/%name.conf %endif @@ -337,6 +341,11 @@ install -p -D -m 600 etc/nova/nova.conf.sample %{buildroot}%{_sysconfdir}/nova/nova.conf install -p -D -m 600 etc/nova/api-paste.ini etc/nova/policy.json %{buildroot}%{_sysconfdir}/nova/ install -p -D -m 644 etc/nova/rootwrap.conf %{buildroot}%{_sysconfdir}/nova/ +install -p -D -m 600 etc/nova/release.sample %{buildroot}%{_sysconfdir}/nova/release +sed -i -e "s,vendor = .*,vendor = %{distribution}," \ + -e "s,product = .*,product = OpenStack Nova," \ + -e "s,package = .*,package = %{version}," %{buildroot}%{_sysconfdir}/nova/release + cp -a etc/nova/rootwrap.d/ %{buildroot}%{_sysconfdir}/nova/ # bash-completion/logrotate/etc. install -p -D -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/bash_completion.d/openstack-nova-manage.sh @@ -344,7 +353,7 @@ ### init scripts mkdir -p %{buildroot}%{_sbindir} -for i in api cert cells compute conductor console consoleauth spicehtml5proxy network objectstore rpc-zmq-receiver scheduler ; do +for i in api cert cells compute baremetal-deploy-helper conductor console consoleauth spicehtml5proxy network objectstore scheduler ; do tmp=$(mktemp) cat %{SOURCE1} | sed "s/__NAME__/$i/g" > $tmp if [ "x$i" = "xcompute" ] ; then @@ -373,7 +382,6 @@ # needed by api_samples test mkdir -p %{buildroot}%{_localstatedir}/lib/%{name}-test/doc cp -r --preserve=timestamps doc/api_samples doc/v3 %{buildroot}%{_localstatedir}/lib/%{name}-test/doc/ -cp -r --preserve=timestamps plugins %{buildroot}%{_localstatedir}/lib/%{name}-test/ mkdir -p %{buildroot}%{_localstatedir}/lib/%{name}-test/plugins/xenserver/xenapi/etc/ ln -sf /etc/xapi.d %{buildroot}%{_localstatedir}/lib/%{name}-test/plugins/xenserver/xenapi/etc/xapi.d %fdupes %{buildroot}%{_localstatedir}/lib/%{name}-test @@ -395,7 +403,6 @@ ### set default configuration (mostly applies to package-only setups and quickstart, i.e. not generally crowbar) %define nova_conf %{buildroot}%{_sysconfdir}/nova/nova.conf crudini --set %{nova_conf} DEFAULT verbose True -crudini --set %{nova_conf} DEFAULT log_file nova.log crudini --set %{nova_conf} DEFAULT log_dir /var/log/nova crudini --set %{nova_conf} DEFAULT connection_type libvirt crudini --set %{nova_conf} DEFAULT compute_driver libvirt.LibvirtDriver @@ -406,38 +413,25 @@ crudini --set %{nova_conf} DEFAULT neutron_admin_username neutron crudini --set %{nova_conf} DEFAULT neutron_admin_password '%%SERVICE_PASSWORD%%' crudini --set %{nova_conf} DEFAULT neutron_admin_tenant_name '%%SERVICE_TENANT_NAME%%' -crudini --set %{nova_conf} DEFAULT libvirt_vif_driver nova.virt.libvirt.vif.LibvirtGenericVIFDriver crudini --set %{nova_conf} DEFAULT state_path /var/lib/nova crudini --set %{nova_conf} DEFAULT lock_path %{_localstatedir}/run/nova crudini --set %{nova_conf} DEFAULT service_neutron_metadata_proxy True crudini --set %{nova_conf} DEFAULT security_group_api neutron +crudini --set %{nova_conf} osapi_v3 enabled true #NOTE(saschpe): Do we want to use sqlite per default or demand PostgreSQL right away? crudini --set %{nova_conf} sql connection sqlite:////var/lib/nova/nova.db crudini --set %{nova_conf} keystone_authtoken signing_dir /var/cache/%component/keystone-signing %pre # need a fixed uid/gid for being able to use shared storage over NFS -getent group %{groupname} >/dev/null || groupadd -g 96 %{groupname} -getent passwd %{username} >/dev/null || \ -useradd -M -u 96 -s /bin/bash -g %{groupname} -d %{_localstatedir}/lib/nova -c "OpenStack Nova Daemons" %{username} -exit 0 - -%post -%{fillup_and_insserv -f openstack-nova-rpc-zmq-receiver} - -%preun -%stop_on_removal openstack-nova-rpc-zmq-receiver +%openstack_pre_user_group_create -u 96 -g 96 -s /bin/bash %{username} %{groupname} -%postun -%restart_on_update openstack-nova-rpc-zmq-receiver -%insserv_cleanup +%preun api +%stop_on_removal openstack-nova-api %post api %{fillup_and_insserv -f openstack-nova-api} -%preun api -%stop_on_removal openstack-nova-api - %postun api %restart_on_update openstack-nova-api %insserv_cleanup @@ -445,6 +439,9 @@ %preun conductor %stop_on_removal openstack-nova-conductor +%post conductor +%{fillup_and_insserv -f openstack-nova-conductor} + %postun conductor %restart_on_update openstack-nova-conductor %insserv_cleanup @@ -453,46 +450,46 @@ %stop_on_removal openstack-nova-console %stop_on_removal openstack-nova-spicehtml5proxy +%post console +%{fillup_and_insserv -f openstack-nova-console} +%{fillup_and_insserv -f openstack-nova-spicehtml5proxy} + %postun console %restart_on_update openstack-nova-console %restart_on_update openstack-nova-spicehtml5proxy %insserv_cleanup -%post console -%{fillup_and_insserv -f openstack-nova-console} -%{fillup_and_insserv -f openstack-nova-spicehtml5proxy} - %preun consoleauth %stop_on_removal openstack-nova-consoleauth +%post consoleauth +%{fillup_and_insserv -f openstack-nova-consoleauth} + %postun consoleauth %restart_on_update openstack-nova-consoleauth %insserv_cleanup -%post consoleauth -%{fillup_and_insserv -f openstack-nova-consoleauth} - %preun cells %stop_on_removal openstack-nova-cells +%post cert +%{fillup_and_insserv -f openstack-nova-cert} + %postun cells %restart_on_update openstack-nova-cells %insserv_cleanup -%post cert -%{fillup_and_insserv -f openstack-nova-cert} - %preun cert %stop_on_removal openstack-nova-cert -%postun cert -%restart_on_update openstack-nova-cert -%insserv_cleanup - %post compute polkit-auth --grant org.libvirt.unix.manage --user %{username} 2>/dev/null || true %{fillup_and_insserv -f openstack-nova-compute} +%postun cert +%restart_on_update openstack-nova-cert +%insserv_cleanup + %preun compute %stop_on_removal openstack-nova-compute @@ -562,6 +559,7 @@ %config(noreplace) %attr(0640, root, %{groupname}) %{_sysconfdir}/nova/nova.conf %config %attr(0640, root, %{groupname}) %{_sysconfdir}/nova/policy.json %config %{_sysconfdir}/nova/rootwrap.conf +%config %{_sysconfdir}/nova/release %dir %{_sysconfdir}/nova/rootwrap.d %dir %attr(0755, %{username}, %{groupname}) %{_localstatedir}/lib/nova %dir %attr(0755, %{username}, %{groupname}) %{_localstatedir}/log/nova @@ -571,6 +569,7 @@ %else %dir %attr(0700, %{username}, %{groupname}) %{_localstatedir}/run/%{component} %endif +%ghost %dir %attr(0750, %{username}, %{groupname}) %{_localstatedir}/run/nova %{_bindir}/nova-all %{_bindir}/nova-clear-rabbit-queues %{_bindir}/nova-manage @@ -584,12 +583,6 @@ %dir %attr(0755, root, root) %{_localstatedir}/lib/nova/networks %dir %attr(0755, root, root) %{_localstatedir}/lib/nova/tmp -# FIXME: which package should these go in? -%{_initddir}/%{name}-rpc-zmq-receiver -%{_sbindir}/rc%{name}-rpc-zmq-receiver -%{_bindir}/nova-rpc-zmq-receiver -%{_mandir}/man1/nova-rpc-zmq-receiver.1%{?ext_man} - %files -n python-nova %defattr(-,root,root,-) %doc LICENSE @@ -640,11 +633,12 @@ %defattr(-,root,root,-) %doc LICENSE %config %{_sysconfdir}/nova/rootwrap.d/compute.filters -%config %{_sysconfdir}/nova/rootwrap.d/docker.filters %config %{_sysconfdir}/nova/rootwrap.d/baremetal-compute-ipmi.filters %config %{_sysconfdir}/nova/rootwrap.d/baremetal-deploy-helper.filters %{_initddir}/%{name}-compute +%{_initddir}/%{name}-baremetal-deploy-helper %{_sbindir}/rc%{name}-compute +%{_sbindir}/rc%{name}-baremetal-deploy-helper %{_bindir}/nova-compute %{_bindir}/nova-baremetal-manage %{_bindir}/nova-baremetal-deploy-helper ++++++ 0001-Always-set-model-netfront-for-xen-over-libvirt.patch ++++++ --- /var/tmp/diff_new_pack.82xNKL/_old 2014-04-14 10:56:22.000000000 +0200 +++ /var/tmp/diff_new_pack.82xNKL/_new 2014-04-14 10:56:22.000000000 +0200 @@ -17,11 +17,11 @@ nova/virt/libvirt/vif.py | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) -diff --git a/nova/tests/virt/libvirt/test_libvirt_vif.py b/nova/tests/virt/libvirt/test_libvirt_vif.py -index a1df6c7..f6e48d9 100644 ---- a/nova/tests/virt/libvirt/test_libvirt_vif.py -+++ b/nova/tests/virt/libvirt/test_libvirt_vif.py -@@ -360,7 +360,7 @@ def test_model_xen(self): +Index: nova-2014.1.dev330.g2efd3fa/nova/tests/virt/libvirt/test_libvirt_vif.py +=================================================================== +--- nova-2014.1.dev330.g2efd3fa.orig/nova/tests/virt/libvirt/test_libvirt_vif.py ++++ nova-2014.1.dev330.g2efd3fa/nova/tests/virt/libvirt/test_libvirt_vif.py +@@ -432,7 +432,7 @@ class LibvirtVifTestCase(test.TestCase): d = vif.LibvirtGenericVIFDriver(self._get_conn("xen:///system")) xml = self._get_instance_xml(d, self.vif_bridge) @@ -30,11 +30,11 @@ def test_generic_driver_none(self): d = vif.LibvirtGenericVIFDriver(self._get_conn()) -diff --git a/nova/virt/libvirt/vif.py b/nova/virt/libvirt/vif.py -index 047d1ac..8f34f61 100644 ---- a/nova/virt/libvirt/vif.py -+++ b/nova/virt/libvirt/vif.py -@@ -105,9 +105,15 @@ def get_config(self, instance, vif, image_meta, inst_type): +Index: nova-2014.1.dev330.g2efd3fa/nova/virt/libvirt/vif.py +=================================================================== +--- nova-2014.1.dev330.g2efd3fa.orig/nova/virt/libvirt/vif.py ++++ nova-2014.1.dev330.g2efd3fa/nova/virt/libvirt/vif.py +@@ -100,9 +100,15 @@ class LibvirtBaseVIFDriver(object): model = None driver = None @@ -42,7 +42,7 @@ + # drives as emulated ones will not work (xen suffixes them + # with -emu which makes interface name too long). Additionaly + # security groups will also not work for -emu suffixed interfaces. -+ if CONF.libvirt_type == "xen": ++ if CONF.libvirt.virt_type == "xen": + model = "netfront" # If the user has specified a 'vif_model' against the # image then honour that model @@ -51,6 +51,3 @@ vif_model = image_meta.get('properties', {}).get('hw_vif_model') if vif_model is not None: --- -1.8.4.474.g128a96c - ++++++ 0001-Drop-nova-rpc-zmq-receiver-man-page.patch ++++++ >From 90a61d71cd8ecb71129508805062ec6fc8a44556 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke <saschpe(a)mailbox.org> Date: Tue, 1 Apr 2014 11:05:51 +0200 Subject: [PATCH] Drop nova-rpc-zmq-receiver man-page Doesn't make sense to install and build docs after it was removed. Change-Id: Ia6193808cca625e83cb3497b5033db5c08dcdd1e --- doc/source/conf.py | 2 -- doc/source/man/nova-rpc-zmq-receiver.rst | 47 -------------------------------- 2 files changed, 49 deletions(-) delete mode 100644 doc/source/man/nova-rpc-zmq-receiver.rst diff --git a/doc/source/conf.py b/doc/source/conf.py index 0ae450f..83723a2 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -152,8 +152,6 @@ man_pages = [ [u'OpenStack'], 1), ('man/nova-rootwrap', 'nova-rootwrap', u'Cloud controller fabric', [u'OpenStack'], 1), - ('man/nova-rpc-zmq-receiver', 'nova-rpc-zmq-receiver', u'Cloud controller fabric', - [u'OpenStack'], 1), ('man/nova-scheduler', 'nova-scheduler', u'Cloud controller fabric', [u'OpenStack'], 1), ('man/nova-xvpvncproxy', 'nova-xvpvncproxy', u'Cloud controller fabric', diff --git a/doc/source/man/nova-rpc-zmq-receiver.rst b/doc/source/man/nova-rpc-zmq-receiver.rst deleted file mode 100644 index f1d3545..0000000 --- a/doc/source/man/nova-rpc-zmq-receiver.rst +++ /dev/null @@ -1,47 +0,0 @@ -======================= -nova-rpc-zmq-receiver -======================= - ------------------------------------ -Receiver for 0MQ based nova RPC ------------------------------------ - -:Author: openstack(a)lists.openstack.org -:Date: 2012-09-27 -:Copyright: OpenStack Foundation -:Version: 2012.1 -:Manual section: 1 -:Manual group: cloud computing - -SYNOPSIS -======== - - nova-rpc-zmq-receiver [options] - -DESCRIPTION -=========== - -The nova-rpc-zmq-receiver is a daemon which receives messages from remote -systems on behalf of the ZeroMQ-based rpc backend (nova.rpc.impl_zmq). -Messages are pulled by individual services from the message receiver daemon -in round-robin or fanout mode, depending on the queue type. - -OPTIONS -======= - - **General options** - -FILES -======== - -* /etc/nova/nova.conf - -SEE ALSO -======== - -* `OpenStack Nova <http://nova.openstack.org>`__ - -BUGS -==== - -* Nova bugs are managed at Launchpad `Bugs : Nova <https://bugs.launchpad.net/nova>`__ -- 1.9.1 ++++++ 0001-Robustify-determination-of-root-directory.patch ++++++ --- /var/tmp/diff_new_pack.82xNKL/_old 2014-04-14 10:56:22.000000000 +0200 +++ /var/tmp/diff_new_pack.82xNKL/_new 2014-04-14 10:56:22.000000000 +0200 @@ -14,11 +14,11 @@ nova/tests/virt/xenapi/test_xenapi.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) -Index: nova-2013.2.2.dev24.g05dfdb9/nova/tests/virt/xenapi/test_xenapi.py +Index: nova-2014.1.dev964.ge19b294/nova/tests/virt/xenapi/test_xenapi.py =================================================================== ---- nova-2013.2.2.dev24.g05dfdb9.orig/nova/tests/virt/xenapi/test_xenapi.py -+++ nova-2013.2.2.dev24.g05dfdb9/nova/tests/virt/xenapi/test_xenapi.py -@@ -4011,16 +4011,17 @@ class XenAPISessionTestCase(test.NoDBTes +--- nova-2014.1.dev964.ge19b294.orig/nova/tests/virt/xenapi/test_xenapi.py ++++ nova-2014.1.dev964.ge19b294/nova/tests/virt/xenapi/test_xenapi.py +@@ -3997,16 +3997,17 @@ class XenAPISessionTestCase(test.NoDBTes def test_verify_current_version_matches(self): session = self._get_mock_xapisession({}) @@ -42,4 +42,4 @@ + with open(XENPLUGIN) as plugin_file: for line in plugin_file: if "PLUGIN_VERSION = " in line: - print line + plugin_version = line.strip()[17:].strip('"') ++++++ 0001-Start-ping-listener-also-for-postgresql.patch ++++++ --- nova/openstack/common/db/sqlalchemy/session.py +++ nova/openstack/common/db/sqlalchemy/session.py @@ -488,7 +488,7 @@ def _ping_listener(engine, dbapi_conn, connection_rec, connection_proxy): - """Ensures that MySQL and DB2 connections are alive. + """Ensures that MySQL, PostgreSQL or DB2 connections are alive. Borrowed from: http://groups.google.com/group/sqlalchemy/msg/a4ce563d802c929f @@ -504,6 +504,15 @@ if engine.dialect.is_disconnect(ex, dbapi_conn, cursor): msg = _LW('Database server has gone away: %s') % ex LOG.warning(msg) + + # if the database server has gone away, all connections in the pool + # have become invalid and we can safely close all of them here, + # rather than waste time on checking of every single connection + engine.dispose() + + # this will be handled by SQLAlchemy and will force it to create + # a new connection and retry the original action + raise sqla_exc.DisconnectionError(msg) else: raise @@ -625,7 +634,7 @@ sqlalchemy.event.listen(engine, 'checkin', _thread_yield) - if engine.name in ['mysql', 'ibm_db_sa']: + if engine.name in ('ibm_db_sa', 'mysql', 'postgresql'): ping_callback = functools.partial(_ping_listener, engine) sqlalchemy.event.listen(engine, 'checkout', ping_callback) if engine.name == 'mysql': ++++++ 0001-libvirt-Make-nwfilter-driver-use-right-filterref.patch ++++++ >From 62ee91973a6cda9bcbdb0012ba98f580a154abff Mon Sep 17 00:00:00 2001 From: Ryota MIBU <r-mibu(a)cq.jp.nec.com> Date: Fri, 7 Mar 2014 17:08:11 +0900 Subject: [PATCH] libvirt: Make nwfilter driver use right filterref This fixes Bug #1220856 which occurs with Libvirt NWFilterFirewall Driver. While creating a VM with multiple NICs including one connects to DHCP serving network and another to DHCP non-serving network, NWFilterFirewall Driver will use the same base filter that allows DHCP for all NICs. This leads a libvirt launch error due to lack of 'dhcp_server' parameter which is needed to define allow-DHCP filters. This patch makes NWFilterFirewall Driver use right base filter for each NIC depends on 'dhcp_server' config. Closes-bug: #1220856 Change-Id: I7f9a7c281f152985478b2ec295f0644ba475fd76 --- nova/tests/virt/libvirt/test_libvirt.py | 38 +++++++++++++++++++++++++++++++++ nova/virt/libvirt/firewall.py | 15 ++++++------- 2 files changed, 44 insertions(+), 9 deletions(-) diff --git a/nova/tests/virt/libvirt/test_libvirt.py b/nova/tests/virt/libvirt/test_libvirt.py index 982fcaa..09684fc 100644 --- a/nova/tests/virt/libvirt/test_libvirt.py +++ b/nova/tests/virt/libvirt/test_libvirt.py @@ -7467,6 +7467,44 @@ class NWFilterTestCase(test.TestCase): db.instance_destroy(admin_ctxt, instance_ref['uuid']) + def test_multinic_base_filter_selection(self): + fakefilter = NWFilterFakes() + self.fw._conn.nwfilterDefineXML = fakefilter.filterDefineXMLMock + self.fw._conn.nwfilterLookupByName = fakefilter.nwfilterLookupByName + + instance_ref = self._create_instance() + inst_id = instance_ref['id'] + inst_uuid = instance_ref['uuid'] + + self.security_group = self.setup_and_return_security_group() + + db.instance_add_security_group(self.context, inst_uuid, + self.security_group['id']) + + instance = db.instance_get(self.context, inst_id) + + network_info = _fake_network_info(self.stubs, 2) + network_info[0]['network']['subnets'][0]['meta']['dhcp_server'] = \ + '1.1.1.1' + + self.fw.setup_basic_filtering(instance, network_info) + + def assert_filterref(instance, vif, expected=[]): + nic_id = vif['address'].replace(':', '') + filter_name = self.fw._instance_filter_name(instance, nic_id) + f = fakefilter.nwfilterLookupByName(filter_name) + tree = etree.fromstring(f.xml) + frefs = [fr.get('filter') for fr in tree.findall('filterref')] + self.assertTrue(set(expected) == set(frefs)) + + assert_filterref(instance, network_info[0], expected=['nova-base']) + assert_filterref(instance, network_info[1], expected=['nova-nodhcp']) + + db.instance_remove_security_group(self.context, inst_uuid, + self.security_group['id']) + self.teardown_security_group() + db.instance_destroy(context.get_admin_context(), instance_ref['uuid']) + class LibvirtUtilsTestCase(test.TestCase): def test_create_image(self): diff --git a/nova/virt/libvirt/firewall.py b/nova/virt/libvirt/firewall.py index 24f5f8f..e064544 100644 --- a/nova/virt/libvirt/firewall.py +++ b/nova/virt/libvirt/firewall.py @@ -112,20 +112,17 @@ class NWFilterFirewall(base_firewall.FirewallDriver): LOG.info(_('Ensuring static filters'), instance=instance) self._ensure_static_filters() - allow_dhcp = False + nodhcp_base_filter = self.get_base_filter_list(instance, False) + dhcp_base_filter = self.get_base_filter_list(instance, True) + for vif in network_info: - if not vif['network'] or not vif['network']['subnets']: - continue + _base_filter = nodhcp_base_filter for subnet in vif['network']['subnets']: if subnet.get_meta('dhcp_server'): - allow_dhcp = True + _base_filter = dhcp_base_filter break - - base_filter = self.get_base_filter_list(instance, allow_dhcp) - - for vif in network_info: self._define_filter(self._get_instance_filter_xml(instance, - base_filter, + _base_filter, vif)) def _get_instance_filter_parameters(self, vif): -- 1.9.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.82xNKL/_old 2014-04-14 10:56:22.000000000 +0200 +++ /var/tmp/diff_new_pack.82xNKL/_new 2014-04-14 10:56:22.000000000 +0200 @@ -1,9 +1,12 @@ <services> - <service name="git_tarballs" mode="disabled"> - <param name="url">http://tarballs.openstack.org/nova/nova-stable-havana.tar.gz</param> - <param name="email">opensuse-cloud(a)opensuse.org</param> + <service mode="disabled" name="download_files"> + <param name="changesgenerate">enable</param> + </service> + <service mode="disabled" name="set_version"> + <param name="basename">nova</param> + </service> + <service mode="disabled" name="python_requires"> </service> - <service name="refresh_patches" mode="disabled"> <param name="changesgenerate">enable</param> </service> ++++++ nova-conf-defaults.patch ++++++ --- /var/tmp/diff_new_pack.82xNKL/_old 2014-04-14 10:56:22.000000000 +0200 +++ /var/tmp/diff_new_pack.82xNKL/_new 2014-04-14 10:56:22.000000000 +0200 @@ -1,17 +1,24 @@ -Index: nova-2013.2.a71.g4e842e3/etc/nova/nova.conf.sample -=================================================================== ---- nova-2013.2.a71.g4e842e3.orig/etc/nova/nova.conf.sample -+++ nova-2013.2.a71.g4e842e3/etc/nova/nova.conf.sample -@@ -56,7 +56,7 @@ +--- a/etc/nova/nova.conf.sample ++++ b/etc/nova/nova.conf.sample +@@ -76,7 +76,7 @@ + + # The RabbitMQ broker address where a single node is used. + # (string value) +-#rabbit_host=localhost ++rabbit_host=localhost + + # The RabbitMQ broker port where a single node is used. + # (integer value) +@@ -250,7 +250,7 @@ # - # ip address of this host (string value) + # IP address of this host (string value) -#my_ip=10.0.0.1 +my_ip=10.0.0.1 # Name of this node. This can be an opaque identifier. It is # not necessarily a hostname, FQDN, or IP address. However, -@@ -93,11 +93,11 @@ +@@ -295,11 +295,11 @@ #pybasedir=/usr/lib/python/site-packages # Directory where nova binaries are installed (string value) @@ -21,11 +28,11 @@ # Top-level directory for maintaining nova's state (string # value) -#state_path=$pybasedir -+state_path=$pybasedir ++state_path=/var/lib/nova # -@@ -317,7 +317,7 @@ +@@ -541,7 +541,7 @@ # The strategy to use for auth: noauth or keystone. (string # value) @@ -34,7 +41,7 @@ # Treat X-Forwarded-For as the canonical remote address. Only # enable this if you have a sanitizing proxy. (boolean value) -@@ -395,7 +395,7 @@ +@@ -619,7 +619,7 @@ # Set flag to indicate Neutron will proxy metadata requests # and resolve instance ids. (boolean value) @@ -43,16 +50,16 @@ # Shared secret to validate proxies Neutron metadata requests # (string value) -@@ -944,7 +944,7 @@ +@@ -1164,7 +1164,7 @@ - # hostname or ip for OpenStack to use when accessing the s3 + # Hostname or IP for OpenStack to use when accessing the S3 # api (string value) -#s3_host=$my_ip +s3_host=$my_ip - # port used when accessing the s3 api (integer value) + # Port used when accessing the S3 api (integer value) #s3_port=3333 -@@ -977,7 +977,7 @@ +@@ -1197,7 +1197,7 @@ # The full class name of the network API class to use (string # value) @@ -61,7 +68,7 @@ # -@@ -1172,7 +1172,7 @@ +@@ -1401,7 +1401,7 @@ #vpn_start=1000 # Number of addresses in each private subnet (integer value) @@ -70,39 +77,39 @@ # Fixed IPv6 address block (string value) #fixed_range_v6=fd00::/48 -@@ -1238,7 +1238,7 @@ +@@ -1463,7 +1463,7 @@ # # URL for connecting to neutron (string value) -#neutron_url=http://127.0.0.1:9696 +neutron_url=http://127.0.0.1:9696 - # timeout value for connecting to neutron in seconds (integer + # Timeout value for connecting to neutron in seconds (integer # value) -@@ -1246,11 +1246,11 @@ +@@ -1471,11 +1471,11 @@ - # username for connecting to neutron in admin context (string + # Username for connecting to neutron in admin context (string # value) -#neutron_admin_username=<None> +neutron_admin_username=<None> - # password for connecting to neutron in admin context (string + # Password for connecting to neutron in admin context (string # value) -#neutron_admin_password=<None> +neutron_admin_password=<None> - # tenant name for connecting to neutron in admin context - # (string value) -@@ -1269,7 +1269,7 @@ + # Tenant id for connecting to neutron in admin context (string + # value) +@@ -1500,7 +1500,7 @@ - # auth strategy for connecting to neutron in admin context - # (string value) + # Authorization strategy for connecting to neutron in admin + # context (string value) -#neutron_auth_strategy=keystone +neutron_auth_strategy=keystone # Name of Integration Bridge used by Open vSwitch (string # value) -@@ -1305,7 +1305,7 @@ +@@ -1533,7 +1533,7 @@ # # The full class name of the security API class (string value) @@ -111,7 +118,7 @@ # -@@ -1356,7 +1356,7 @@ +@@ -1573,7 +1573,7 @@ #disable_process_locking=false # Directory to use for lock files. (string value) @@ -120,7 +127,7 @@ # -@@ -1369,7 +1369,7 @@ +@@ -1586,7 +1586,7 @@ # Print more verbose output (set logging level to INFO instead # of default WARNING level). (boolean value) @@ -129,25 +136,7 @@ # Log output to standard error (boolean value) #use_stderr=true -@@ -1431,7 +1431,7 @@ - - # (Optional) The base directory used for relative --log-file - # paths (string value) --#log_dir=<None> -+log_dir=<None> - - # Use syslog for logging. (boolean value) - #use_syslog=false -@@ -1548,7 +1548,7 @@ - - # The RabbitMQ broker address where a single node is used - # (string value) --#rabbit_host=localhost -+rabbit_host=localhost - - # The RabbitMQ broker port where a single node is used - # (integer value) -@@ -1916,7 +1916,7 @@ +@@ -1948,7 +1948,7 @@ # fake.FakeDriver, baremetal.BareMetalDriver, # vmwareapi.VMwareESXDriver, vmwareapi.VMwareVCDriver (string # value) @@ -156,12 +145,3 @@ # The default format an ephemeral_volume will be formatted # with on creation. (string value) -@@ -2008,7 +2008,7 @@ - #snapshot_image_format=<None> - - # The libvirt VIF driver to configure the VIFs. (string value) --#libvirt_vif_driver=nova.virt.libvirt.vif.LibvirtGenericVIFDriver -+libvirt_vif_driver=nova.virt.libvirt.vif.LibvirtGenericVIFDriver - - # Libvirt handlers for remote volumes. (list value) - #libvirt_volume_drivers=iscsi=nova.virt.libvirt.volume.LibvirtISCSIVolumeDriver,iser=nova.virt.libvirt.volume.LibvirtISERVolumeDriver,local=nova.virt.libvirt.volume.LibvirtVolumeDriver,fake=nova.virt.libvirt.volume.LibvirtFakeVolumeDriver,rbd=nova.virt.libvirt.volume.LibvirtNetVolumeDriver,sheepdog=nova.virt.libvirt.volume.LibvirtNetVolumeDriver,nfs=nova.virt.libvirt.volume.LibvirtNFSVolumeDriver,aoe=nova.virt.libvirt.volume.LibvirtAOEVolumeDriver,glusterfs=nova.virt.libvirt.volume.LibvirtGlusterfsVolumeDriver,fibre_channel=nova.virt.libvirt.volume.LibvirtFibreChannelVolumeDriver,scality=nova.virt.libvirt.volume.LibvirtScalityVolumeDriver ++++++ nova-network-filter-bnc777488.patch ++++++ --- /var/tmp/diff_new_pack.82xNKL/_old 2014-04-14 10:56:22.000000000 +0200 +++ /var/tmp/diff_new_pack.82xNKL/_new 2014-04-14 10:56:22.000000000 +0200 @@ -1,8 +1,8 @@ -Index: nova-2013.2.a2699.g7b77052/nova/network/linux_net.py +Index: nova-2014.1.dev330.g2efd3fa/nova/network/linux_net.py =================================================================== ---- nova-2013.2.a2699.g7b77052.orig/nova/network/linux_net.py -+++ nova-2013.2.a2699.g7b77052/nova/network/linux_net.py -@@ -351,6 +351,9 @@ class IptablesManager(object): +--- nova-2014.1.dev330.g2efd3fa.orig/nova/network/linux_net.py ++++ nova-2014.1.dev330.g2efd3fa/nova/network/linux_net.py +@@ -358,6 +358,9 @@ class IptablesManager(object): # among the various nova components. It sits at the very top # of FORWARD and OUTPUT. for tables in [self.ipv4, self.ipv6]: @@ -12,11 +12,11 @@ tables['filter'].add_chain('nova-filter-top', wrap=False) tables['filter'].add_rule('FORWARD', '-j nova-filter-top', wrap=False, top=True) -Index: nova-2013.2.a2699.g7b77052/nova/tests/test_iptables_network.py +Index: nova-2014.1.dev330.g2efd3fa/nova/tests/test_iptables_network.py =================================================================== ---- nova-2013.2.a2699.g7b77052.orig/nova/tests/test_iptables_network.py -+++ nova-2013.2.a2699.g7b77052/nova/tests/test_iptables_network.py -@@ -37,6 +37,8 @@ class IptablesManagerTestCase(test.TestC +--- nova-2014.1.dev330.g2efd3fa.orig/nova/tests/test_iptables_network.py ++++ nova-2014.1.dev330.g2efd3fa/nova/tests/test_iptables_network.py +@@ -35,6 +35,8 @@ class IptablesManagerTestCase(test.NoDBT ':%s-local - [0:0]' % (binary_name), ':%s-OUTPUT - [0:0]' % (binary_name), ':nova-filter-top - [0:0]', @@ -25,7 +25,7 @@ '[0:0] -A FORWARD -j nova-filter-top', '[0:0] -A OUTPUT -j nova-filter-top', '[0:0] -A nova-filter-top -j %s-local' % (binary_name), -@@ -211,7 +213,15 @@ class IptablesManagerTestCase(test.TestC +@@ -209,7 +211,15 @@ class IptablesManagerTestCase(test.NoDBT "Duplicate line: %s" % line) seen_lines.add(line) @@ -42,7 +42,7 @@ for line in new_lines: if line.startswith('[0:0] -A %s' % chain): self.assertTrue('-j nova-filter-top' in line, -@@ -250,7 +260,7 @@ class IptablesManagerTestCase(test.TestC +@@ -248,7 +258,7 @@ class IptablesManagerTestCase(test.NoDBT def test_iptables_top_order(self): # Test iptables_top_regex current_lines = list(self.sample_filter) @@ -51,7 +51,7 @@ self.flags(iptables_top_regex='-j iptables-top-rule') new_lines = self.manager._modify_rules(current_lines, self.manager.ipv4['filter'], -@@ -260,7 +270,7 @@ class IptablesManagerTestCase(test.TestC +@@ -258,7 +268,7 @@ class IptablesManagerTestCase(test.NoDBT def test_iptables_bottom_order(self): # Test iptables_bottom_regex current_lines = list(self.sample_filter) @@ -60,7 +60,7 @@ self.flags(iptables_bottom_regex='-j iptables-bottom-rule') new_lines = self.manager._modify_rules(current_lines, self.manager.ipv4['filter'], -@@ -270,8 +280,8 @@ class IptablesManagerTestCase(test.TestC +@@ -268,8 +278,8 @@ class IptablesManagerTestCase(test.NoDBT def test_iptables_preserve_order(self): # Test both iptables_top_regex and iptables_bottom_regex current_lines = list(self.sample_filter) ++++++ nova-sudoers ++++++ --- /var/tmp/diff_new_pack.82xNKL/_old 2014-04-14 10:56:22.000000000 +0200 +++ /var/tmp/diff_new_pack.82xNKL/_new 2014-04-14 10:56:22.000000000 +0200 @@ -1 +1 @@ -openstack-nova ALL = (root) NOPASSWD: /usr/bin/nova-rootwrap /etc/nova/rootwrap.conf * +nova ALL = (root) NOPASSWD: /usr/bin/nova-rootwrap /etc/nova/rootwrap.conf * ++++++ nova.conf.sample ++++++ ++++ 3678 lines (skipped) ++++++ openstack-nova-network-init-bnc777488.patch ++++++ --- /var/tmp/diff_new_pack.82xNKL/_old 2014-04-14 10:56:22.000000000 +0200 +++ /var/tmp/diff_new_pack.82xNKL/_new 2014-04-14 10:56:22.000000000 +0200 @@ -1,6 +1,6 @@ --- openstack-nova-network +++ openstack-nova-network -@@ -24,6 +24,27 @@ +@@ -22,6 +22,27 @@ . /etc/rc.status @@ -28,7 +28,7 @@ case "$1" in start) if [ "$DAEMON" == "api" ]; then -@@ -34,6 +55,7 @@ +@@ -31,6 +52,7 @@ fi echo -n "Starting nova-$DAEMON" @@ -36,7 +36,7 @@ /sbin/startproc -q -s -u $USER /usr/bin/nova-$DAEMON --config-file=$CONFFILE rc_status -v ;; -@@ -41,6 +63,7 @@ +@@ -38,6 +60,7 @@ echo -n "Shutting down nova-$DAEMON" /sbin/killproc /usr/bin/nova-$DAEMON rc_status -v ++++++ openstack-nova-novncproxy.init ++++++ --- /var/tmp/diff_new_pack.82xNKL/_old 2014-04-14 10:56:22.000000000 +0200 +++ /var/tmp/diff_new_pack.82xNKL/_new 2014-04-14 10:56:22.000000000 +0200 @@ -13,7 +13,7 @@ ### END INIT INFO DAEMON="novncproxy" -USER="openstack-nova" +USER="nova" CONFFILE="/etc/nova/nova.conf" LOGFILE="/var/log/nova/$DAEMON.log" ++++++ openstack-nova-polkit.rules ++++++ --- /var/tmp/diff_new_pack.82xNKL/_old 2014-04-14 10:56:22.000000000 +0200 +++ /var/tmp/diff_new_pack.82xNKL/_new 2014-04-14 10:56:22.000000000 +0200 @@ -2,7 +2,7 @@ polkit.addRule(function(action, subject) { if (action.id == "org.libvirt.unix.manage" && - subject.user == "openstack-nova") { + subject.user == "nova") { return polkit.Result.YES; } }); ++++++ openstack-nova-vncproxy.init ++++++ --- /var/tmp/diff_new_pack.82xNKL/_old 2014-04-14 10:56:22.000000000 +0200 +++ /var/tmp/diff_new_pack.82xNKL/_new 2014-04-14 10:56:22.000000000 +0200 @@ -13,7 +13,7 @@ ### END INIT INFO name="vncproxy" -USER="openstack-nova" +USER="nova" GROUP="nobody" CONFIGFILE="/etc/nova/nova.conf" RUNDIR="/var/run/nova" ++++++ openstack-nova.conf ++++++ --- /var/tmp/diff_new_pack.82xNKL/_old 2014-04-14 10:56:22.000000000 +0200 +++ /var/tmp/diff_new_pack.82xNKL/_new 2014-04-14 10:56:22.000000000 +0200 @@ -1 +1 @@ -d /var/run/openstack-nova 0700 openstack-nova openstack-nova - +d /var/run/openstack-nova 0700 nova nova - ++++++ openstack-nova.init ++++++ --- /var/tmp/diff_new_pack.82xNKL/_old 2014-04-14 10:56:22.000000000 +0200 +++ /var/tmp/diff_new_pack.82xNKL/_new 2014-04-14 10:56:22.000000000 +0200 @@ -13,14 +13,12 @@ ### END INIT INFO DAEMON="__NAME__" -USER="openstack-nova" +USER="nova" CONFFILE="/etc/nova/nova.conf" RUNDIR="/var/run/nova" -LOCKDIR="/var/lock/nova" -# $RUNDIR/$LOCKDIR can be tmpfs, thus we have to create/own it here: +# $RUNDIR can be tmpfs, thus we have to create/own it here: mkdir -m 0700 -p $RUNDIR && chown $USER. $RUNDIR -mkdir -m 0700 -p $LOCKDIR && chown $USER. $LOCKDIR . /etc/rc.status @@ -28,7 +26,6 @@ start) if [ "$DAEMON" == "api" ]; then echo -n "Checking for Nova API DB Migrations" - test -f /var/log/nova/nova-manage.log && chown $USER. /var/log/nova/nova-manage.log su $USER -s /bin/sh -c "/usr/bin/nova-manage db sync" rc_status -v fi ++++++ openstack-nova.logrotate ++++++ --- /var/tmp/diff_new_pack.82xNKL/_old 2014-04-14 10:56:22.000000000 +0200 +++ /var/tmp/diff_new_pack.82xNKL/_new 2014-04-14 10:56:22.000000000 +0200 @@ -7,6 +7,6 @@ dateext missingok notifempty - su openstack-nova openstack-nova + su nova nova sharedscripts } ++++++ org.openstack.nova.compute.pkla ++++++ --- /var/tmp/diff_new_pack.82xNKL/_old 2014-04-14 10:56:22.000000000 +0200 +++ /var/tmp/diff_new_pack.82xNKL/_new 2014-04-14 10:56:22.000000000 +0200 @@ -1,5 +1,5 @@ [Grant nova-compute libvirt management permissions] -Identity=unix-user:openstack-nova +Identity=unix-user:nova Action=org.libvirt.unix.manage ResultAny=yes ResultInactive=yes -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit openstack-neutron for openSUSE:Factory
by root＠hilbert.suse.de 14 Apr '14

14 Apr '14

Hello community, here is the log from the commit of package openstack-neutron for openSUSE:Factory checked in at 2014-04-14 10:56:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openstack-neutron (Old) and /work/SRC/openSUSE:Factory/.openstack-neutron.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openstack-neutron" Changes: -------- --- /work/SRC/openSUSE:Factory/openstack-neutron/openstack-neutron-doc.changes 2013-10-02 08:51:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.openstack-neutron.new/openstack-neutron-doc.changes 2014-04-14 10:56:15.000000000 +0200 @@ -1,0 +2,275 @@ +Fri Mar 7 10:41:12 UTC 2014 - speilicke(a)suse.com + +- Update to version neutron-2014.1.dev36.g005fec6: + * One Convergence Neutron Plugin Implementation + * NEC plugin: delete old OFC ID mapping tables + * Imported Translations from Transifex + * Fix typo in migration script + * BigSwitch: Add SSL Certificate Validation + * BigSwitch: Auto re-sync on backend inconsistencies + 2014.1.b3 + * Add OpenDaylight ML2 MechanismDriver + * Replaces network:* strings by constants + * NSX: passing wrong security_group id mapping to nsx backend + * ovs-agent: use hexadecimal IP address in tunnel port name + * Fix DetachedInstanceError for Agent instance + +------------------------------------------------------------------- +Thu Mar 6 06:17:35 UTC 2014 - cloud-devel(a)suse.de + +- Update to version neutron-2014.1.dev458.g17698d6: + * Adds the missing migration for gw_ext_mode + * VPNaaS Service Driver for Cisco CSR + * Updated from global requirements + * Do fip_status migration only for l3-capable plugins + * Fix race condition in update_floatingip_statuses + * Implementaion of Mechanism driver for Brocade VDX cluster of switches + * Avoid unnecessarily checking the existence of a device + * Refactor netns.execute so that it is not necessary to check namespace + * Minor refactoring for Hyper-V utils and tests + * Adds Hyper-V Security Groups implementation + * Adds multiple RPC worker processes to neutron server + * NEC plugin: PFC packet fitler support + * Remove unused method update_fixed_ip_lease_expiration + * NSX: make sync backend run more often + * Use database session from the context in N1kv plugin + * ML2 mechanism driver access to binding details + * Reset the policy after loading extensions + * L3 agent fetches the external network id once + +------------------------------------------------------------------- +Wed Mar 5 00:46:28 UTC 2014 - cloud-devel(a)suse.de + +- Update to version neutron-2014.1.dev422.g9c47fa1: + * Rename migration lb_stats_needs_bigint to match revision number + * Imported Translations from Transifex + * Different class names for VPNaaS migrations + * ML2: database needs to be initalized after drivers loaded + * replace rest of q_exc to n_exc in code base + * Fix NVP/Nicira nits + * Embrane Plugin fails alembic migrations + * Implement Mellanox ML2 MechanismDriver + * Remove unused 'as e' in exception blocks + * Improves Arista's ML2 driver's sync performance + * Remove pyudev dependency + * Fix class name typo in test_db_rpc_base + +------------------------------------------------------------------- +Tue Mar 4 00:55:59 UTC 2014 - cloud-devel(a)suse.de + +- Update to version neutron-2014.1.dev398.g78366ad: + * Remove nvplib and move utility methods into nsxlib + * BigSwitch: Add address pair support to plugin + * Support advanced NVP IPsec VPN Service + * Fix NVP FWaaS errors when creating firewall without policy + * Avoid using "raise" to reraise with modified exception + * BigSwitch: Stop using external locks + * Make sure dnsmasq can distinguish IPv6 address from MAC address + * Move db migration of ml2 security groups to havana + +------------------------------------------------------------------- +Mon Mar 3 11:44:05 UTC 2014 - cloud-devel(a)suse.de + +- Update to version neutron-2014.1.dev383.ge99f84c: + * Remove vim line from db migartion template + * Imported Translations from Transifex + * Implement OpenFlow Agent mechanism driver + * Log configuration values for OVS agent + * BigSwitch: Asynchronous rest calls for port create + * Openvswitch update_port should return updated port info + * Change tenant network type usage for IB Fabric + +------------------------------------------------------------------- +Mon Mar 3 01:25:15 UTC 2014 - cloud-devel(a)suse.de + +- Update to version neutron-2014.1.dev369.g4e4c894: + * Remove call to addCleanup(cfg.CONF.reset) + * nec plugin: Avoid long transaction in delete_ports + * Imported Translations from Transifex + * Finish off rebranding of the Nicira NVP plugin + * Introduce status for floating IPs + * BigSwitch: Add agent to support neutron sec groups + * Adds the new IBM SDN-VE plugin + * Imported Translations from Transifex + * Nuage Networks Plugin + * Fixes spelling error Closes-Bug: #1284257 + * Updated from global requirements + * Change firewall to DOWN when admin state down + * NSX: add missing space 'routeron' + * Imported Translations from Transifex + * Update License Headers to replace Nicira with VMware + * Renaming plugin-specific exceptions to match NSX + * Imported Translations from Transifex + * DB Mappings for NSX security groups + * NSX: port status must reflect fabric, not link status + * Typo/grammar fixes for the example neutron config file + * NSX: Pass NSX uuid when plugging l2 gw attachment + * stats table needs columns to be bigint + * Remove import extension dep from db migration + * Fix get_vif_port_by_id to only return relevant ports + * Fix NSX migration path + * Add user-supplied arguments in log_handler + * Imported Translations from Transifex + * NSX: Fix newly created port's status should be DOWN + * Rename/refactoring of NVP api client to NSX + * Rename DB models and related resources for VMware NSX plugin + +------------------------------------------------------------------- +Mon Feb 24 01:31:22 UTC 2014 - cloud-devel(a)suse.de + +- Update to version neutron-2014.1.dev253.g07a467d: + * Updated from global requirements + * Imported Translations from Transifex + * Raise max header size to accommodate large tokens + * NSX: get_port_status passed wrong id for network + * remove pointless test TestN1kvNonDbTest + * Use "!=" instead of "is not" when comparing two values + * ML2/vxlan/test: remove unnecessary self.addCleanup(cfg.CONF.reset) + * Adds https support for metadata agent + * wsgi.run_server no longer used + * Implements an LBaaS driver for NetScaler devices + * Improve unit test coverage for Cisco plugin model code + * ipt_mgr.ipv6 written in the wrong ipt_mgr.ipv4 + * Update help message of flag 'enable_isolated_metadata' + * Fix invalid facilities documented in rootwrap.conf + * Remove dependent module py3kcompat + * Use six.StringIO/BytesIO instead of StringIO.StringIO + * remove unused imports + * Ensure that session is rolled back on bulk creates + * add router_id to response for CRU on fw/vip objs + * Sync latest oslo.db code into neutron + * Extending quota support for neutron LBaaS entities + +------------------------------------------------------------------- +Sun Feb 23 00:52:28 UTC 2014 - cloud-devel(a)suse.de + +- Update to version neutron-2014.1.dev211.gbd55a52: + * Reset API naming scheme for VMware NSX plugin + * Rename Security Groups related methods for VMware NSX plugin + * Rename L2 Switch/Gateway related methods for VMware NSX plugin + * Rename Router related methods for VMware NSX plugin + * Plugins should call __init__ of db_base_plugin for db.configure + * Fixes broken documentation hyperlinks + * Imported Translations from Transifex + * Add support to request vnic type on port + * Fix typo in service_drivers.ipsec + * Add additional unit tests for the ML2 plugin + * Don't document non-existing flag '--hide-elapsed' + * Removes an incorrect and unnecessary return + * L3 Agent restart causes network outage + +------------------------------------------------------------------- +Sat Feb 22 01:23:51 UTC 2014 - cloud-devel(a)suse.de + +- Update to version neutron-2014.1.dev186.g4d72fe0: + * Imported Translations from Transifex + * Don't require passing in port_security=False if security_groups present + * Use different context for each API request in unit tests + * Sync minimum requirements + * Copy cache package from oslo-incubator + * BigSwitch: Move config and REST to diff modules + * tests/unit: Initialize core plugin in TestL3GwModeMixin + * Fix request timeout errors during calls to NSX controller + * Fix ValueError in ip_lib.IpRouteCommand.get_gateway() + * LBaaS: move agent based driver files into a separate dir + * Refactor to remove _recycle_ip + +------------------------------------------------------------------- +Fri Feb 21 01:49:12 UTC 2014 - cloud-devel(a)suse.de + +- Update to version neutron-2014.1.dev165.g9f1bdec: + * vshield task manager: abort tasks in stop() on termination + * Revert "Skip a test for nicira service plugin" + * Validate rule uuids provided for update_policy + * Add update from agent to plugin on device up + * Parse JSON in ovs_lib.get_vif_port_by_id + +------------------------------------------------------------------- +Thu Feb 20 01:40:30 UTC 2014 - cloud-devel(a)suse.de + +- Update to version neutron-2014.1.dev155.gf0182a1: + * Imported Translations from Transifex + * Remove unused RPC calls from n1kv plugin code + +------------------------------------------------------------------- +Wed Feb 19 01:13:00 UTC 2014 - cloud-devel(a)suse.de + +- Update to version neutron-2014.1.dev151.g7fb2d57: ++++ 78 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/openstack-neutron/openstack-neutron-doc.changes ++++ and /work/SRC/openSUSE:Factory/.openstack-neutron.new/openstack-neutron-doc.changes --- /work/SRC/openSUSE:Factory/openstack-neutron/openstack-neutron.changes 2014-01-23 15:50:39.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.openstack-neutron.new/openstack-neutron.changes 2014-04-14 10:56:16.000000000 +0200 @@ -2 +2,575 @@ -Thu Jan 16 10:01:19 UTC 2014 - bwiedemann(a)suse.com +Wed Apr 9 17:01:40 UTC 2014 - dmueller(a)suse.com + +- update to 2014.1.rc2: + * no real changes + +------------------------------------------------------------------- +Tue Apr 8 11:48:27 UTC 2014 - dmueller(a)suse.com + +- add 0001-Start-ping-listener-also-for-postgresql.patch +- Switch over to Icehouse branch + +------------------------------------------------------------------- +Tue Apr 1 13:41:07 UTC 2014 - speilicke(a)suse.com + +- Update to version 2014.1.rc1: + * BigSwitch: Semaphore on port status update + * Add Icehouse no-op migration + * Imported Translations from Transifex + * Invoke _process_l3_create within plugin session + * Add missing parameters for port creation + * Cancelling thread start while unit tests running + * Delete duplicate external devices in router namespace + * UT: do not hide an original error in test resource ctxtmgr + * BigSwitch: Move attr ref after error check + * Fix namespace exist() method + * Make dnsmasq aware of all names + * Prevent cross plugging router ports from other tenants + * Adds OVS_HYBRID_PLUG flag to portbindings + * Disable XML tests on Py26 + * Subnets should be set as lazy='join' + * nec plugin: allow to delete resource with ERROR status + * Synced rpc and gettextutils modules from oslo-incubator + * Import request_id middleware bug fix from oslo + * Migrate data from cap_port_filter to vif_details + * Imported Translations from Transifex + * Include cisco plugin in migration plugins with ovs + * ML2 Cisco Nexus MD: Remove workaround for bug 1276395 + * Replace a usage of the deprecated root_helper option + * Add script to migrate ovs or lb db to ml2 db + * Correct OVS VXLAN version check + * LBaaS: make device driver decide whether to deploy instance + * Imported Translations from Transifex + * Remove extra space in help string + * Add enable_security_group to BigSwitch and OneConvergence ini files + * Add nec plugin to allowed address pairs migration + * Imported Translations from Transifex + * Fix segment allocation tables in Cisco N1kv plugin + * Updated from global requirements + * NEC plugin: Rename quantum_id column to neutron_id + * Log received pool.status + * NEC plugin: Allow to add prefix to OFC REST URL + * NEC plugin: Remove a colon from binding:profile key due to XML problem + * rename ACTIVE_PENDING to ACTIVE_PENDING_STATUSES + * VPNaaS support for VPN service admin state change and reporting + * Use save_and_reraise_exception when reraise exception + * Return meaningful error message on pool creation error + * Don't set priority when calling mod_flow + * Avoid creating FixedIntervalLoopingCall in agent UT + * Imported Translations from Transifex + * Big Switch Plugin: No REST port delete on net del + * Add enable_security_group option + * Get rid of additional db contention on fetching VIP + * Fix typo in lbaas agent exception message + * ML2: Remove validate_port_binding() and unbind_port() + * Imported Translations from Transifex + * Fix duplicate name of NVP LBaaS objs not allowed on vShield Edge + * tests/unit: clean up notification driver + * Add a semaphore to some ML2 operations + * Log dnsmasq host file generation + * add HEAD sentinel file that contains migration revision + * Added config value help text in ns metadata proxy + * Fix usage of save_and_reraise_exception + * Cisco VPN device driver post-merge cleanup + * Fixes the Hyper-V agent individual ports metrics + * Sync excutils from oslo + * BigSwitch ML2: Include bound_segment in port + * NEC plugin: Honor Retry-After response from OFC + * Add update binding:profile with physical_network + * return false or true according to binding result + * Enable to select an RPC handling plugin under Metaplugin + * Ensure to count firewalls in target tenant + * Mock agent RPC for FWaaS tests to delete DB objs + * Allow CIDRs with non-zero masked portions + * Cisco plugin fails with ParseError no elem found + * Cisco Nexus: maximum recursion error in ConnectionContext.__del__ + * Don't use root to list namespaces + * Fixes Hyper-V agent security groups enable issue + * ML2 BigSwitch: Don't modify parent context + * LBaaS: small cleanup in agent device driver interface + * Change report_interval from 4 to 30, agent_down_time from 9 to 75 + * Stop removing ip allocations on port delete + * Imported Translations from Transifex + * Ignore PortNotFound exceptions on lockless delete + * Show neutron API request body with debug enabled + * Add session persistence support for NVP advanced LBaaS + * Fix misleading error message about failed dhcp notifications + * NSX: Fix router-interface-delete returns 404 when router not in nsx + * BigSwitch: Watchdog thread start after servers + * Calculate stateless IPv6 address + * Create new IPv6 attributes for Subnets + * Remove individual cfg.CONF.resets from tests + * BigSwitch: Sync workaround for port del deadlock + * NSX: Ensure gateway devices are usable after upgrade + * Process ICMP type for iptables firewall + * Imported Translations from Transifex + * Added missing l3_update call in update_network + * ML2 plugin involves in agent_scheduler migration + * Imported Translations from Transifex + * Avoid long transaction in plugin.delete_ports() + * cisco: Do not change supported_extension_aliases directly + * Fix KeyError except on router_info in FW Agent + * NSX: remove last of unneed quantum references + * NSX: fix intermetting UT failure on vshield test_router_create + * Bugfix and refactoring for ovs_lib flow methods + * Send fdb remove message when a port is migrated + * Imported Translations from Transifex + * Send network-changed notifications to nova + * Notify nova when ports are ready + * Skip radware failing test for now + * NSX: Propagate name updates for security profiles + * Fix in admin_state_up check function + * NSX: lower the severity of messages about VIF's on external networks + * Kill 'Skipping unknown group key: firewall_driver' log trace + * Imported Translations from Transifex + * API layer documentation + * BigSwitch: Use eventlet.sleep in watchdog + * Embrane LBaaS Driver + * BigSwitch: Widen range of HTTPExceptions caught + * Fix ml2 & nec plugins for allowedaddresspairs tests + * Fix unittest failure in radware lbaas driver + * Removes calls to mock.patch.stopall in unit tests + * Stop mock patches by default in base test class + * Query for port before calling l3plugin.disassociate_floatingips() + * Optimize floating IP status update + * NSX: Allow multiple references to same gw device + * VPNaaS Device Driver for Cisco CSR + * Updated from global requirements + * BigSwitch: Fix certificate file helper functions + * Create agents table when ML2 core_plugin is used + * Fix usage of sqlalchemy type Integer + * Fixing lost vlan ids on interfaces + * Fix bug:range() is not same in py3.x and py2.x + * Call target plugin out of DB transaction in the Metaplugin + * NSX: Sync do not pass around model object + * NSX: Make replication mode configurable + * Updated from global requirements + * Fix ml2 db migration of subnetroutes table + * Imported Translations from Transifex + * After bulk create send DHCP notification + * Fix lack of extended port's attributes in Metaplugin + * Add missing ondelete option to Cisco N1kv tables + * Migration support for Mellanox Neutron plugin + * Imported Translations from Transifex + * Imported Translations from Transifex + * Updated from global requirements + * Add support for tenant-provided NSX gateways devices + * NSX: fix nonsensical log trace on update port + * BigSwitch: Fix rest call in consistency watchdog + * BigSwitch: Fix cfg.Error format in exception + * BigSwitch: Fix error for server config check + * Fixed Spelling error in Readme + * Adds state reporting to SDN-VE agent + * Fix unittest failure in radware lbaas driver + * NSX: Add ability to retry on 503's returned by the controller + * Cisco Neutron plugin fails DB migration + * Floatingip_status migration not including Embrane's plugin + * One Convergence Neutron Plugin l3 ext support + * Nuage plugin was missed in floatingip_status db migration script + * ML2 Cisco Nexus MD: VM migration support + * Drop old nvp extension file + * Makes the Extension loader behavior predictable + * One Convergence Neutron Plugin Implementation + * NEC plugin: delete old OFC ID mapping tables + * Imported Translations from Transifex + * Fix typo in migration script + * Enhance GET networks performance of metaplugin + * Adds the missing migration for gw_ext_mode + * BigSwitch: Add SSL Certificate Validation + * BigSwitch: Auto re-sync on backend inconsistencies + * VPNaaS Service Driver for Cisco CSR +- New sub-package nvsd-agent for the One Convergence NVSD Controller + pluging agent. The plugin is still part of the base package (same + as with most other plugins) + +------------------------------------------------------------------- +Tue Mar 25 12:16:55 UTC 2014 - dmueller(a)suse.com + +- fix agent/plugin config ordering + +------------------------------------------------------------------- +Mon Mar 17 10:40:59 UTC 2014 - rhafer(a)suse.com + +- switch over to non-openstack-prefix'ed users + +------------------------------------------------------------------ +Fri Mar 7 10:41:16 UTC 2014 - speilicke(a)suse.com ++++ 1091 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/openstack-neutron/openstack-neutron.changes ++++ and /work/SRC/openSUSE:Factory/.openstack-neutron.new/openstack-neutron.changes Old: ---- 0001-Reassign-IP-to-vlan-interface-when-deleting-a-VLAN-b.patch neutron-stable-havana.tar.gz New: ---- 0001-Only-enable-IP6Tables-managing-if-IPv6-is-available.patch 0001-Start-ping-listener-also-for-postgresql.patch neutron-2014.1.rc2.tar.gz openstack-neutron.conf ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openstack-neutron-doc.spec ++++++ --- /var/tmp/diff_new_pack.zD7nMc/_old 2014-04-14 10:56:16.000000000 +0200 +++ /var/tmp/diff_new_pack.zD7nMc/_new 2014-04-14 10:56:16.000000000 +0200 @@ -19,13 +19,13 @@ %define component neutron Name: openstack-neutron-doc -Version: 2013.2.2.dev15.g5bbc2f0 +Version: 2014.1.rc2 Release: 0 Summary: OpenStack Virtual Network Service (Neutron) - Documentation License: Apache-2.0 Group: Documentation/HTML Url: https://launchpad.net/neutron -Source: neutron-stable-havana.tar.gz +Source: http://tarballs.openstack.org/neutron/neutron-%{version}.tar.gz BuildRequires: openstack-suse-macros BuildRequires: python-Paste BuildRequires: python-PasteDeploy @@ -37,7 +37,6 @@ BuildRequires: python-alembic BuildRequires: python-configobj BuildRequires: python-devel -BuildRequires: python-distribute BuildRequires: python-eventlet BuildRequires: python-extras BuildRequires: python-iso8601 @@ -49,6 +48,7 @@ BuildRequires: python-neutronclient BuildRequires: python-nose BuildRequires: python-pyudev +BuildRequires: python-setuptools BuildRequires: python-unittest2 BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -59,7 +59,7 @@ This package contains documentation files for openstack-%{component} %prep -%setup -q -n neutron-2013.2.2.dev15.g5bbc2f0 +%setup -q -n %{component}-%{version} %openstack_cleanup_prep %build ++++++ openstack-neutron.spec ++++++ --- /var/tmp/diff_new_pack.zD7nMc/_old 2014-04-14 10:56:16.000000000 +0200 +++ /var/tmp/diff_new_pack.zD7nMc/_new 2014-04-14 10:56:16.000000000 +0200 @@ -17,33 +17,35 @@ %define component neutron -%define groupname openstack-%{component} -%define username openstack-%{component} +%define groupname %{component} +%define username %{component} Name: openstack-neutron -Version: 2013.2.2.dev15.g5bbc2f0 +Version: 2014.1.rc2 Release: 0 Summary: OpenStack Network License: Apache-2.0 Group: System/Management Url: https://launchpad.net/neutron -Source: neutron-stable-havana.tar.gz +Source: http://tarballs.openstack.org/neutron/neutron-%{version}.tar.gz Source1: openstack-%{component}.init Source2: %{name}.logrotate Source3: neutron-sudoers Source4: openstack-%{component}-plugin.init Source5: sysconfig.neutron Source6: openstack-%{component}-ovs-cleanup.init -# PATCH-FIX-UPSTREAM: Reassign IP to vlan interface when deleting a VLAN bridge -# https://launchpad.net/bugs/1255153 -Patch1: 0001-Reassign-IP-to-vlan-interface-when-deleting-a-VLAN-b.patch +%if 0%{?suse_version} > 1230 +Source10: %name.conf +BuildRequires: systemd +%endif +Patch1: 0001-Only-enable-IP6Tables-managing-if-IPv6-is-available.patch +Patch2: 0001-Start-ping-listener-also-for-postgresql.patch BuildRequires: crudini BuildRequires: fdupes BuildRequires: openstack-suse-macros BuildRequires: openstack-suse-sudo BuildRequires: python-devel BuildRequires: python-pbr -BuildRequires: python-setuptools # Documentation build requirements: BuildRequires: python-Sphinx Requires: logrotate @@ -88,20 +90,20 @@ Requires: python-anyjson >= 0.3.3 Requires: python-eventlet >= 0.13.0 Requires: python-greenlet >= 0.3.2 -Requires: python-httplib2 -Requires: python-iso8601 >= 0.1.8 +Requires: python-httplib2 >= 0.7.5 +Requires: python-iso8601 >= 0.1.9 Requires: python-jsonrpclib -Requires: python-keystoneclient >= 0.3.2 +Requires: python-keystoneclient >= 0.7.0 Requires: python-kombu >= 2.4.8 -Requires: python-netaddr -Requires: python-neutronclient >= 2.3.0 -Requires: python-novaclient >= 2.15.0 +Requires: python-netaddr >= 0.7.6 +Requires: python-neutronclient >= 2.3.4 +Requires: python-novaclient >= 2.17.0 Requires: python-oslo.config >= 1.2.0 -Requires: python-pbr >= 0.5.21 -Requires: python-pyudev +Requires: python-oslo.rootwrap +Requires: python-pbr >= 0.6 Requires: python-requests >= 1.1 -Requires: python-six >= 1.4.1 -Requires: python-stevedore >= 0.10 +Requires: python-six >= 1.5.2 +Requires: python-stevedore >= 0.14 Provides: python-quantum = 2013.2.0 Obsoletes: python-quantum < 2013.2.0 @@ -157,6 +159,7 @@ Summary: OpenStack Network - Load Balancing Agent Group: Development/Languages/Python PreReq: %name = %version +Requires: haproxy Provides: openstack-quantum-lbaas-agent = 2013.2.0 Obsoletes: openstack-quantum-lbaas-agent < 2013.2.0 @@ -185,6 +188,14 @@ %description metadata-agent This package provides the Meta Data Agent. +%package restproxy-agent +Summary: OpenStack Network - REST Proxy Agent +Group: Development/Languages/Python +PreReq: %name = %version + +%description restproxy-agent +This package provides the REST Proxy Agent. + %package metering-agent Summary: OpenStack Network - Metering Agent Group: Development/Languages/Python @@ -203,6 +214,27 @@ %description mlnx-agent This package provides the Mellanox Agent +%package vmware-agent +Summary: OpenStack Network - Nicira Plugin +Group: Development/Languages/Python +PreReq: %name = %version +Requires: openvswitch-switch +Provides: openstack-quantum-vmware-agent = 2014.1.0 +Obsoletes: openstack-quantum-vmware-agent < 2014.1.0 + +%description vmware-agent +This package contains the OpenStack Network plugin that implements virtual +networks using Nicira NVP. + +%package ibm-agent +Summary: OpenStack Network - IBM Agent +Group: Development/Languages/Python +PreReq: %name = %version +Provides: openstack-neutron-agent = %version + +%description ibm-agent +This package provides the IBM Agent. + %package nec-agent Summary: OpenStack Network - NEC Agent Group: Development/Languages/Python @@ -230,41 +262,37 @@ Group: Development/Languages/Python Provides: openstack-neutron-agent = %version PreReq: %name = %version -Requires: openvswitch +Requires: openvswitch-switch Provides: openstack-quantum-openvswitch-agent = 2013.2.0 Obsoletes: openstack-quantum-openvswitch-agent < 2013.2.0 %description openvswitch-agent This package provides the OpenVSwitch Agent. -%package vmware-agent -Summary: OpenStack Network - VMWare NSX -Group: Development/Languages/Python -Provides: openstack-neutron-agent = %version -PreReq: %name = %version -Requires: openvswitch -Provides: openstack-quantum-vmware-agent = 2013.2.0 -Obsoletes: openstack-quantum-vmware-agent < 2013.2.0 - -%description vmware-agent -This package contains the OpenStack Network plugin that implements virtual -networks using Nicira NVP. - %package vpn-agent Summary: OpenStack Network - VPN Agent Group: Development/Languages/Python PreReq: %name = %version +Requires: strongswan %description vpn-agent This package provides the VPN Agent. +%package nvsd-agent +Summary: OpenStack Network - One Convergence NVSD Agent +Group: Development/Languages/Python +PreReq: %name = %version + +%description nvsd-agent +This package provides the One Convergence NVSD Agent. + %package plugin-cisco Summary: OpenStack Network - Cisco Plugin (openvswitch based) Group: Development/Languages/Python Provides: openstack-neuton-plugin-cisco = %version PreReq: %name = %version PreReq: %name-server = %version -Requires: openvswitch +Requires: openvswitch-switch Requires: python >= 2.6.8 Requires: python-configobj Requires: python-ncclient @@ -279,20 +307,14 @@ Requires: python-WebTest >= 2.0 Requires: python-cliff >= 1.4.3 Requires: python-configobj -Requires: python-coverage >= 3.6 %if 0%{?suse_version} && 0%{?suse_version} <= 1110 Requires: python-discover %endif Requires: python-fixtures >= 0.3.14 -Requires: python-flake8 >= 2.0 -Requires: python-hacking >= 0.5.6 Requires: python-mock >= 1.0 -Requires: python-mox >= 0.5.3 -Requires: python-pep8 >= 1.4.5 -Requires: python-pyflakes >= 0.7.2 -Requires: python-python-subunit -Requires: python-testrepository >= 0.0.17 -Requires: python-testtools >= 0.9.32 +Requires: python-python-subunit >= 0.0.18 +Requires: python-testrepository >= 0.0.18 +Requires: python-testtools >= 0.9.34 Provides: openstack-quantum-test = 2013.2.0 Obsoletes: openstack-quantum-test < 2013.2.0 @@ -301,10 +323,10 @@ of OpenStack Neutron. %prep -%setup -q -n neutron-2013.2.2.dev15.g5bbc2f0 +%setup -q -n %{component}-%{version} %patch1 -p1 -## comment me in -# %xopenstack_cleanup_prep +%patch2 +%openstack_cleanup_prep %build python setup.py build @@ -314,12 +336,16 @@ python setup.py install --skip-build --prefix=%{_prefix} --root=%{buildroot} --install-data=/ ### directories -install -d -m 755 %{buildroot}%{_localstatedir}/run/%{component} -install -d -m 755 %{buildroot}%{_localstatedir}/log/%{component} -install -d -m 755 %{buildroot}%{_localstatedir}/lib/%{component} +install -d -m 755 %{buildroot}%{_localstatedir}/{lib,log}/%{component} +install -d -m 750 %{buildroot}%{_localstatedir}/cache/%{component} +install -d -m 700 %{buildroot}%{_localstatedir}/run/%{component} +%if 0%{?suse_version} > 1230 +install -D -m 644 %{SOURCE10} %{buildroot}/%_tmpfilesdir/%name.conf +%endif ### configuration files # all needed files are installed automatically +install -d -m 755 %{buildroot}%{_sysconfdir}/%{component} install -p -D -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} ### init scripts @@ -335,11 +361,13 @@ hyperv-agent \ openvswitch-agent \ linuxbridge-agent \ - vmware-agent \ metadata-agent \ + restproxy-agent \ metering-agent \ + vmware-agent \ mlnx-agent \ vpn-agent \ + nvsd-agent ) agentPaths=( /etc/%{component}/l3_agent.ini \ @@ -348,11 +376,13 @@ /etc/%{component}/plugins/hyperv/hyperv_neutron_plugin.ini \ /etc/%{component}/plugins/openvswitch/ovs_neutron_plugin.ini \ /etc/%{component}/plugins/linuxbridge/linuxbridge_conf.ini \ - /etc/%{component}/plugins/nicira/nvp.ini \ /etc/%{component}/metadata_agent.ini \ + /etc/%{component}/plugins/ml2/restproxy.ini \ /etc/%{component}/metering_agent.ini \ + /etc/%{component}/plugins/vmware/nsx.ini \ /etc/%{component}/plugins/mlnx-agent.ini \ /etc/%{component}/vpn_agent.ini \ + /etc/%{component}/plugins/oneconvergence/nvsdplugin.ini ) for i in ${!agents[@]} ; do @@ -377,17 +407,24 @@ install -m 644 doc/build/man/*.1 %{buildroot}%{_mandir}/man1 ## SUSE configuration defaults -crudini --set %{buildroot}/etc/neutron/neutron.conf DEFAULT verbose True -crudini --set %{buildroot}/etc/neutron/neutron.conf DEFAULT core_plugin neutron.plugins.ml2.plugin.Ml2Plugin -crudini --set %{buildroot}/etc/neutron/neutron.conf DEFAULT service_plugins neutron.services.l3_router.l3_router_plugin.L3RouterPlugin -crudini --set %{buildroot}/etc/neutron/neutron.conf agent root_helper "sudo neutron-rootwrap /etc/neutron/rootwrap.conf" -crudini --set %{buildroot}/etc/neutron/neutron.conf DEFAULT log_dir /var/log/neutron -crudini --set %{buildroot}/etc/neutron/dhcp_agent.ini DEFAULT interface_driver neutron.agent.linux.interface.BridgeInterfaceDriver +%define neutron_conf %{buildroot}/etc/neutron/neutron.conf +%define plugin_dir %{buildroot}/etc/neutron/plugins/ +crudini --set %{neutron_conf} DEFAULT verbose True +crudini --set %{neutron_conf} DEFAULT core_plugin neutron.plugins.ml2.plugin.Ml2Plugin +crudini --set %{neutron_conf} DEFAULT service_plugins "neutron.services.l3_router.l3_router_plugin.L3RouterPlugin, neutron.services.loadbalancer.plugin.LoadBalancerPlugin, neutron.services.vpn.plugin.VPNDriverPlugin" +crudini --set %{neutron_conf} DEFAULT state_path /var/lib/neutron +crudini --set %{neutron_conf} agent root_helper "sudo neutron-rootwrap /etc/neutron/rootwrap.conf" +crudini --set %{neutron_conf} DEFAULT log_dir /var/log/neutron +crudini --set %{neutron_conf} DEFAULT lock_path /var/run/%component +crudini --set %{neutron_conf} keystone_authtoken signing_dir /var/cache/%component/keystone-signing +for i in dhcp_agent.ini l3_agent.ini lbaas_agent.ini; do + crudini --set %{buildroot}/etc/neutron/$i DEFAULT interface_driver neutron.agent.linux.interface.BridgeInterfaceDriver +done crudini --set %{buildroot}/etc/neutron/l3_agent.ini DEFAULT external_network_bridge "br-ex" crudini --set %{buildroot}/etc/neutron/l3_agent.ini DEFAULT external_network_bridge "" -crudini --set %{buildroot}/etc/neutron/l3_agent.ini DEFAULT interface_driver neutron.agent.linux.interface.BridgeInterfaceDriver -crudini --set %{buildroot}/etc/neutron/plugins/ml2/ml2_conf.ini ml2 mechanism_drivers linuxbridge -crudini --set %{buildroot}/etc/neutron/plugins/ml2/ml2_conf.ini securitygroup firewall_driver neutron.agent.linux.iptables_firewall.IptablesFirewallDriver +crudini --set %plugin_dir/ml2/ml2_conf.ini ml2 mechanism_drivers linuxbridge +crudini --set %plugin_dir/ml2/ml2_conf.ini securitygroup firewall_driver neutron.agent.linux.iptables_firewall.IptablesFirewallDriver +crudini --set %plugin_dir/linuxbridge/linuxbridge_conf.ini securitygroup firewall_driver neutron.agent.linux.iptables_firewall.IptablesFirewallDriver ### test subpackage %openstack_test_package_install @@ -395,7 +432,7 @@ #TODO/FIXME: there's an upstream discussion on how to install these, # it's related to setuptools_git / MANIFEST.in issues. -for i in neutron/tests/unit/nicira/etc/* \ +for i in \ neutron/tests/etc/rootwrap.d/neutron.test.filters \ neutron/tests/etc/api-paste.ini.test \ neutron/tests/etc/neutron.conf.test ; do @@ -415,9 +452,7 @@ mkdir -p %{buildroot}%{_localstatedir}/cache/%{component} %pre -getent group %{groupname} > /dev/null || groupadd -r %{groupname} -getent passwd %{username} > /dev/null || useradd -r -g %{groupname} -d %{_localstatedir}/lib/neutron -s /sbin/nologin -c "Openstack Neutron Daemons" %{username} -exit 0 +%openstack_pre_user_group_create %{username} %{groupname} %post server %{fillup_and_insserv -f openstack-%{component}} @@ -441,37 +476,43 @@ %config(noreplace) %{_sysconfdir}/%{component}/api-paste.ini %config %{_sysconfdir}/%{component}/policy.json %config(noreplace) %attr(0640, root, %{groupname}) %{_sysconfdir}/%{component}/neutron.conf -%config(noreplace) %attr(0640, root, %{groupname}) %{_sysconfdir}/%{component}/fwaas_driver.ini %config %{_sysconfdir}/%{component}/rootwrap.conf %dir %{_sysconfdir}/%{component}/rootwrap.d/ -%ghost %dir %attr(0755, %{username}, root) %{_localstatedir}/run/%{component} -%dir %attr(0755, %{username}, root) %{_localstatedir}/lib/%{component} -%dir %attr(0755, %{username}, %{groupname}) %{_localstatedir}/cache/%{component} -%dir %attr(0755, %{username}, %{groupname}) %{_localstatedir}/log/%{component} +%dir %attr(0755, %{username}, %{groupname}) %{_localstatedir}/lib/%{component} +%dir %attr(0750, %{username}, %{groupname}) %{_localstatedir}/log/%{component} +%dir %attr(0750, %{username}, %{groupname}) %{_localstatedir}/cache/%{component} +%if 0%{?suse_version} > 1230 +%ghost %dir %attr(700,%{username},%{groupname}) %{_localstatedir}/run/%{component} +%_tmpfilesdir/%name.conf +%else +%dir %attr(0700, %{username}, %{groupname}) %{_localstatedir}/run/%{component} +%endif %dir %{_sysconfdir}/%{component}/plugins %dir %{_sysconfdir}/%{component}/plugins/bigswitch/ %dir %{_sysconfdir}/%{component}/plugins/brocade/ %dir %{_sysconfdir}/%{component}/plugins/hyperv/ %dir %{_sysconfdir}/%{component}/plugins/metaplugin/ -%dir %{_sysconfdir}/%{component}/plugins/midonet -%dir %{_sysconfdir}/%{component}/plugins/ml2 -%dir %{_sysconfdir}/%{component}/plugins/nec/ +%dir %{_sysconfdir}/%{component}/plugins/midonet/ +%dir %{_sysconfdir}/%{component}/plugins/ml2/ +%dir %{_sysconfdir}/%{component}/plugins/oneconvergence/ %dir %{_sysconfdir}/%{component}/plugins/plumgrid/ -%dir %{_sysconfdir}/%{component}/plugins/ryu/ +%{_sysconfdir}/%{component}/plugins/bigswitch/README %config(noreplace) %{_sysconfdir}/%{component}/plugins/bigswitch/restproxy.ini +%config(noreplace) %{_sysconfdir}/%{component}/plugins/brocade/brocade.ini %config(noreplace) %{_sysconfdir}/%{component}/plugins/hyperv/hyperv_neutron_plugin.ini %config(noreplace) %{_sysconfdir}/%{component}/plugins/linuxbridge/linuxbridge_conf.ini %config(noreplace) %{_sysconfdir}/%{component}/plugins/metaplugin/metaplugin.ini %config(noreplace) %{_sysconfdir}/%{component}/plugins/midonet/midonet.ini %config(noreplace) %{_sysconfdir}/%{component}/plugins/ml2/ml2_conf.ini %config(noreplace) %{_sysconfdir}/%{component}/plugins/ml2/ml2_conf_arista.ini +%config(noreplace) %{_sysconfdir}/%{component}/plugins/ml2/ml2_conf_brocade.ini %config(noreplace) %{_sysconfdir}/%{component}/plugins/ml2/ml2_conf_cisco.ini -%config(noreplace) %{_sysconfdir}/%{component}/plugins/nec/nec.ini -%config(noreplace) %{_sysconfdir}/%{component}/plugins/brocade/brocade.ini -%config(noreplace) %{_sysconfdir}/%{component}/plugins/plumgrid/plumgrid.ini +%config(noreplace) %{_sysconfdir}/%{component}/plugins/ml2/ml2_conf_odl.ini +%config(noreplace) %{_sysconfdir}/%{component}/plugins/ml2/ml2_conf_ofa.ini +%config(noreplace) %{_sysconfdir}/%{component}/plugins/ml2/restproxy.ini %config(noreplace) %{_sysconfdir}/%{component}/plugins/openvswitch/ovs_neutron_plugin.ini -%config(noreplace) %{_sysconfdir}/%{component}/plugins/ryu/ryu.ini -%config %{_sysconfdir}/%{component}/rootwrap.d/debug.filters +%config(noreplace) %{_sysconfdir}/%{component}/plugins/plumgrid/plumgrid.ini +%config(noreplace) %{_sysconfdir}/%{component}/fwaas_driver.ini %config %{_sysconfdir}/%{component}/rootwrap.d/iptables-firewall.filters %{_bindir}/%{component}-debug %{_bindir}/quantum-debug @@ -536,6 +577,13 @@ %{_initddir}/openstack-%{component}-metadata-agent %{_sbindir}/rcopenstack-%{component}-metadata-agent +%files restproxy-agent +%defattr(-,root,root,-) +%doc LICENSE +%{_bindir}/%{component}-restproxy-agent +%{_initddir}/openstack-%{component}-restproxy-agent +%{_sbindir}/rcopenstack-%{component}-restproxy-agent + %files metering-agent %defattr(-,root,root,-) %doc LICENSE @@ -554,19 +602,46 @@ %{_initddir}/openstack-%{component}-mlnx-agent %{_sbindir}/rcopenstack-%{component}-mlnx-agent +%files vmware-agent +%defattr(-,root,root,-) +%doc LICENSE +%dir %{_sysconfdir}/%{component}/plugins/vmware/ +%dir %{_sysconfdir}/%{component}/plugins/nicira/ +%config(noreplace) %{_sysconfdir}/%{component}/plugins/vmware/nsx.ini +%config(noreplace) %{_sysconfdir}/%{component}/plugins/nicira/nvp.ini +%{_bindir}/quantum-check-nvp-config +%{_bindir}/neutron-nsx-manage +%{_bindir}/%{component}-check-nvp-config +%{_bindir}/%{component}-check-nsx-config +%{_initddir}/openstack-%{component}-vmware-agent +%{_sbindir}/rcopenstack-%{component}-vmware-agent + +%files ibm-agent +%defattr(-,root,root,-) +%doc LICENSE +%{_bindir}/%{component}-ibm-agent +%{_bindir}/quantum-ibm-agent +%dir %{_sysconfdir}/%{component}/plugins/ibm/ +%config(noreplace) %{_sysconfdir}/%{component}/plugins/ibm/sdnve_neutron_plugin.ini + %files nec-agent %defattr(-,root,root,-) %doc LICENSE %config %{_sysconfdir}/%{component}/rootwrap.d/nec-plugin.filters %{_bindir}/%{component}-nec-agent %{_bindir}/quantum-nec-agent +%dir %{_sysconfdir}/%{component}/plugins/nec/ +%config(noreplace) %{_sysconfdir}/%{component}/plugins/nec/nec.ini %files ryu-agent %defattr(-,root,root,-) %doc LICENSE %config %{_sysconfdir}/%{component}/rootwrap.d/ryu-plugin.filters %{_bindir}/%{component}-ryu-agent +%{_bindir}/%{component}-ofagent-agent %{_bindir}/quantum-ryu-agent +%dir %{_sysconfdir}/%{component}/plugins/ryu/ +%config(noreplace) %{_sysconfdir}/%{component}/plugins/ryu/ryu.ini %files linuxbridge-agent %defattr(-,root,root,-) @@ -592,16 +667,6 @@ %{_initddir}/openstack-%{component}-openvswitch-agent %{_sbindir}/rcopenstack-%{component}-openvswitch-agent -%files vmware-agent -%defattr(-,root,root,-) -%doc LICENSE -%dir %{_sysconfdir}/%{component}/plugins/nicira/ -%config(noreplace) %{_sysconfdir}/%{component}/plugins/nicira/nvp.ini -%{_initddir}/openstack-%{component}-vmware-agent -%{_sbindir}/rcopenstack-%{component}-vmware-agent -%{_bindir}/%{component}-check-nvp-config -%{_bindir}/quantum-check-nvp-config - %files vpn-agent %defattr(-,root,root,-) %doc LICENSE @@ -611,6 +676,15 @@ %{_sbindir}/rcopenstack-%{component}-vpn-agent %config %{_sysconfdir}/%{component}/rootwrap.d/vpnaas.filters +%files nvsd-agent +%defattr(-,root,root,-) +%doc LICENSE +%{_bindir}/neutron-nvsd-agent +%{_bindir}/quantum-nvsd-agent +%{_initddir}/openstack-%{component}-nvsd-agent +%{_sbindir}/rcopenstack-%{component}-nvsd-agent +%config(noreplace) %{_sysconfdir}/%{component}/plugins/oneconvergence/nvsdplugin.ini + %files server %defattr(-,root,root,-) %doc LICENSE @@ -639,5 +713,6 @@ %defattr(-,root,root) %{python_sitelib}/%{component}/tests/ %{_localstatedir}/lib/%{name}-test/ +%config %{_sysconfdir}/%{component}/rootwrap.d/debug.filters %changelog ++++++ 0001-Only-enable-IP6Tables-managing-if-IPv6-is-available.patch ++++++ >From a3e05bc83c9be019e0756e33f082291eb2a93079 Mon Sep 17 00:00:00 2001 From: Dirk Mueller <dirk(a)dmllr.de> Date: Fri, 10 Jan 2014 17:47:57 +0100 Subject: [PATCH] Only enable IP6Tables managing if IPv6 is available There is no point in trying to set up ip6tables when ipv6 support has been disabled (for whatever policy reason) Change-Id: Iff4b9d5d7376b272e4a3bf7a19b4cfaa9579de9b Closes-Bug: #1203611 --- neutron/agent/linux/iptables_manager.py | 2 +- neutron/agent/linux/utils.py | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) Index: neutron-2014.1.dev369.g4e4c894/neutron/agent/linux/iptables_manager.py =================================================================== --- neutron-2014.1.dev369.g4e4c894.orig/neutron/agent/linux/iptables_manager.py +++ neutron-2014.1.dev369.g4e4c894/neutron/agent/linux/iptables_manager.py @@ -279,7 +279,7 @@ class IptablesManager(object): else: self.execute = linux_utils.execute - self.use_ipv6 = use_ipv6 + self.use_ipv6 = use_ipv6 and linux_utils.is_ipv6_supported() self.root_helper = root_helper self.namespace = namespace self.iptables_apply_deferred = False Index: neutron-2014.1.dev369.g4e4c894/neutron/agent/linux/utils.py =================================================================== --- neutron-2014.1.dev369.g4e4c894.orig/neutron/agent/linux/utils.py +++ neutron-2014.1.dev369.g4e4c894/neutron/agent/linux/utils.py @@ -17,11 +17,13 @@ # # @author: Juliano Martinez, Locaweb. +import errno import fcntl import os import shlex import socket import struct +import sys import tempfile from eventlet.green import subprocess @@ -111,6 +113,29 @@ def replace_file(file_name, data): os.rename(tmp_file.name, file_name) +def is_ipv6_supported(): + has_ipv6_support = socket.has_ipv6 + try: + s = socket.socket(socket.AF_INET6, socket.SOCK_STREAM) + s.close() + except socket.error as e: + if e.errno == errno.EAFNOSUPPORT: + has_ipv6_support = False + else: + raise + + # check if there is at least one interface with ipv6 + if has_ipv6_support and sys.platform.startswith('linux'): + try: + with open('/proc/net/if_inet6') as f: + if not f.read(): + has_ipv6_support = False + except IOError: + has_ipv6_support = False + + return has_ipv6_support + + def find_child_pids(pid): """Retrieve a list of the pids of child processes of the given pid.""" ++++++ 0001-Start-ping-listener-also-for-postgresql.patch ++++++ Index: neutron/openstack/common/db/sqlalchemy/session.py =================================================================== --- neutron/openstack/common/db/sqlalchemy/session.py.orig +++ neutron/openstack/common/db/sqlalchemy/session.py @@ -670,7 +670,7 @@ def _thread_yield(dbapi_con, con_record) def _ping_listener(engine, dbapi_conn, connection_rec, connection_proxy): - """Ensures that MySQL and DB2 connections are alive. + """Ensures that MySQL, PostgreSQL or DB2 connections are alive. Borrowed from: http://groups.google.com/group/sqlalchemy/msg/a4ce563d802c929f @@ -686,6 +686,15 @@ def _ping_listener(engine, dbapi_conn, c if engine.dialect.is_disconnect(ex, dbapi_conn, cursor): msg = _('Database server has gone away: %s') % ex LOG.warning(msg) + + # if the database server has gone away, all connections in the pool + # have become invalid and we can safely close all of them here, + # rather than waste time on checking of every single connection + engine.dispose() + + # this will be handled by SQLAlchemy and will force it to create + # a new connection and retry the original action + raise sqla_exc.DisconnectionError(msg) else: raise @@ -768,7 +777,7 @@ def create_engine(sql_connection, sqlite sqlalchemy.event.listen(engine, 'checkin', _thread_yield) - if engine.name in ['mysql', 'ibm_db_sa']: + if engine.name in ('ibm_db_sa', 'mysql', 'postgresql'): callback = functools.partial(_ping_listener, engine) sqlalchemy.event.listen(engine, 'checkout', callback) if engine.name == 'mysql': ++++++ _service ++++++ --- /var/tmp/diff_new_pack.zD7nMc/_old 2014-04-14 10:56:16.000000000 +0200 +++ /var/tmp/diff_new_pack.zD7nMc/_new 2014-04-14 10:56:16.000000000 +0200 @@ -1,7 +1,13 @@ <services> - <service name="git_tarballs" mode="disabled"> - <param name="url">http://tarballs.openstack.org/neutron/neutron-stable-havana.tar.gz</param> - <param name="email">opensuse-cloud(a)opensuse.org</param> - <param name="plain-version">True</param> + <service mode="disabled" name="download_files"> + <param name="changesgenerate">enable</param> + </service> + <service mode="disabled" name="set_version"> + <param name="basename">neutron</param> + </service> + <service mode="disabled" name="python_requires"> + </service> + <service name="refresh_patches" mode="disabled"> + <param name="changesgenerate">enable</param> </service> </services> ++++++ neutron-sudoers ++++++ --- /var/tmp/diff_new_pack.zD7nMc/_old 2014-04-14 10:56:16.000000000 +0200 +++ /var/tmp/diff_new_pack.zD7nMc/_new 2014-04-14 10:56:16.000000000 +0200 @@ -1,2 +1,2 @@ -Defaults:openstack-neutron !syslog -openstack-neutron ALL = (root) NOPASSWD: /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf * +Defaults:neutron !syslog +neutron ALL = (root) NOPASSWD: /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf * ++++++ openstack-neutron-ovs-cleanup.init ++++++ --- /var/tmp/diff_new_pack.zD7nMc/_old 2014-04-14 10:56:16.000000000 +0200 +++ /var/tmp/diff_new_pack.zD7nMc/_new 2014-04-14 10:56:16.000000000 +0200 @@ -12,7 +12,7 @@ ### END INIT INFO NEUTRON_LOGFILE="/var/log/neutron/ovs-cleanup.log" -USER="openstack-neutron" +USER="neutron" DAEMON=/usr/bin/neutron-ovs-cleanup DAEMON_ARGS="--config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini" DAEMON_DIR=/var/run ++++++ openstack-neutron-plugin.init ++++++ --- /var/tmp/diff_new_pack.zD7nMc/_old 2014-04-14 10:56:16.000000000 +0200 +++ /var/tmp/diff_new_pack.zD7nMc/_new 2014-04-14 10:56:16.000000000 +0200 @@ -12,14 +12,14 @@ ### END INIT INFO DAEMON="__NAME__" -USER="openstack-neutron" +USER="neutron" CONFFILE="/etc/neutron/neutron.conf" RUNDIR="/var/run/neutron" NEUTRON_PLUGIN_CONF="__PLUGIN_CONFFILE__" NEUTRON_PLUGIN_ARGS="" if [ ! -z $NEUTRON_PLUGIN_CONF ] && [ $NEUTRON_PLUGIN_CONF != "" ] ; then - PLUGIN_ARGS="$NEUTRON_PLUGIN_ARGS --config-file $NEUTRON_PLUGIN_CONF" + PLUGIN_ARGS="$NEUTRON_PLUGIN_ARGS --config-file=$NEUTRON_PLUGIN_CONF" fi @@ -31,7 +31,7 @@ case "$1" in start) echo -n "Starting neutron-$DAEMON" - /sbin/startproc -q -s -u $USER /usr/bin/neutron-$DAEMON --config-file $CONFFILE $PLUGIN_ARGS + /sbin/startproc -q -s -u $USER /usr/bin/neutron-$DAEMON --config-file=$CONFFILE $PLUGIN_ARGS rc_status -v ;; stop) ++++++ openstack-neutron.conf ++++++ d /var/run/openstack-neutron 0700 neutron neutron - ++++++ openstack-neutron.init ++++++ --- /var/tmp/diff_new_pack.zD7nMc/_old 2014-04-14 10:56:16.000000000 +0200 +++ /var/tmp/diff_new_pack.zD7nMc/_new 2014-04-14 10:56:16.000000000 +0200 @@ -20,7 +20,7 @@ for i in $NEUTRON_PLUGIN_CONF; do CONF_ARGS="$CONF_ARGS --config-file $i" done -USER="openstack-neutron" +USER="neutron" DAEMON=/usr/bin/neutron-server DAEMON_ARGS="--log-file $NEUTRON_LOGFILE $CONF_ARGS" DAEMON_DIR=/var/run @@ -36,7 +36,7 @@ case "$1" in start) echo -n "Checking for DB Migrations" - /usr/bin/neutron-db-manage --config-file /etc/neutron/neutron.conf --config-file $NEUTRON_PLUGIN_CONF check_migration + /usr/bin/neutron-db-manage $CONF_ARGS check_migration rc_status -v echo -n "Starting neutron server" ++++++ openstack-neutron.logrotate ++++++ --- /var/tmp/diff_new_pack.zD7nMc/_old 2014-04-14 10:56:17.000000000 +0200 +++ /var/tmp/diff_new_pack.zD7nMc/_new 2014-04-14 10:56:17.000000000 +0200 @@ -1,10 +1,10 @@ -/var/log/quantum/*.log { +/var/log/neutron/*.log { rotate 15 size 1M weekly dateext missingok notifempty - su openstack-quantum openstack-quantum + su neutron neutron sharedscripts } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit openstack-keystone for openSUSE:Factory
by root＠hilbert.suse.de 14 Apr '14

14 Apr '14

Hello community, here is the log from the commit of package openstack-keystone for openSUSE:Factory checked in at 2014-04-14 10:55:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openstack-keystone (Old) and /work/SRC/openSUSE:Factory/.openstack-keystone.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openstack-keystone" Changes: -------- --- /work/SRC/openSUSE:Factory/openstack-keystone/openstack-keystone-doc.changes 2013-04-29 14:09:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.openstack-keystone.new/openstack-keystone-doc.changes 2014-04-14 10:55:04.000000000 +0200 @@ -1,0 +2,488 @@ +Wed Apr 9 16:57:38 UTC 2014 - dmueller(a)suse.com + +- Update to version keystone-2014.1.dev14.gb07840a: + * Updated from global requirements + * Fix invalid LDAP filter for user ID with comma + +------------------------------------------------------------------- +Thu Mar 27 01:40:19 UTC 2014 - cloud-devel(a)suse.de + +- Update to version keystone-2014.2.dev176.g724d056: + * Open Juno development + * Enable lazy translations in httpd/keystone.py + * Avoid using .values() on the indexed columns + * Imported Translations from Transifex + * revert deprecation of v2 API + * Updated from global requirements + * Uses generator expressions instead of filter + +------------------------------------------------------------------- +Wed Mar 26 01:41:56 UTC 2014 - cloud-devel(a)suse.de + +- Update to version keystone-2014.1.dev162.g3056dc5: + * exclude disabled services from the catalog + * refactor AuthCatalog tests + * Rename keystone.tests.fixtures + * Change the default version discovery URLs + * Remove extra cache layer debugging + * Fix doc build errors with SQLAlchemy 0.9 + * Sync oslo-incubator db.sqlalchemy b9e2499 + * Always include 'enabled' field in service response + +------------------------------------------------------------------- +Tue Mar 25 01:41:45 UTC 2014 - cloud-devel(a)suse.de + +- Rebased patches: + + 0001-Create-TMPDIR-for-tests-recursively.patch dropped (merged upstream) + +------------------------------------------------------------------- +Tue Mar 25 01:41:40 UTC 2014 - cloud-devel(a)suse.de + +- Update to version keystone-2014.1.dev146.ge7b3005: + * Create TMPDIR for tests recursively + * test tcp_keepidle only if it's available on the current platform + * Add dedicated URL for issuing unscoped federation tokens + +------------------------------------------------------------------- +Mon Mar 24 01:40:44 UTC 2014 - cloud-devel(a)suse.de + +- Update to version keystone-2014.1.dev141.g0fb0dfd: + * Filter SAML2 assertion parameters with certain prefix + +------------------------------------------------------------------- +Sun Mar 23 01:43:22 UTC 2014 - cloud-devel(a)suse.de + +- Update to version keystone-2014.1.dev139.g1e84251: + * Use oslo db.sqlalchemy.session.EngineFacade.from_config + +------------------------------------------------------------------- +Sat Mar 22 01:39:59 UTC 2014 - cloud-devel(a)suse.de + +- Update to version keystone-2014.1.dev137.ga3c7553: + * Add support for parallel testr workers in Keystone + * is_revoked check all viable subtrees + * update sample conf + * explicitly import gettext function + * expires_at should be in a tuple not turned into one + * Comparisons should account for instantaneous test execution + * Make domain_id immutable by default + * Do not expose internal data on UnexpectedError + * Filter LDAP dumb member when listing role assignments + +------------------------------------------------------------------- +Fri Mar 21 01:06:14 UTC 2014 - cloud-devel(a)suse.de + +- Update to version keystone-2014.1.dev121.gff88763: + * Ability to turn off ldap referral chasing + * Add user_id when calling populate_roles_for_groups + * Store groups ids objects list in the OS-FEDERATION object + * Uses explicit imports for _ + * Rename scope_to_bad_project() to test_scope_to_bad_project() + * Make LIVE Tests configurable with ENV + +------------------------------------------------------------------- +Wed Mar 19 01:07:36 UTC 2014 - cloud-devel(a)suse.de + +- Update to version keystone-2014.1.dev109.gd4574a7: + * Move test .conf files to keystone/tests/config_files + * Removal of test .conf files + +------------------------------------------------------------------- +Tue Mar 18 10:29:57 UTC 2014 - cloud-devel(a)suse.de + +- Update to version keystone-2014.1.dev105.gd906f57: + * Filter out nonstring environment variables before rules mapping + * Provide option to make domain_id immutable + * Replace httplib.HTTPSConnection in ec2_token + * Don't automatically enable revocation events + * Ensure v3policysample correctly limits domain_admin access + * Sync db, db.sqlalchemy from oslo-incubator 0a3436f + * Do not use keystone.conf.sample in tests + * Use class attribute to represent 'user' and 'group' + * trust creation allowed with empty roles list + +------------------------------------------------------------------- +Sat Mar 15 01:10:23 UTC 2014 - cloud-devel(a)suse.de + +- Update to version keystone-2014.1.dev88.gcd3b6f6: + * Update sample config + * remove hardcoded SQL queries in tests + * Fix db_version failed with wrong arguments + +------------------------------------------------------------------- +Fri Mar 14 00:56:25 UTC 2014 - cloud-devel(a)suse.de + +- Update to version keystone-2014.1.dev82.g358674a: + * Updated from global requirements + * Remove unnecessary oauth1.Manager constructions + * Enforce groups presence for federated authn + * Very minor cleanup to default_fixtures + * Cleanup keystoneclient tests + * Cleanup fixture data added to test instances + * Cleans up test data from limit tests + * Cleanup of instance attrs in core tests + * Cleanup backends after each test + * Fix include only enabled endpoints in catalog + * Add unit tests for disabled endpoints in catalog + * Add OS-OAUTH1 to consumers links section + +------------------------------------------------------------------- +Thu Mar 13 01:26:10 UTC 2014 - cloud-devel(a)suse.de + +- Update to version keystone-2014.1.dev58.gcb742d0: + * Fixup region description uniqueness + +------------------------------------------------------------------- +Wed Mar 12 06:19:57 UTC 2014 - cloud-devel(a)suse.de + +- Update to version keystone-2014.1.dev56.gbde896b: + * Add missing documentation for enabling oauth1 auth plugin + * Add missing documentation for enabling federation auth plugin + * Configurable temporary directory for tests + * Call an existing method in sync cache for revoke events + * Remove unnecessary calls to self.config() + * Import order is fixed + +------------------------------------------------------------------- +Tue Mar 11 00:38:42 UTC 2014 - cloud-devel(a)suse.de + +- Update to version keystone-2014.1.dev45.gfb8209e: + * Use config fixture + +------------------------------------------------------------------- +Mon Mar 10 15:28:05 UTC 2014 - cloud-devel(a)suse.de + +- Update to version keystone-2014.1.dev43.g58bb5e9: + * Fix docstrings in federation related modules + * Sync db, db.sqlalchemy, gettextutils from oslo-incubator 6ba44fd + * V3 xml responses should use v3 namespace + 2014.1.b3 + * Update ADMIN_TOKEN description in docs + * Remove unused function from tests + * Don't need session.flush in context managed by session + * Remove vim headers + * Removes use of timeutils.set_time_override + * Removes a redundant test + * revocation_list only call isotime on datetime objects + * Handle exception messages with six.text_type + * Fix webob.exc.HTTPForbidden parameter miss + +------------------------------------------------------------------- +Thu Mar 6 16:31:18 UTC 2014 - speilicke(a)suse.com + +- Fix requirements + +------------------------------------------------------------------- +Thu Mar 6 16:20:17 UTC 2014 - speilicke(a)suse.com + +- Update to version keystone-2014.1.dev515.g8c168bc: + * v3 endpoint create should require url + +------------------------------------------------------------------- +Thu Mar 6 15:15:26 UTC 2014 - cloud-devel(a)suse.de + +- Update to version keystone-2014.1.dev513.g7913636: + * Mark revoke as experimental + * Imported Translations from Transifex + * allow create credential with the system admin token + * Always include 'enabled' field in endpoint response + * Add the last of the outstanding helpstrings to config + * Update curl api example to specify tenant + * Update Oslo wiki link in README + * Lazy gettextutils behavior + * Update Oslo wiki link in README + +------------------------------------------------------------------- +Thu Mar 6 00:55:38 UTC 2014 - cloud-devel(a)suse.de + ++++ 291 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/openstack-keystone/openstack-keystone-doc.changes ++++ and /work/SRC/openSUSE:Factory/.openstack-keystone.new/openstack-keystone-doc.changes --- /work/SRC/openSUSE:Factory/openstack-keystone/openstack-keystone.changes 2014-02-19 07:21:49.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.openstack-keystone.new/openstack-keystone.changes 2014-04-14 10:55:04.000000000 +0200 @@ -2 +2 @@ -Thu Feb 13 16:10:02 UTC 2014 - speilicke(a)suse.com +Wed Apr 9 16:57:38 UTC 2014 - dmueller(a)suse.com @@ -4 +4,3 @@ -- Add 0001-Replacing-python-oauth2-by-oauthlib.patch, port from oauth2 to oauthlib +- Update to version keystone-2014.1.dev14.gb07840a: + * Updated from global requirements + * Fix invalid LDAP filter for user ID with comma @@ -7 +9 @@ -Thu Feb 6 14:48:02 UTC 2014 - dmueller(a)suse.com +Tue Apr 8 11:40:18 UTC 2014 - dmueller(a)suse.com @@ -9 +11,23 @@ -- fix typo in logrotate +- add 0001-Start-ping-listener-also-for-postgresql.patch + +------------------------------------------------------------------- +Mon Apr 7 09:20:21 UTC 2014 - dmueller(a)suse.com + +- switch to icehouse branch once again + +------------------------------------------------------------------- +Thu Mar 27 10:10:33 UTC 2014 - dmueller(a)suse.com + +- switch to icehouse branch again + +------------------------------------------------------------------- +Thu Mar 27 01:40:23 UTC 2014 - cloud-devel(a)suse.de + +- Update to version keystone-2014.2.dev176.g724d056: + * Open Juno development + * Enable lazy translations in httpd/keystone.py + * Avoid using .values() on the indexed columns + * Imported Translations from Transifex + * revert deprecation of v2 API + * Updated from global requirements + * Uses generator expressions instead of filter @@ -12 +36,14 @@ -Mon Feb 03 09:23:24 UTC 2014 - cloud-devel(a)suse.de +Wed Mar 26 01:41:59 UTC 2014 - cloud-devel(a)suse.de + +- Update to version keystone-2014.1.dev162.g3056dc5: + * exclude disabled services from the catalog + * refactor AuthCatalog tests + * Rename keystone.tests.fixtures + * Change the default version discovery URLs + * Remove extra cache layer debugging + * Fix doc build errors with SQLAlchemy 0.9 + * Sync oslo-incubator db.sqlalchemy b9e2499 + * Always include 'enabled' field in service response + +------------------------------------------------------------------- +Tue Mar 25 01:41:46 UTC 2014 - cloud-devel(a)suse.de @@ -15 +52,2 @@ - + 0001-Adds-fixture-package-from-oslo.patch dropped (merged upstream) + + 0001-Create-TMPDIR-for-tests-recursively.patch dropped (merged upstream) + + 0001-Create-TMPDIR-for-tests-recursively.patch dropped (merged upstream) @@ -18 +56 @@ -Mon Feb 3 09:23:22 UTC 2014 - opensuse-cloud(a)opensuse.org +Tue Mar 25 01:41:44 UTC 2014 - cloud-devel(a)suse.de @@ -20,6 +58,4 @@ -- Update to version 2013.2.2.dev19.g9056b66: - + Remove roles from OS-TRUST list responses - + Adds fixture package from oslo - + Sync log_handler module from Oslo - + Remove netifaces requirement - + list_revoked_tokens sql speedup for havana +- Update to version keystone-2014.1.dev146.ge7b3005: + * Create TMPDIR for tests recursively + * test tcp_keepidle only if it's available on the current platform + * Add dedicated URL for issuing unscoped federation tokens @@ -28 +64 @@ -Mon Feb 3 09:21:42 UTC 2014 - dmueller(a)suse.com +Mon Mar 24 17:51:47 UTC 2014 - dmueller(a)suse.com @@ -30 +66 @@ -- remove 0001-list_revoked_tokens-sql-speedup-for-havana.patch +- add 0001-Create-TMPDIR-for-tests-recursively.patch @@ -33 +69 @@ -Sat Feb 1 01:24:47 UTC 2014 - opensuse-cloud(a)opensuse.org +Mon Mar 24 01:40:47 UTC 2014 - cloud-devel(a)suse.de @@ -35,4 +71,2 @@ -- Update to version 2013.2.2.dev9.g2724951: - + Try decoding string to UTF-8 on error message fail - + Have tox use pip upgrade when installing - + Sync rpc fix from oslo-incubator +- Update to version keystone-2014.1.dev141.g0fb0dfd: + * Filter SAML2 assertion parameters with certain prefix @@ -41 +75 @@ -Fri Jan 31 01:37:29 UTC 2014 - opensuse-cloud(a)opensuse.org +Sun Mar 23 01:43:25 UTC 2014 - cloud-devel(a)suse.de @@ -43,2 +77,2 @@ -- Update to version 2013.2.2.dev3.gcecee8e: - + Import strutils from oslo +- Update to version keystone-2014.1.dev139.g1e84251: + * Use oslo db.sqlalchemy.session.EngineFacade.from_config @@ -47 +81 @@ -Thu Jan 30 17:10:12 UTC 2014 - speilicke(a)suse.com +Sat Mar 22 01:40:02 UTC 2014 - cloud-devel(a)suse.de @@ -49,2 +83,188 @@ -- Set common name of example certs to FQDN to make then slightly more - useful (bnc#855446) +- Update to version keystone-2014.1.dev137.ga3c7553: + * Add support for parallel testr workers in Keystone + * is_revoked check all viable subtrees + * update sample conf + * explicitly import gettext function + * expires_at should be in a tuple not turned into one + * Comparisons should account for instantaneous test execution + * Make domain_id immutable by default + * Do not expose internal data on UnexpectedError + * Filter LDAP dumb member when listing role assignments + +------------------------------------------------------------------- +Fri Mar 21 01:06:17 UTC 2014 - cloud-devel(a)suse.de + +- Update to version keystone-2014.1.dev121.gff88763: + * Ability to turn off ldap referral chasing + * Add user_id when calling populate_roles_for_groups + * Store groups ids objects list in the OS-FEDERATION object + * Uses explicit imports for _ + * Rename scope_to_bad_project() to test_scope_to_bad_project() + * Make LIVE Tests configurable with ENV + +------------------------------------------------------------------- +Wed Mar 19 01:07:39 UTC 2014 - cloud-devel(a)suse.de + +- Update to version keystone-2014.1.dev109.gd4574a7: + * Move test .conf files to keystone/tests/config_files + * Removal of test .conf files + +------------------------------------------------------------------- +Tue Mar 18 10:29:59 UTC 2014 - cloud-devel(a)suse.de + +- Update to version keystone-2014.1.dev105.gd906f57: + * Filter out nonstring environment variables before rules mapping + * Provide option to make domain_id immutable + * Replace httplib.HTTPSConnection in ec2_token + * Don't automatically enable revocation events + * Ensure v3policysample correctly limits domain_admin access + * Sync db, db.sqlalchemy from oslo-incubator 0a3436f + * Do not use keystone.conf.sample in tests + * Use class attribute to represent 'user' and 'group' + * trust creation allowed with empty roles list + +------------------------------------------------------------------- +Mon Mar 17 10:06:26 UTC 2014 - rhafer(a)suse.com + +- switch over to non-openstack-prefix'ed users + +------------------------------------------------------------------- +Sat Mar 15 01:10:27 UTC 2014 - cloud-devel(a)suse.de + +- Update to version keystone-2014.1.dev88.gcd3b6f6: + * Update sample config + * remove hardcoded SQL queries in tests + * Fix db_version failed with wrong arguments + +------------------------------------------------------------------- +Fri Mar 14 00:56:28 UTC 2014 - cloud-devel(a)suse.de + +- Update to version keystone-2014.1.dev82.g358674a: + * Updated from global requirements + * Remove unnecessary oauth1.Manager constructions + * Enforce groups presence for federated authn + * Very minor cleanup to default_fixtures + * Cleanup keystoneclient tests + * Cleanup fixture data added to test instances + * Cleans up test data from limit tests + * Cleanup of instance attrs in core tests + * Cleanup backends after each test + * Fix include only enabled endpoints in catalog + * Add unit tests for disabled endpoints in catalog + * Add OS-OAUTH1 to consumers links section + +------------------------------------------------------------------- +Thu Mar 13 01:26:13 UTC 2014 - cloud-devel(a)suse.de + +- Update to version keystone-2014.1.dev58.gcb742d0: + * Fixup region description uniqueness + +------------------------------------------------------------------- +Wed Mar 12 06:20:00 UTC 2014 - cloud-devel(a)suse.de + +- Update to version keystone-2014.1.dev56.gbde896b: + * Add missing documentation for enabling oauth1 auth plugin + * Add missing documentation for enabling federation auth plugin + * Configurable temporary directory for tests + * Call an existing method in sync cache for revoke events + * Remove unnecessary calls to self.config() + * Import order is fixed + +------------------------------------------------------------------- +Tue Mar 11 00:38:46 UTC 2014 - cloud-devel(a)suse.de + +- Update to version keystone-2014.1.dev45.gfb8209e: + * Use config fixture + +------------------------------------------------------------------- +Mon Mar 10 15:28:08 UTC 2014 - cloud-devel(a)suse.de ++++ 1083 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/openstack-keystone/openstack-keystone.changes ++++ and /work/SRC/openSUSE:Factory/.openstack-keystone.new/openstack-keystone.changes Old: ---- 0001-Replacing-python-oauth2-by-oauthlib.patch keystone-stable-havana.tar.gz New: ---- 0001-Start-ping-listener-also-for-postgresql.patch keystone-2014.1.rc2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openstack-keystone-doc.spec ++++++ --- /var/tmp/diff_new_pack.sNBelQ/_old 2014-04-14 10:55:05.000000000 +0200 +++ /var/tmp/diff_new_pack.sNBelQ/_new 2014-04-14 10:55:05.000000000 +0200 @@ -19,18 +19,26 @@ %define component keystone Name: openstack-%{component}-doc -Version: 2013.2.2.dev20.gc22f2ed +Version: 2014.1.rc2 Release: 0 Summary: OpenStack Identity Service (Keystone) - Documentation License: Apache-2.0 Group: Documentation/HTML Url: https://github.com/openstack/keystone -Source: keystone-stable-havana.tar.gz +Source: http://tarballs.openstack.org/keystone/keystone-%{version}.tar.gz +BuildRequires: openstack-keystone BuildRequires: openstack-suse-macros BuildRequires: python-Sphinx -BuildRequires: python-base -BuildRequires: python-oslo.sphinx -BuildRequires: python-pbr +BuildRequires: python-WebTest +BuildRequires: python-fixtures +BuildRequires: python-lockfile +BuildRequires: python-mock +BuildRequires: python-mox +BuildRequires: python-oslo.messaging +BuildRequires: python-oslosphinx +BuildRequires: python-pycadf +BuildRequires: python-testscenarios +BuildRequires: python-testtools BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -42,7 +50,7 @@ This package contains documentation files for openstack-keystone. %prep -%setup -q -n keystone-2013.2.2.dev20.gc22f2ed +%setup -q -n keystone-%{version} %openstack_cleanup_prep %build ++++++ openstack-keystone.spec ++++++ --- /var/tmp/diff_new_pack.sNBelQ/_old 2014-04-14 10:55:05.000000000 +0200 +++ /var/tmp/diff_new_pack.sNBelQ/_new 2014-04-14 10:55:05.000000000 +0200 @@ -17,49 +17,67 @@ %define component keystone -%define groupname openstack-%{component} -%define username openstack-%{component} +%define groupname %{component} +%define username %{component} Name: openstack-%{component} -Version: 2013.2.2.dev20.gc22f2ed +Version: 2014.1.rc2 Release: 0 Summary: OpenStack Identity Service (Keystone) License: Apache-2.0 Group: Development/Languages/Python Url: https://github.com/openstack/keystone -Source: keystone-stable-havana.tar.gz +Source: http://tarballs.openstack.org/keystone/keystone-%{version}.tar.gz Source1: %{name}.init Source2: logging.conf Source7: %{name}.logrotate -# PATCH-FIX-UPSTREAM speilicke(a)suse.com -- https://review.openstack.org/#/c/70750/ -Patch0: 0001-Replacing-python-oauth2-by-oauthlib.patch +Patch0: 0001-Start-ping-listener-also-for-postgresql.patch BuildRequires: crudini BuildRequires: openstack-suse-macros -BuildRequires: python-Babel +BuildRequires: python-Paste +BuildRequires: python-PasteDeploy >= 1.5.0 +BuildRequires: python-WebTest >= 2.0 BuildRequires: python-base -BuildRequires: python-netaddr -BuildRequires: python-oslo.config -BuildRequires: python-oslo.sphinx -BuildRequires: python-pbr -BuildRequires: python-setuptools +BuildRequires: python-fixtures >= 0.3.14 +BuildRequires: python-jsonschema >= 2.0.0 +BuildRequires: python-keystoneclient >= 0.6.0 +BuildRequires: python-ldap +BuildRequires: python-lockfile >= 0.8 +BuildRequires: python-lxml >= 2.3 +BuildRequires: python-mock >= 1.0 +BuildRequires: python-mox >= 0.5.3 +BuildRequires: python-netaddr >= 0.7.6 +BuildRequires: python-oauthlib >= 0.6 +BuildRequires: python-oslo.config >= 1.2.0 +BuildRequires: python-oslo.messaging >= 1.3.0a4 +BuildRequires: python-pam >= 0.1.4 +BuildRequires: python-pbr >= 0.6 +BuildRequires: python-pycadf >= 0.1.9 +BuildRequires: python-testscenarios >= 0.4 +BuildRequires: python-testtools >= 0.9.34 # Needed for %%post section keystone-manage invocation: -BuildRequires: python-WebOb +BuildRequires: python-WebOb >= 1.2.3 BuildRequires: python-passlib -BuildRequires: python-routes # Documentation build requirements: +BuildRequires: python-Babel >= 1.3 BuildRequires: python-Sphinx +BuildRequires: python-oslosphinx Requires: logrotate -Requires: python-argparse -Requires: python-iso8601 >= 0.1.8 +Requires: python-iso8601 >= 0.1.9 Requires: python-keystone = %{version} Requires: python-oslo.config >= 1.2.0 BuildRoot: %{_tmppath}/%{name}-%{version}-build +# keystone dependencies # To generate a self-signed certificate to be used in demo setups: Requires(post): coreutils +Requires(post): crudini Requires(post): python-keystone -Requires(post): python-dogpile.cache +Requires(post): python-dogpile.cache >= 0.5.0 Requires(post): python-argparse -Requires(post): python-iso8601 +Requires(post): python-iso8601 >= 0.1.8 +# NOTE(saschp): We need OpenStack'S fork here: +Requires(post): python-sqlalchemy-migrate >= 0.8.2 +Requires(post): python-Routes >= 1.12.3 Requires(post): openssl Requires(post): sysconfig Requires(pre): pwdutils @@ -87,20 +105,23 @@ Requires: python-dogpile.cache >= 0.5.0 Requires: python-eventlet >= 0.13.0 Requires: python-greenlet >= 0.3.2 -Requires: python-iso8601 >= 0.1.8 -Requires: python-keystoneclient >= 0.3.2 -Requires: python-ldap +Requires: python-iso8601 >= 0.1.9 +Requires: python-jsonschema >= 2.0.0 +Requires: python-keystoneclient >= 0.7.0 +Requires: python-kombu >= 2.4.8 +Requires: python-ldap >= 2.3.13 +Requires: python-lockfile >= 0.8 Requires: python-lxml >= 2.3 -Requires: python-netaddr +Requires: python-netaddr >= 0.7.6 Requires: python-oauthlib >= 0.6 +Requires: python-oslo.messaging >= 1.3.0a9 Requires: python-pam >= 0.1.4 Requires: python-passlib -Requires: python-pbr >= 0.5.21 -Requires: python-routes >= 1.12.3 -Requires: python-sqlalchemy >= 0.7.8 -BuildRequires: python-sqlalchemy >= 0.7.8 -Requires: python-sqlalchemy-migrate >= 0.7.2 -BuildRequires: python-sqlalchemy-migrate >= 0.7.2 +Requires: python-pbr >= 0.6 +Requires: python-pycadf >= 0.4.1 +Requires: python-six >= 1.5.2 +Requires: python-sqlalchemy-migrate >= 0.8.2 +Requires: python-stevedore >= 0.14 %description -n python-keystone Keystone is an OpenStack project that provides Identity, Token, Catalog @@ -113,25 +134,22 @@ Summary: Testsuite for the OpenStack Keystone Group: Development/Languages/Python Requires: %{name} = %{version} -Requires: python-Sphinx >= 1.1.2 Requires: python-WebTest >= 2.0 -Requires: python-coverage >= 3.6 -Requires: python-flake8 >= 2.0 -Requires: python-hacking >= 0.5.6 -Requires: python-keystoneclient >= 0.3.2 +%if 0%{?suse_version} && 0%{?suse_version} <= 1110 +Requires: python-discover +%endif +Requires: python-fixtures >= 0.3.14 +Requires: python-keystoneclient >= 0.7.0 +Requires: python-mock >= 1.0 Requires: python-mox >= 0.5.3 -Requires: python-netifaces >= 0.5 -Requires: python-nose -Requires: python-nosehtmloutput >= 0.0.3 -Requires: python-nosexcover -Requires: python-openstack.nose_plugin >= 0.7 -Requires: python-pep8 >= 1.4.5 -Requires: python-pyflakes >= 0.7.2 +Requires: python-pysqlite Requires: python-python-memcached >= 1.48 +Requires: python-python-subunit >= 0.0.18 Requires: python-requests >= 1.1 Requires: python-swift -Requires: python-testtools >= 0.9.32 -Requires: python-unittest2 +Requires: python-testrepository >= 0.0.18 +Requires: python-testscenarios >= 0.4 +Requires: python-testtools >= 0.9.34 # checkout_vendor in ./keystone/test.py Requires: git-core @@ -140,13 +158,13 @@ functionality of OpenStack Keystone. %prep -%setup -q -n keystone-2013.2.2.dev20.gc22f2ed -%patch0 -p1 +%setup -q -n %{component}-%{version} +%patch0 %openstack_cleanup_prep %build python setup.py build -python setup.py build_sphinx -b man +sphinx-build -b man doc/source doc/build/man %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} @@ -166,7 +184,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/cron.hourly/ cat - > %{buildroot}%{_sysconfdir}/cron.hourly/%name <<EOF #!/bin/bash -su openstack-keystone -s /bin/bash -c "/usr/bin/keystone-manage --config-file /etc/keystone/keystone.conf token_flush" || : +su %{username} -s /bin/bash -c "/usr/bin/keystone-manage --config-file /etc/keystone/keystone.conf token_flush" || : EOF ### init scripts @@ -184,13 +202,8 @@ # the tests and we want to keep it out of /usr/lib/ # https://review.openstack.org/#q,I9b02a5273dd27db963e9a26085b7456f4c5f6a41,n… mkdir -p %{buildroot}%{_localstatedir}/lib/%{name}-test/tmp -sed -i -e "s/TMPDIR = .*/TMPDIR = os.path.join(ROOTDIR, 'tmp')/" %{buildroot}%{python_sitelib}/%{component}/tests/core.py ln -s %{_localstatedir}/lib/%{name}-test/tmp %{buildroot}%{python_sitelib}/%{component}/tests/tmp -# Allow the unittests to find the signing certs -%define keystone_test_overrides %{buildroot}%{python_sitelib}/%{component}/tests/test_overrides.conf -crudini --set %{keystone_test_overrides} signing certfile %{_localstatedir}/lib/%{name}-test/examples/pki/certs/signing_cert.pem -crudini --set %{keystone_test_overrides} signing keyfile %{_localstatedir}/lib/%{name}-test/examples/pki/private/signing_key.pem -crudini --set %{keystone_test_overrides} signing ca_certs %{_localstatedir}/lib/%{name}-test/examples/pki/certs/cacert.pem +sed -i -e "s/TMPDIR = .*/TMPDIR = os.path.join(ROOTDIR, 'tmp')/" %{buildroot}%{python_sitelib}/%{component}/tests/core.py ### create keystone ssl dirs install -d %{buildroot}%{_sysconfdir}/keystone/ssl/private @@ -201,22 +214,17 @@ ### set default configuration (mostly applies to package-only setups and quickstart, i.e. not generally crowbar) %define keystone_conf %{buildroot}%{_sysconfdir}/keystone/keystone.conf crudini --set %{keystone_conf} DEFAULT verbose True -crudini --set %{keystone_conf} DEFAULT log_file keystone.log crudini --set %{keystone_conf} DEFAULT log_dir /var/log/keystone crudini --set %{keystone_conf} catalog driver keystone.catalog.backends.sql.Catalog #TODO/FIXME(saschpe): Do we want to use sqlite per default or demand PostgreSQL right away? crudini --set %{keystone_conf} sql connection sqlite:////var/lib/keystone/keystone.db %pre -getent group %{groupname} >/dev/null || groupadd -r %{groupname} -getent passwd %{username} >/dev/null || useradd -r -g %{groupname} -d %{_localstatedir}/lib/keystone -s /sbin/nologin -c "OpenStack keystone Daemon" %{username} -exit 0 +%openstack_pre_user_group_create %{username} %{groupname} %post -if [ $1 -eq 1 ] ; then - %define keystone_conf %{_sysconfdir}/keystone/keystone.conf - crudini --set %{keystone_conf} signing cert_subject /C=US/ST=Unset/L=Unset/O=Unset/CN=$(hostname -f) || : -fi +%define keystone_conf %{_sysconfdir}/keystone/keystone.conf +crudini --set %{keystone_conf} signing cert_subject /C=US/ST=Unset/L=Unset/O=Unset/CN=$(hostname -f) # create an example.com certificate if not available already if ! [ -r /etc/keystone/ssl/certs/signing_cert.pem ]; then if [ -r /etc/keystone/ssl/certs/index.txt ]; then @@ -227,7 +235,9 @@ fi /usr/bin/keystone-manage pki_setup --keystone-user %{username} --keystone-group %{groupname} # keystone-manage will create a keystone.log file owned by root; fix that - test -f %{_localstatedir}/log/keystone/keystone.log && chown %{username}:%{groupname} %{_localstatedir}/log/keystone/keystone.log + test -f %{_localstatedir}/log/keystone/keystone-manage.log && { + chown %{username}:%{groupname} %{_localstatedir}/log/keystone/keystone-manage.log + } fi %fillup_and_insserv %{name} %restart_on_update %{name} ++++++ 0001-Start-ping-listener-also-for-postgresql.patch ++++++ --- keystone/openstack/common/db/sqlalchemy/session.py +++ keystone/openstack/common/db/sqlalchemy/session.py @@ -367,7 +367,7 @@ return [columns] return columns[len(uniqbase):].split("0")[1:] - if engine_name not in ["ibm_db_sa", "mysql", "sqlite", "postgresql"]: + if engine_name not in ("ibm_db_sa", "mysql", "sqlite", "postgresql"): return # FIXME(johannes): The usage of the .message attribute has been @@ -489,7 +489,7 @@ def _ping_listener(engine, dbapi_conn, connection_rec, connection_proxy): - """Ensures that MySQL and DB2 connections are alive. + """Ensures that MySQL, PostgreSQL or DB2 connections are alive. Borrowed from: http://groups.google.com/group/sqlalchemy/msg/a4ce563d802c929f @@ -645,7 +645,7 @@ sqlalchemy.event.listen(engine, 'checkin', _thread_yield) - if engine.name in ['mysql', 'ibm_db_sa']: + if engine.name in ('ibm_db_sa', 'mysql', 'postgresql'): ping_callback = functools.partial(_ping_listener, engine) sqlalchemy.event.listen(engine, 'checkout', ping_callback) if engine.name == 'mysql': ++++++ _service ++++++ --- /var/tmp/diff_new_pack.sNBelQ/_old 2014-04-14 10:55:05.000000000 +0200 +++ /var/tmp/diff_new_pack.sNBelQ/_new 2014-04-14 10:55:05.000000000 +0200 @@ -1,10 +1,12 @@ <services> - <service name="git_tarballs" mode="disabled"> - <param name="url">http://tarballs.openstack.org/keystone/keystone-stable-havana.tar.gz</param> - <param name="email">opensuse-cloud(a)opensuse.org</param> - <param name="plain-version">True</param> + <service mode="disabled" name="download_files"> + <param name="changesgenerate">enable</param> + </service> + <service mode="disabled" name="set_version"> + <param name="basename">keystone</param> + </service> + <service mode="disabled" name="python_requires"> </service> - <service name="refresh_patches" mode="disabled"> <param name="changesgenerate">enable</param> </service> ++++++ openstack-keystone.init ++++++ --- /var/tmp/diff_new_pack.sNBelQ/_old 2014-04-14 10:55:05.000000000 +0200 +++ /var/tmp/diff_new_pack.sNBelQ/_new 2014-04-14 10:55:05.000000000 +0200 @@ -12,7 +12,7 @@ # Description: OpenStack Identity (Keystone) ### END INIT INFO -USER="openstack-keystone" +USER="keystone" CONFFILE="/etc/keystone/keystone.conf" RUNDIR="/var/run/keystone" ++++++ openstack-keystone.logrotate ++++++ --- /var/tmp/diff_new_pack.sNBelQ/_old 2014-04-14 10:55:05.000000000 +0200 +++ /var/tmp/diff_new_pack.sNBelQ/_new 2014-04-14 10:55:05.000000000 +0200 @@ -7,7 +7,7 @@ dateext missingok notifempty - su openstack-keystone openstack-keystone + su keystone keystone copytruncate sharedscripts } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit openstack-heat for openSUSE:Factory
by root＠hilbert.suse.de 14 Apr '14

14 Apr '14

Hello community, here is the log from the commit of package openstack-heat for openSUSE:Factory checked in at 2014-04-14 10:54:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openstack-heat (Old) and /work/SRC/openSUSE:Factory/.openstack-heat.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openstack-heat" Changes: -------- --- /work/SRC/openSUSE:Factory/openstack-heat/openstack-heat-doc.changes 2014-03-09 18:28:12.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.openstack-heat.new/openstack-heat-doc.changes 2014-04-14 10:54:54.000000000 +0200 @@ -2 +2 @@ -Sun Mar 2 01:37:27 UTC 2014 - cloud-devel(a)suse.de +Thu Mar 6 16:46:40 UTC 2014 - speilicke(a)suse.com @@ -4,2 +4 @@ -- Update to version heat-2013.2.3.dev8.g6c99dc4: - * Fix "members" property check +- Fix requirements @@ -8 +7 @@ -Sat Mar 1 01:39:36 UTC 2014 - cloud-devel(a)suse.de +Thu Mar 6 15:03:27 UTC 2014 - cloud-devel(a)suse.de @@ -10 +9,247 @@ -- Update to version heat-2013.2.3.dev6.gdefcf23: +- Update to version heat-2014.1.dev545.gffe0af0: + * heat_keystoneclient add delete_stack_domain_user_keypair + +------------------------------------------------------------------- +Thu Mar 6 06:21:37 UTC 2014 - cloud-devel(a)suse.de + +- Update to version heat-2014.1.dev543.g362e033: + * heat_keystoneclient add legacy fallback path + * Fixup uuid stubbing in test_stack_user.py + * Move HOT parameters code to a separate module + * Load functions from plugins + * Use PluginManager to load resources + +------------------------------------------------------------------- +Thu Mar 06 00:39:11 UTC 2014 - cloud-devel(a)suse.de + +- Rebased patches: + + 0001-Switch-over-to-oslosphinx.patch dropped (merged upstream) + +------------------------------------------------------------------- +Thu Mar 6 00:39:06 UTC 2014 - cloud-devel(a)suse.de + +- Update to version heat-2014.1.dev533.g6c030fa: + * Add tools/create_heat_domain helper script + * Nova server to ref cloud-config resources in user_data + * Return None when get_attr cannot resolve a value + * Native ScalingPolicy resource + * Remove vim header from files + * Docs: use the plugin manager to list resources + * Handle API limit exception in nova_utils.refresh_server + * I18N support for error message + * run_tests.sh default doc omits pep8 + * Switch over to oslosphinx + +------------------------------------------------------------------- +Wed Mar 5 01:12:38 UTC 2014 - cloud-devel(a)suse.de + +- Update to version heat-2014.1.dev513.gf944f7d: + * replace dict comprehension with dict constructor + * Implement OS::Neutron::ExtraRoute as /contrib + * Always report the action in state_reason as engine encodes it + * Convert empty filter dictionary to None + * Allow Server name property to be updated + * Move the code that reads the global environment + * Add a plugin_manager module + * Calculate template version only once + * Give cfn a separate Template class + * Move HOT version checking to HOTemplate class + * Make server resources use nova_utils.refresh_server() + * migrate StackUser base class to stack domain users + * engine: allow stack_user_project users to retrieve stack + * Add config options to specify stack domain admin + * Modify stack_user_domain config option to take domain ID + * Nova keypair validation breaks client plugins + * Add Keystone V2 plugin + * Make Keystone client pluggable + * Add a validation step to parameters schema + * Add neutron network constraint + +------------------------------------------------------------------- +Tue Mar 4 10:59:28 UTC 2014 - speilicke(a)suse.com + +- Update to version heat-2014.1.dev473.ge469aef: + * Adds Parameter Label to template validate call + +------------------------------------------------------------------- +Tue Mar 4 01:27:06 UTC 2014 - cloud-devel(a)suse.de + +- Update to version heat-2014.1.dev471.g5160a76: + * Generate docs for contrib plugins + * Restructure contrib/ directories + * Document schema properties for Neutron subnet resource + * Remove redundant default value None for dict.get + +------------------------------------------------------------------- +Mon Mar 3 13:24:33 UTC 2014 - cloud-devel(a)suse.de + +- Update to version heat-2014.1.dev463.g54117fe: + * Add admin_pass as a property + * Change software_config storage of config and io columns + * Add project to unscoped stack list response + * Unscoped List Stacks + * Alter stack_count_all_by_tenant to stack_count_all + * Fix stack_get_all call on stack watcher + * Change Resource timestamps to save correct info + +------------------------------------------------------------------- +Mon Mar 3 11:45:16 UTC 2014 - cloud-devel(a)suse.de + +- Update to version heat-2014.1.dev449.ga905ce9: + * Update Oslo wiki link in README + * Document schema properties for Neutron router resources + * Add validation of nested property schema + * Adding "device_owner" property for Port resource + * Implement glance image constraint + +------------------------------------------------------------------- +Mon Mar 3 01:26:14 UTC 2014 - cloud-devel(a)suse.de + +- Update to version heat-2014.1.dev439.g59c0441: + * add OS::Heat::AutoScalingGroup + +------------------------------------------------------------------- +Sun Mar 2 01:32:22 UTC 2014 - cloud-devel(a)suse.de + +- Update to version heat-2014.1.dev437.gfbecd4f: + * Change Stack timestamps to save correct info + * Change access to ceilometerclient + +------------------------------------------------------------------- +Sat Mar 1 01:35:28 UTC 2014 - cloud-devel(a)suse.de + +- Update to version heat-2014.1.dev433.g0007c2d: + * I18N support for log message and attributes schema + * Ensure that the NoCloud data source is loaded + * Don't install cloud-init on Rackspace images + * SignalResponder move signed URL deleting to its own method + * REST deployment metadata method + * RPC method to fetch deployments metadata + * Fix typo and remove unused code in nova_utils.py + * Raise NotFound in software_config_get/software_deployment_get + * Convert AccessKey resource to attributes_schema + * Check that 'heat_template_version' is a HOT version + * Replace '+' with string interpolation operation + * Remove unused output section from test template + * Add preview for LoadBalancer + +------------------------------------------------------------------- +Thu Feb 27 01:01:49 UTC 2014 - cloud-devel(a)suse.de + +- Update to version heat-2014.1.dev407.gac8ef2a: + * Docs: use pydoc to read docstrings + * Remove redundant FnGetAtt from User resource + * Implements resource type NetworkGateway + +------------------------------------------------------------------- +Wed Feb 26 00:50:05 UTC 2014 - cloud-devel(a)suse.de + +- Update to version heat-2014.1.dev401.g9dd525f: + * Tidy up rpc_client definitions + * Updated from global requirements + * Changed Openstack into OpenStack in contrib.rst + +------------------------------------------------------------------- +Tue Feb 25 00:46:01 UTC 2014 - cloud-devel(a)suse.de + +- Update to version heat-2014.1.dev396.g1116377: + * Replace hard code in software_deployment REST api + * Doc generation display message for deprecated resources + * Use property support_status in documentation generation + * Fix test for cloud loadbalancer + * Add Docker resources to docs + * Change Docker resource mapping name + * Fix resource mapping for Docker + * Remove Fn::FindInMap from HOT + * Move built-in functions to separate modules + * Disallow Heat-only functions in CloudFormation templates + * Provide access to the template version + +------------------------------------------------------------------- +Mon Feb 24 01:06:17 UTC 2014 - cloud-devel(a)suse.de + +- Update to version heat-2014.1.dev374.g4a9ed59: + * Use support_status for existing deprecated properties + * Move X-Auth-Url logic to auth_url middleware + * Add support_status attribute to properties schema + * Move HOT to a separate subpackage + * Replace function resolution with lazy evaluation + * unit tests: Refactor to accomodate lazy evaluation + * Ensure some properties update_allowed on port res + +------------------------------------------------------------------- +Sat Feb 22 00:49:19 UTC 2014 - cloud-devel(a)suse.de + +- Update to version heat-2014.1.dev360.g6506f45: + * Add flavor constraint + * Rackspace Cloud Networks resource + * Fix resource mapping for Rackspace + * Refactor SupportStatus into its own module + * Add ability to create provider networks (vlan,flat) + * Environment template guide enhancement + * unit tests: Fix types in Fn::ResourceFacade tests + * Fix test_association_eip unit test + * unit tests: Always resolve static functions + * Evaluate lazy functions in autoscaling launch config + * Replace stack_get_all_by_tenant with stack_get_all ++++ 148 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/openstack-heat/openstack-heat-doc.changes ++++ and /work/SRC/openSUSE:Factory/.openstack-heat.new/openstack-heat-doc.changes --- /work/SRC/openSUSE:Factory/openstack-heat/openstack-heat.changes 2014-03-09 18:28:12.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.openstack-heat.new/openstack-heat.changes 2014-04-14 10:54:55.000000000 +0200 @@ -2 +2 @@ -Sun Mar 2 01:37:30 UTC 2014 - cloud-devel(a)suse.de +Wed Apr 2 13:36:34 UTC 2014 - dmueller(a)suse.com @@ -4,2 +4,2 @@ -- Update to version heat-2013.2.3.dev8.g6c99dc4: - * Fix "members" property check +- add check to prevent 3rd time introducing the same regression + (bnc#871199) @@ -8 +8 @@ -Sat Mar 1 01:39:39 UTC 2014 - cloud-devel(a)suse.de +Tue Apr 1 07:44:23 UTC 2014 - speilicke(a)suse.com @@ -10 +10,633 @@ -- Update to version heat-2013.2.3.dev6.gdefcf23: +- Update to version 2014.1.rc1: + * Properly delete OS::Nova::FloatingIPAssociation + * version migration fails if version is an integer + * Fix incorrect error msg in validate_template() + * Don't log exception for None timeout_mins + * Imported Translations from Transifex + * Validate that resource type is a string + * OS::Nova::Server depend on subnets related to nets + * Migrate invalid template version values + * Fail if non-existent security group referenced + * Order imports in alphabetical order (8/9) + * Fix using attributes in unittest + * Update heat.conf.sample + * Make OS::Nova::Server networks property updatable + * Don't catch all exceptions in image constraint + * Revert "Add validation to KeyPair resource" + * Don't create cloud-init user unless specified + * Add docker network_gateway attribute + * Change router's prop name agent_id to l3_agent_id + * Add subnets as a dependency for router + * heat is enabled by default in devstack now + * Properly encode heat.common.exception in rpc + * Error and NotFound inherit HeatException class + * Store stack domain credentials for deployments + * Document software config classes + * Display container ip not gateway IP + * Fix creating docker containers + * Fix stack-show failed with a name in uuid format + * Reimplement DHCPAgent as net's property + * Provide the necessary inputs to enable HEAT_SIGNAL + * Implement an identifier stack_path() + * Fix heading markup in hot_spec.rst + * Using resolving properties for update + * Stack identity reads tenant from stack not context + * Don't re-bind parameters during stack update + * Fix user provider template registration + * Add documentation to the firewall properties + * Catch NotFound exception on user delete_key + * Never specify project_name in keystone v3 auth + * Order imports in alphabetical order (7/9) + * Propagate files in nested stacks + * Get rid of global variable in JSON->YAML conversion + * Fix typo in HOT spec + * Tolerate None outputs on deployment handle_signal + * Add name property to StructuredDeployment + * policy.json allow all users to do stacks:lookup + * Include environment resource in documentation + * Generate local TemplateResource class + * Use six.move.xrange to replace xrange + * Refactor CLB to work with groups + * Add events for automation statuses to Cloud Server + * Fix update of Pool's list of HealthMonitors + * remove attributes from OS::Heat::AutoScalingGroup + * Replacing NetworkGateway when devices updated + * Reimplement L3Agent as router's property + * Move load_user_creds out of StackWatch + * KeyError generated when using a provider template + * Devstack getting started, update IMAGE_URLS + * Default properties to the empty dict in ResourceGroup + * Add space to description of stack_domain_admin + * Fix HOT inconsistencies in resource sections + * Use stack ID to create domain project name + * Modify assert statement when comparing with None + * Refactor Template.parse() + * Removing unnecessary required=True options + * Allow update of disable_rollback + * Improve compatibility between Keystone V2 and V3 + * Order imports in alphabetical order (6/9) + * Order imports in alphabetical order (1/9) + * Return template based class in list resource types + * Remove unused versions define in template_format.py + * Account for stack_user_project_id in stack_get_by_name + * Resource type implementations for structured software config + * Resource type implementation for software deployment + * Remove signal_id from deployments API and model + * Server property for software config transport + * OS::Nova::Server support for software config + * Fix InternalException raised on stack-show + * Delete user_creds on stack delete + * Add more unit tests for ThreadGroupManager + * Fix start_with_acquired_lock - pass kwargs to func + * Fix some help strings in common/wsgi.py + * migrate User/AccessKey resources to StackUser base class + * StackUser add _delete_keypair function + * Refactor stack watching into a separate class + * Remove decorators for exceptions + * Handle 503 response from Nova API + * Retry logic for SSH connection in Cloud Server resource + * Ensure that the NoCloud data source is loaded, part 2 + * Provide attribute schema for waitcondition resource + * Fix AccessPolicy update with added resources + * Make template formats pluggable + * Add an InvalidTemplateVersion exception + * Move HOT template code to its own module + * Add user_creds_delete to the DB API + * fix DB API user_creds_get for non-existent ID + * Make user_creds_id a parser.Stack attribute + * Fix HOT set_stack_id + * heat_keystoneclient don't pass project and trust_id + * Fix resolving for Ref function + * Add state check when suspend or resume stack + * Revert "Showing member list for nested resources" + * Allows vip from a different subnet for lbaas resource + * Add test for StackUser._create_keypair + * StackUser add suspend/resume support + * heat_keystoneclient add delete_stack_domain_user_keypair + * heat_keystoneclient add legacy fallback path + * Fixup uuid stubbing in test_stack_user.py + * Move HOT parameters code to a separate module + * Load functions from plugins + * Use PluginManager to load resources + * Add tools/create_heat_domain helper script + * Allow handle_signal to assert which actions are valid + * Allow getting attributes on suspended resources + * Nova server to ref cloud-config resources in user_data + * Return None when get_attr cannot resolve a value + * Allow proper instance with volume suspension + * Add IP address to error message of failed stack + * Native ScalingPolicy resource + * Remove vim header from files + * replace dict comprehension with dict constructor + * Implement OS::Neutron::ExtraRoute as /contrib + * Always report the action in state_reason as engine encodes it + * Convert empty filter dictionary to None + * Allow Server name property to be updated + * Docs: use the plugin manager to list resources + * Move the code that reads the global environment + * Add a plugin_manager module + * Calculate template version only once + * Give cfn a separate Template class + * Move HOT version checking to HOTemplate class + * Handle API limit exception in nova_utils.refresh_server + * Make server resources use nova_utils.refresh_server() + * migrate StackUser base class to stack domain users + * engine: allow stack_user_project users to retrieve stack + * Add config options to specify stack domain admin + * Modify stack_user_domain config option to take domain ID + * Nova keypair validation breaks client plugins + * Add Keystone V2 plugin + * Make Keystone client pluggable + * Add host_routes property to Neutron subnet resource + * Adds Parameter Label to template validate call + * Generate docs for contrib plugins + * Restructure contrib/ directories + * Set statuscode=404 in NotFoundException in tests + * Add a validation step to parameters schema + * Add admin_pass as a property + * Update Oslo wiki link in README + * Remove unused variable + * I18N support for log message and attributes schema + * Change software_config storage of config and io columns + * Ensure that the NoCloud data source is loaded + * Don't install cloud-init on Rackspace images + * Document schema properties for Neutron subnet resource + * Document schema properties for Neutron router resources + * Add project to unscoped stack list response + * Unscoped List Stacks + * Alter stack_count_all_by_tenant to stack_count_all + * Fix stack_get_all call on stack watcher + * Change Resource timestamps to save correct info + * Change Stack timestamps to save correct info + * SignalResponder move signed URL deleting to its own method + * REST deployment metadata method + * RPC method to fetch deployments metadata + * Fix typo and remove unused code in nova_utils.py + * Raise NotFound in software_config_get/software_deployment_get + * Docs: use pydoc to read docstrings + * Convert AccessKey resource to attributes_schema + * Remove redundant FnGetAtt from User resource + * Order imports in alphabetical order (3/9) + * Check that 'heat_template_version' is a HOT version + * Add validation of nested property schema + * Replace '+' with string interpolation operation + * Remove unused output section from test template + * I18N support for error message + * Tidy up rpc_client definitions + * Updated from global requirements + * Adding "device_owner" property for Port resource + * Replace hard code in software_deployment REST api + * Doc generation display message for deprecated resources + * Use property support_status in documentation generation + * Use support_status for existing deprecated properties + * Remove redundant default value None for dict.get + * add OS::Heat::AutoScalingGroup + * Fix test for cloud loadbalancer ++++ 1482 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/openstack-heat/openstack-heat.changes ++++ and /work/SRC/openSUSE:Factory/.openstack-heat.new/openstack-heat.changes Old: ---- heat-stable-havana.tar.gz New: ---- heat-2014.1.rc1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openstack-heat-doc.spec ++++++ --- /var/tmp/diff_new_pack.jdeDyN/_old 2014-04-14 10:54:55.000000000 +0200 +++ /var/tmp/diff_new_pack.jdeDyN/_new 2014-04-14 10:54:55.000000000 +0200 @@ -19,13 +19,13 @@ %define component heat Name: openstack-%{component}-doc -Version: 2013.2.3.dev8.g6c99dc4 +Version: 2014.1.rc1 Release: 0 Summary: OpenStack Orchestration (Heat) - Documentation License: Apache-2.0 Group: Documentation/HTML Url: https://launchpad.net/heat -Source: http://tarballs.openstack.org/heat/heat-stable-havana.tar.gz +Source: http://tarballs.openstack.org/heat/heat-%{version}.tar.gz BuildRequires: graphviz BuildRequires: openstack-suse-macros BuildRequires: python-Babel @@ -38,22 +38,27 @@ BuildRequires: python-base BuildRequires: python-boto BuildRequires: python-eventlet +BuildRequires: python-fixtures BuildRequires: python-glanceclient +BuildRequires: python-heatclient BuildRequires: python-httplib2 BuildRequires: python-iso8601 BuildRequires: python-keystoneclient BuildRequires: python-kombu BuildRequires: python-lxml +BuildRequires: python-mock BuildRequires: python-mox BuildRequires: python-netaddr BuildRequires: python-neutronclient BuildRequires: python-nose BuildRequires: python-novaclient BuildRequires: python-oslo.config -BuildRequires: python-oslo.sphinx +BuildRequires: python-oslosphinx BuildRequires: python-paramiko BuildRequires: python-sphinxcontrib-httpdomain BuildRequires: python-sqlalchemy-migrate +BuildRequires: python-testscenarios +BuildRequires: python-testtools BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ openstack-heat.spec ++++++ --- /var/tmp/diff_new_pack.jdeDyN/_old 2014-04-14 10:54:55.000000000 +0200 +++ /var/tmp/diff_new_pack.jdeDyN/_new 2014-04-14 10:54:55.000000000 +0200 @@ -17,17 +17,17 @@ %define component heat -%define groupname openstack-%{component} -%define username openstack-%{component} +%define groupname %{component} +%define username %{component} Name: openstack-%{component} -Version: 2013.2.3.dev8.g6c99dc4 +Version: 2014.1.rc1 Release: 0 Summary: Openstack Orchestration (Heat) License: Apache-2.0 Group: System/Management Url: https://launchpad.net/heat -Source: http://tarballs.openstack.org/heat/heat-stable-havana.tar.gz +Source: http://tarballs.openstack.org/heat/heat-%{version}.tar.gz Source1: %{name}.init Source2: %{name}.logrotate %if 0%{?suse_version} > 1230 @@ -37,12 +37,20 @@ BuildRequires: crudini BuildRequires: fdupes BuildRequires: openstack-suse-macros -BuildRequires: python-base -BuildRequires: python-oslo.sphinx +BuildRequires: python-Paste +BuildRequires: python-PasteDeploy >= 1.5.0 +BuildRequires: python-Routes >= 1.12.3 +BuildRequires: python-WebOb >= 1.2.3 +BuildRequires: python-devel +BuildRequires: python-eventlet >= 0.13.0 +BuildRequires: python-iso8601 >= 0.1.8 +BuildRequires: python-lxml >= 2.3 +BuildRequires: python-oslo.config >= 1.2.0 BuildRequires: python-pbr >= 0.5.21 -BuildRequires: python-setuptools # Documentation requirements: -BuildRequires: python-Sphinx +BuildRequires: python-Babel >= 1.3 +BuildRequires: python-Sphinx >= 1.1.2 +BuildRequires: python-oslosphinx Requires: logrotate Requires: openstack-heat-templates Requires: python >= 2.6.8 @@ -68,30 +76,31 @@ Requires: python-PasteDeploy >= 1.5.0 Requires: python-PyYAML >= 3.1.0 Requires: python-Routes >= 1.12.3 -Requires: python-Routes >= 1.12.3 Requires: python-SQLAlchemy >= 0.7.8 Requires: python-WebOb >= 1.2.3 Requires: python-argparse -Requires: python-ceilometerclient >= 1.0.5 +Requires: python-ceilometerclient >= 1.0.6 Requires: python-cinderclient >= 1.0.6 Requires: python-eventlet >= 0.13.0 Requires: python-greenlet >= 0.3.2 -Requires: python-httplib2 +Requires: python-heatclient >= 0.2.3 +Requires: python-httplib2 >= 0.7.5 Requires: python-iso8601 >= 0.1.8 -Requires: python-keystoneclient >= 0.3.2 +Requires: python-keystoneclient >= 0.6.0 Requires: python-kombu >= 2.4.8 +Requires: python-lockfile >= 0.8 Requires: python-lxml >= 2.3 -Requires: python-netaddr -Requires: python-neutronclient >= 2.3.0 +Requires: python-netaddr >= 0.7.6 +Requires: python-neutronclient >= 2.3.4 Requires: python-novaclient >= 2.15.0 Requires: python-oslo.config >= 1.2.0 -Requires: python-paramiko >= 1.8.0 -Requires: python-pbr >= 0.5.21 +Requires: python-paramiko >= 1.9.0 +Requires: python-pbr >= 0.6 Requires: python-pycrypto >= 2.6 -Requires: python-python-memcached +Requires: python-requests >= 1.1 Requires: python-six >= 1.4.1 -Requires: python-sqlalchemy-migrate >= 0.7.2 -Requires: python-swiftclient >= 1.5 +Requires: python-sqlalchemy-migrate >= 0.8.2 +Requires: python-troveclient >= 1.0.3 %description -n python-heat This package contains the core Python module of OpenStack Heat. @@ -133,20 +142,16 @@ Group: Development/Languages/Python Requires: %{name} = %{version} Requires: openstack-%{component}-api-cloudwatch -Requires: python-coverage >= 3.6 %if 0%{?suse_version} && 0%{?suse_version} <= 1110 Requires: python-discover %endif -Requires: python-flake8 >= 2.0 Requires: python-glanceclient >= 0.9.0 -Requires: python-hacking >= 0.5.6 Requires: python-mock >= 1.0 Requires: python-mox >= 0.5.3 -Requires: python-paramiko >= 1.8.0 -Requires: python-pep8 >= 1.4.5 -Requires: python-pyflakes >= 0.7.2 -Requires: python-testrepository >= 0.0.17 -Requires: python-testtools >= 0.9.32 +Requires: python-paramiko >= 1.9.0 +Requires: python-testrepository >= 0.0.18 +Requires: python-testscenarios >= 0.4 +Requires: python-testtools >= 0.9.34 %description test This package contains testsuite files for %{name}. @@ -155,7 +160,12 @@ %setup -q -n %{component}-%{version} %openstack_cleanup_prep #NOTE(saschpe): Kill heat Sphinx extension, we're only building manpages: -sed -i "s|'heat.doc.resources'||" doc/source/conf.py +sed -i -e "s|'heat.doc.resources'||" -e "s|'ext.resources'||" doc/source/conf.py + +fgrep -q '#!/usr/bin' heat/cloudinit/loguserdata.py || { + echo "Somebody removes shebangs again :-( Fix the stupid script!" + exit 1 +} %build python setup.py build @@ -181,7 +191,6 @@ install -p -m 644 etc/heat/templates/*.yaml %{buildroot}%{_sysconfdir}/%{component}/templates crudini --set %{buildroot}/etc/%{component}/heat.conf DEFAULT verbose True -crudini --set %{buildroot}/etc/%{component}/heat.conf DEFAULT log_file heat.log crudini --set %{buildroot}/etc/%{component}/heat.conf DEFAULT log_dir /var/log/heat crudini --set %{buildroot}/etc/%{component}/heat.conf DEFAULT rpc_backend heat.openstack.common.rpc.impl_kombu crudini --set %{buildroot}/etc/%{component}/heat.conf DEFAULT sql_connection 'sqlite:///var/lib/heat/heat.db' @@ -214,9 +223,7 @@ %fdupes %{buildroot}%{python_sitelib}/%{component} %pre -getent group %{groupname} >/dev/null || groupadd -r %{groupname} -getent passwd %{username} >/dev/null || useradd -r -g %{groupname} -d %{_localstatedir}/lib/%{component} -s /sbin/nologin -c "OpenStack Heat Daemons" %{username} -exit 0 +%openstack_pre_user_group_create %{username} %{groupname} %post api %{fillup_and_insserv -f %{name}-api} @@ -261,9 +268,9 @@ %files %defattr(-,root,root) %doc LICENSE README.rst +%dir %attr(0755, %{username}, %{groupname}) %{_localstatedir}/lib/%{component} %dir %attr(0750, %{username}, %{groupname}) %{_localstatedir}/cache/%{component} %dir %attr(0750, %{username}, %{groupname}) %{_localstatedir}/log/%{component} -%dir %attr(0755, %{username}, %{groupname}) %{_localstatedir}/lib/%{component} %if 0%{?suse_version} > 1230 %ghost %dir %attr(700,%{username},%{groupname}) %{_localstatedir}/run/%{component} %_tmpfilesdir/%name.conf @@ -281,6 +288,7 @@ %{_bindir}/heat-manage %{_bindir}/heat-keystone-setup %{_bindir}/cinder-keystone-setup +%{_mandir}/man1/%{component}-manage.1%{?ext_man} %{_mandir}/man1/%{component}-db-setup.1%{?ext_man} %{_mandir}/man1/%{component}-keystone-setup.1%{?ext_man} ++++++ _service ++++++ --- /var/tmp/diff_new_pack.jdeDyN/_old 2014-04-14 10:54:56.000000000 +0200 +++ /var/tmp/diff_new_pack.jdeDyN/_new 2014-04-14 10:54:56.000000000 +0200 @@ -5,6 +5,8 @@ <service mode="disabled" name="set_version"> <param name="basename">heat</param> </service> + <service mode="disabled" name="python_requires"> + </service> <service name="refresh_patches" mode="disabled"> <param name="changesgenerate">enable</param> </service> ++++++ openstack-heat.conf ++++++ --- /var/tmp/diff_new_pack.jdeDyN/_old 2014-04-14 10:54:56.000000000 +0200 +++ /var/tmp/diff_new_pack.jdeDyN/_new 2014-04-14 10:54:56.000000000 +0200 @@ -1 +1 @@ -d /var/run/openstack-heat 0700 openstack-heat openstack-heat - +d /var/run/openstack-heat 0700 heat heat - ++++++ openstack-heat.init ++++++ --- /var/tmp/diff_new_pack.jdeDyN/_old 2014-04-14 10:54:56.000000000 +0200 +++ /var/tmp/diff_new_pack.jdeDyN/_new 2014-04-14 10:54:56.000000000 +0200 @@ -13,7 +13,7 @@ ### END INIT INFO DAEMON="__NAME__" -USER="openstack-heat" +USER="heat" CONFIGFILE="/etc/heat/heat.conf" RUNDIR="/var/run/heat" ++++++ openstack-heat.logrotate ++++++ --- /var/tmp/diff_new_pack.jdeDyN/_old 2014-04-14 10:54:56.000000000 +0200 +++ /var/tmp/diff_new_pack.jdeDyN/_new 2014-04-14 10:54:56.000000000 +0200 @@ -7,6 +7,6 @@ dateext missingok notifempty - su openstack-heat openstack-heat + su heat heat sharedscripts } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit openstack-glance for openSUSE:Factory
by root＠hilbert.suse.de 14 Apr '14

14 Apr '14

Hello community, here is the log from the commit of package openstack-glance for openSUSE:Factory checked in at 2014-04-14 10:53:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openstack-glance (Old) and /work/SRC/openSUSE:Factory/.openstack-glance.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openstack-glance" Changes: -------- --- /work/SRC/openSUSE:Factory/openstack-glance/openstack-glance-doc.changes 2013-09-11 15:46:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.openstack-glance.new/openstack-glance-doc.changes 2014-04-14 10:53:09.000000000 +0200 @@ -1,0 +2,199 @@ +Thu Mar 27 01:43:33 UTC 2014 - cloud-devel(a)suse.de + +- Update to version glance-2014.1.dev44.gdc2672a: + * Return 405 when attempting DELETE on /tasks + * Removes use of timeutils.set_time_override + * Remove dependency of test_v1_api on other tests + +------------------------------------------------------------------- +Wed Mar 26 01:45:24 UTC 2014 - cloud-devel(a)suse.de + +- Update to version glance-2014.1.dev38.gb5d3295: + * Pass Message object to webob exception + +------------------------------------------------------------------- +Tue Mar 25 01:45:22 UTC 2014 - cloud-devel(a)suse.de + +- Update to version glance-2014.1.dev36.gaabc62a: + * VMware store.add to return the image size uploaded + * registry: log errors on failure + +------------------------------------------------------------------- +Sat Mar 22 01:43:00 UTC 2014 - cloud-devel(a)suse.de + +- Update to version glance-2014.1.dev32.g09265f6: + * Remove openstack.common.fixture + +------------------------------------------------------------------- +Fri Mar 21 01:54:56 UTC 2014 - cloud-devel(a)suse.de + +- Update to version glance-2014.1.dev31.g49d3220: + * Detect MultiDict when generating json body + +------------------------------------------------------------------- +Mon Mar 17 01:06:27 UTC 2014 - cloud-devel(a)suse.de + +- Update to version glance-2014.1.dev29.gddae276: + * Make the VMware datastore backend more robust + * Add copyright text to glance/openstack/common/__init__.py + +------------------------------------------------------------------- +Sat Mar 15 01:08:01 UTC 2014 - cloud-devel(a)suse.de + +- Update to version glance-2014.1.dev26.gc6365cc: + * Makes possible to enable Registry API v1 and v2 + * Fix glance db migration failed on 031 + * Include Location header in POST /tasks response + * Catch exception when image cache pruning + +------------------------------------------------------------------- +Fri Mar 14 00:36:42 UTC 2014 - cloud-devel(a)suse.de + +- Update to version glance-2014.1.dev19.g2d3fa9e: + * Updated from global requirements + * Provide an upgrade period for enabling stores + * API v2: Allow GET on unowned images with show_image_direct_url + +------------------------------------------------------------------- +Thu Mar 13 01:43:08 UTC 2014 - cloud-devel(a)suse.de + +- Update to version glance-2014.1.dev14.g09b583e: + * Remove import specific validation from tasks resource + * Provide explicit image create value in Registry v2 API test + +------------------------------------------------------------------- +Tue Mar 11 01:50:21 UTC 2014 - cloud-devel(a)suse.de + +- Update to version glance-2014.1.dev10.gcc118d4: + * Don't enable all stores by default + 2014.1.b3 + * Log 'image_id' with all BadStoreURI error messages + +------------------------------------------------------------------- +Thu Mar 6 01:33:30 UTC 2014 - cloud-devel(a)suse.de + +- Update to version glance-2014.1.dev147.g70422c4: + * Document for API message localization + * Add the OVA container format + * Store URI must start with the expected URI scheme + +------------------------------------------------------------------- +Wed Mar 5 00:52:05 UTC 2014 - cloud-devel(a)suse.de + +- Update to version glance-2014.1.dev141.gf70b72b: + * Add support for API message localization + +------------------------------------------------------------------- +Tue Mar 4 01:30:13 UTC 2014 - cloud-devel(a)suse.de + +- Update to version glance-2014.1.dev140.gbfddf66: + * Replaced calls of get(foo, None) -> get(foo) + +------------------------------------------------------------------- +Mon Mar 3 11:42:24 UTC 2014 - cloud-devel(a)suse.de + +- Update to version glance-2014.1.dev138.g3838629: + * Documentation for Glance tasks + * Sync common db code from Oslo + +------------------------------------------------------------------- +Sat Mar 1 00:46:09 UTC 2014 - cloud-devel(a)suse.de + +- Update to version glance-2014.1.dev134.g0e2b8ca: + * VMware storage backend should use oslo.vmware + * Refactor UUID test + * Rename Openstack to OpenStack + * Fix 031 migration failed on DB2 + +------------------------------------------------------------------- +Thu Feb 27 01:06:14 UTC 2014 - cloud-devel(a)suse.de + +- Update to version glance-2014.1.dev126.g0190393: + * Use six.StringIO/BytesIO instead of StringIO.StringIO + +------------------------------------------------------------------- +Wed Feb 26 01:10:36 UTC 2014 - cloud-devel(a)suse.de + +- Update to version glance-2014.1.dev125.g6165966: + * Use 0-based indices for location entries + * Keep py3.X compatibility for urllib + +------------------------------------------------------------------- +Tue Feb 25 01:08:49 UTC 2014 - cloud-devel(a)suse.de + +- Update to version glance-2014.1.dev121.g8739451: + * Replaced "...\'%s\'..." with "...'%s'..." + * Updated from global requirements + +------------------------------------------------------------------- +Sun Feb 23 01:07:34 UTC 2014 - cloud-devel(a)suse.de + +- Update to version glance-2014.1.dev118.g09fd5a6: + * Fix logging context to include user_identity + * Added undescore function to some strings + * Replacement mox by mock + * Add support for PartialTask list + +------------------------------------------------------------------- +Fri Feb 21 01:11:22 UTC 2014 - cloud-devel(a)suse.de + +- Update to version glance-2014.1.dev111.g8762a7b: + * Glance all: Replace basestring by six for python3 compatability + * Delete image metadata after image is deleted + * Modify assert statement when comparing with None + * Enable hacking H301 and disable H304, H302 + +------------------------------------------------------------------- +Wed Feb 19 14:18:34 UTC 2014 - cloud-devel(a)suse.de + +- Update to version glance-2014.1.dev104.g4267af6: + * Use uuid instead of uuidutils + * Use six.moves.urllib.parse instead of urlparse + * Switch over to oslosphinx + * Fix parsing of AMQP configuration + * Enable F841 check + * Sync log.py from oslo + * Improve help strings + +------------------------------------------------------------------- +Fri Feb 14 07:42:57 UTC 2014 - cloud-devel(a)suse.de + +- Update to version glance-2014.1.dev90.ge98576e: + * Add `virtual_size` to Glance's API v2 + * Add a virtual_size attribute to the Image model + * Adding status field to image location -- DB migration + +------------------------------------------------------------------- +Tue Feb 11 17:16:26 UTC 2014 - speilicke(a)suse.com + +- Update to version glance-2014.1.dev86.g70ff603: + * Add a mailmap entry for myself + * Add unit tests around glance-manage + * Remove tox locale overrides + * Apply image location selection strategy + * Switch to testrepository for running tests + * Clean up DatabaseMigrationError + * Enable H302 check + * Fix misspellings in glance + * Expose image property 'owner' in v2 API + * Removes logging of location uri + * Updated from global requirements + * Remove duplicate type defination of v2 images schema + * Enable H202 check + * Modify my mailmap + * glance-manage wont take version into consideration + * Move scrubber outside the store package + * Depending on python-swiftclient>=1.6 + * Now psutil>=1.1.0 is actually on PyPI + * Fix indentation errors found by Pep8 1.4.6+ + * Add VMware storage backend to location strategy + * Log a warning when a create fails due to quota + * glance requires pyOpenSSL>=0.11 + * Imported Translations from Transifex + * VMware Datastore storage backend + * Restore image status to 'queued' if upload failed + * Don't override transport_url with old configs + * Provide explicit image create value in Registry v2 Client test + * Provide explicit task create and update value in controller tests ++++ 2 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/openstack-glance/openstack-glance-doc.changes ++++ and /work/SRC/openSUSE:Factory/.openstack-glance.new/openstack-glance-doc.changes --- /work/SRC/openSUSE:Factory/openstack-glance/openstack-glance.changes 2014-03-09 18:28:08.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.openstack-glance.new/openstack-glance.changes 2014-04-14 10:53:09.000000000 +0200 @@ -2 +2 @@ -Fri Feb 14 11:14:44 UTC 2014 - speilicke(a)suse.com +Thu Mar 27 10:15:05 UTC 2014 - dmueller(a)suse.com @@ -3,0 +4,231 @@ +- switch back to Icehouse branch + +------------------------------------------------------------------- +Thu Mar 27 01:43:36 UTC 2014 - cloud-devel(a)suse.de + +- Update to version glance-2014.1.dev44.gdc2672a: + * Return 405 when attempting DELETE on /tasks + * Removes use of timeutils.set_time_override + * Remove dependency of test_v1_api on other tests + +------------------------------------------------------------------- +Wed Mar 26 01:45:27 UTC 2014 - cloud-devel(a)suse.de + +- Update to version glance-2014.1.dev38.gb5d3295: + * Pass Message object to webob exception + +------------------------------------------------------------------- +Tue Mar 25 01:45:25 UTC 2014 - cloud-devel(a)suse.de + +- Update to version glance-2014.1.dev36.gaabc62a: + * VMware store.add to return the image size uploaded + * registry: log errors on failure + +------------------------------------------------------------------- +Sat Mar 22 01:43:03 UTC 2014 - cloud-devel(a)suse.de + +- Update to version glance-2014.1.dev32.g09265f6: + * Remove openstack.common.fixture + +------------------------------------------------------------------- +Fri Mar 21 01:55:00 UTC 2014 - cloud-devel(a)suse.de + +- Update to version glance-2014.1.dev31.g49d3220: + * Detect MultiDict when generating json body + +------------------------------------------------------------------- +Tue Mar 18 12:26:44 UTC 2014 - dmueller(a)suse.com + +- fix requires + +------------------------------------------------------------------- +Tue Mar 18 10:14:08 UTC 2014 - speilicke(a)suse.com + +- Fix changelog + +------------------------------------------------------------------- +Mon Mar 17 09:46:49 UTC 2014 - rhafer(a)suse.com + +- switch over to non-openstack-prefix'ed users + +------------------------------------------------------------------- +Mon Mar 17 01:06:30 UTC 2014 - cloud-devel(a)suse.de + +- Update to version glance-2014.1.dev29.gddae276: + * Make the VMware datastore backend more robust + * Add copyright text to glance/openstack/common/__init__.py + +------------------------------------------------------------------- +Sat Mar 15 01:08:05 UTC 2014 - cloud-devel(a)suse.de + +- Update to version glance-2014.1.dev26.gc6365cc: + * Makes possible to enable Registry API v1 and v2 + * Fix glance db migration failed on 031 + * Include Location header in POST /tasks response + * Catch exception when image cache pruning + +------------------------------------------------------------------- +Fri Mar 14 00:36:46 UTC 2014 - cloud-devel(a)suse.de + +- Update to version glance-2014.1.dev19.g2d3fa9e: + * Updated from global requirements + * Provide an upgrade period for enabling stores + * API v2: Allow GET on unowned images with show_image_direct_url + +------------------------------------------------------------------- +Thu Mar 13 01:43:11 UTC 2014 - cloud-devel(a)suse.de + +- Update to version glance-2014.1.dev14.g09b583e: + * Remove import specific validation from tasks resource + * Provide explicit image create value in Registry v2 API test + +------------------------------------------------------------------- +Tue Mar 11 01:50:25 UTC 2014 - cloud-devel(a)suse.de + +- Update to version glance-2014.1.dev10.gcc118d4: + * Don't enable all stores by default + 2014.1.b3 + * Log 'image_id' with all BadStoreURI error messages + +------------------------------------------------------------------- +Thu Mar 6 01:33:33 UTC 2014 - cloud-devel(a)suse.de + +- Update to version glance-2014.1.dev147.g70422c4: + * Document for API message localization + * Add the OVA container format + * Store URI must start with the expected URI scheme + +------------------------------------------------------------------- +Wed Mar 5 00:52:08 UTC 2014 - cloud-devel(a)suse.de + +- Update to version glance-2014.1.dev141.gf70b72b: + * Add support for API message localization + +------------------------------------------------------------------- +Tue Mar 4 01:30:16 UTC 2014 - cloud-devel(a)suse.de + +- Update to version glance-2014.1.dev140.gbfddf66: + * Replaced calls of get(foo, None) -> get(foo) + +------------------------------------------------------------------- +Mon Mar 3 11:42:27 UTC 2014 - cloud-devel(a)suse.de + +- Update to version glance-2014.1.dev138.g3838629: + * Documentation for Glance tasks + * Sync common db code from Oslo + +------------------------------------------------------------------- +Sat Mar 1 00:46:12 UTC 2014 - cloud-devel(a)suse.de + +- Update to version glance-2014.1.dev134.g0e2b8ca: + * VMware storage backend should use oslo.vmware + * Refactor UUID test + * Rename Openstack to OpenStack + * Fix 031 migration failed on DB2 + +------------------------------------------------------------------- +Thu Feb 27 01:06:27 UTC 2014 - cloud-devel(a)suse.de + +- Update to version glance-2014.1.dev126.g0190393: + * Use six.StringIO/BytesIO instead of StringIO.StringIO + +------------------------------------------------------------------- +Wed Feb 26 01:10:39 UTC 2014 - cloud-devel(a)suse.de + +- Update to version glance-2014.1.dev125.g6165966: + * Use 0-based indices for location entries + * Keep py3.X compatibility for urllib + +------------------------------------------------------------------- +Tue Feb 25 01:08:53 UTC 2014 - cloud-devel(a)suse.de + +- Update to version glance-2014.1.dev121.g8739451: + * Replaced "...\'%s\'..." with "...'%s'..." + * Updated from global requirements + +------------------------------------------------------------------- +Sun Feb 23 01:07:37 UTC 2014 - cloud-devel(a)suse.de + +- Update to version glance-2014.1.dev118.g09fd5a6: + * Fix logging context to include user_identity + * Added undescore function to some strings + * Replacement mox by mock + * Add support for PartialTask list + +------------------------------------------------------------------- +Fri Feb 21 01:11:25 UTC 2014 - cloud-devel(a)suse.de + +- Update to version glance-2014.1.dev111.g8762a7b: + * Glance all: Replace basestring by six for python3 compatability + * Delete image metadata after image is deleted + * Modify assert statement when comparing with None + * Enable hacking H301 and disable H304, H302 + +------------------------------------------------------------------- +Wed Feb 19 14:18:38 UTC 2014 - cloud-devel(a)suse.de + +- Update to version glance-2014.1.dev104.g4267af6: + * Use uuid instead of uuidutils + * Use six.moves.urllib.parse instead of urlparse + * Switch over to oslosphinx + * Fix parsing of AMQP configuration + * Enable F841 check + * Sync log.py from oslo + * Improve help strings + +------------------------------------------------------------------- +Wed Feb 19 10:55:42 UTC 2014 - dmueller(a)suse.com + +- remove 0001-Switch-over-to-oslosphinx.patch + +------------------------------------------------------------------- +Fri Feb 14 07:43:00 UTC 2014 - cloud-devel(a)suse.de + +- Update to version glance-2014.1.dev90.ge98576e: + * Add `virtual_size` to Glance's API v2 + * Add a virtual_size attribute to the Image model + * Adding status field to image location -- DB migration + +------------------------------------------------------------------- +Thu Feb 13 13:45:42 UTC 2014 - dmueller(a)suse.com + +- added patches: + * 0001-Switch-over-to-oslosphinx.patch + ++++ 651 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/openstack-glance/openstack-glance.changes ++++ and /work/SRC/openSUSE:Factory/.openstack-glance.new/openstack-glance.changes Old: ---- 0001-RBD-add-now-returns-correct-size-if-given-zero.patch glance-dont-test-qpid.patch glance-stable-havana.tar.gz New: ---- glance-2014.1.b3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openstack-glance-doc.spec ++++++ --- /var/tmp/diff_new_pack.ky6Azy/_old 2014-04-14 10:53:10.000000000 +0200 +++ /var/tmp/diff_new_pack.ky6Azy/_new 2014-04-14 10:53:10.000000000 +0200 @@ -17,20 +17,19 @@ %define component glance - Name: openstack-%{component}-doc -Version: 2013.2.3.dev1.g9d89b8e +Version: 2014.1.b3 Release: 0 Summary: OpenStack Image Service (Glance) - Documentation License: Apache-2.0 Group: Documentation/HTML Url: https://launchpad.net/glance -Source0: http://tarballs.openstack.org/glance/glance-stable-havana.tar.gz +Source0: http://tarballs.openstack.org/glance/glance-%{version}.tar.gz BuildRequires: graphviz BuildRequires: openstack-suse-macros BuildRequires: python-Sphinx BuildRequires: python-base -BuildRequires: python-oslo.sphinx +BuildRequires: python-oslosphinx BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ openstack-glance.spec ++++++ --- /var/tmp/diff_new_pack.ky6Azy/_old 2014-04-14 10:53:10.000000000 +0200 +++ /var/tmp/diff_new_pack.ky6Azy/_new 2014-04-14 10:53:10.000000000 +0200 @@ -18,35 +18,31 @@ %define component glance -%define groupname openstack-%{component} -%define username openstack-%{component} +%define groupname %{component} +%define username %{component} Name: openstack-%{component} -Version: 2013.2.3.dev1.g9d89b8e +Version: 2014.1.b3 Release: 0 Summary: OpenStack Image Service (Glance) License: Apache-2.0 Group: System/Management Url: https://launchpad.net/glance -Source0: http://tarballs.openstack.org/glance/glance-stable-havana.tar.gz +Source0: http://tarballs.openstack.org/glance/glance-%{version}.tar.gz Source1: openstack-glance.init Source5: %{name}.logrotate %if 0%{?suse_version} > 1230 Source10: %name.conf BuildRequires: systemd %endif -# PATCH-FIX-OPENSUSE: speilicke(a)suse.com -- Don't test qpid functionality, we have no packages -Patch2: glance-dont-test-qpid.patch -# https://review.openstack.org/#/c/59079/ https://bugs.launchpad.net/glance/+bug/1256044 -Patch3: 0001-RBD-add-now-returns-correct-size-if-given-zero.patch BuildRequires: crudini BuildRequires: fdupes BuildRequires: openstack-suse-macros BuildRequires: python-base -BuildRequires: python-distribute +BuildRequires: python-setuptools # Documentation build requirements: BuildRequires: python-Sphinx -BuildRequires: python-oslo.sphinx +BuildRequires: python-oslosphinx Requires: logrotate Requires: python >= 2.6.8 Requires: python-glance = %{version} @@ -90,26 +86,31 @@ Requires: python-SQLAlchemy >= 0.7.8 Requires: python-WebOb >= 1.2.3 Requires: python-anyjson >= 0.3.3 -Requires: python-boto >= 2.4.0 +Requires: python-argparse +Requires: python-boto >= 2.12.0 Requires: python-cinderclient >= 1.0.6 Requires: python-eventlet >= 0.13.0 Requires: python-greenlet >= 0.3.2 -Requires: python-httplib2 +Requires: python-httplib2 >= 0.7.5 Requires: python-iso8601 >= 0.1.8 -Requires: python-jsonschema >= 1.3.0 -Requires: python-keystoneclient >= 0.3.2 +Requires: python-jsonschema >= 2.0.0 +Requires: python-keystoneclient >= 0.6.0 Requires: python-kombu >= 2.4.8 -Requires: python-lxml >= 2.3 Requires: python-oslo.config >= 1.2.0 -Requires: python-passlib -Requires: python-pbr >= 0.5.21 -Requires: python-psutil >= 0.6.1 -Requires: python-pyOpenSSL +Requires: python-oslo.messaging >= 1.3.0a4 +Requires: python-oslo.vmware >= 0.2 +%if %suse_version < 1120 +Requires: python-ordereddict +%endif +Requires: python-pbr >= 0.6 +Requires: python-psutil >= 1.1.1 +Requires: python-pyOpenSSL >= 0.11 Requires: python-pycrypto >= 2.6 Requires: python-six >= 1.4.1 -Requires: python-sqlalchemy-migrate >= 0.7.2 -Requires: python-swiftclient >= 1.5 -Requires: python-wsgiref >= 0.1.2 +Requires: python-sqlalchemy-migrate >= 0.8.2 +Requires: python-stevedore >= 0.14 +Requires: python-suds >= 0.4 +Requires: python-swiftclient >= 1.6 Requires: python-xattr >= 0.4 %description -n python-glance @@ -119,23 +120,17 @@ Summary: OpenStack Image Service (Glance) - Testsuite Group: Development/Languages/Python Requires: %{name} = %{version} -Requires: python-coverage >= 3.6 +Requires: python-discover Requires: python-fixtures >= 0.3.14 -Requires: python-flake8 >= 2.0 Requires: python-glanceclient -Requires: python-hacking >= 0.5.6 Requires: python-mock >= 1.0 Requires: python-mox >= 0.5.3 -Requires: python-nose -Requires: python-nose-exclude -Requires: python-nosehtmloutput >= 0.0.3 -Requires: python-openstack.nose_plugin >= 0.7 -Requires: python-pep8 >= 1.4.5 Requires: python-psycopg2 -Requires: python-pyflakes >= 0.7.2 Requires: python-pysendfile >= 2.0.0 Requires: python-requests >= 1.1 -Requires: python-testtools >= 0.9.32 +Requires: python-sqlalchemy-migrate >= 0.8.2 +Requires: python-testrepository >= 0.0.18 +Requires: python-testtools >= 0.9.34 Requires: python-xattr >= 0.4 %description test @@ -144,8 +139,6 @@ %prep %setup -q -n %{component}-%{version} -%patch2 -p1 -%patch3 -p1 %openstack_cleanup_prep sed -i "s|^#!.*||" tools/migrate_image_owners.py # Fix non-executable script warning # NOTE(saschpe): The following test contains a pesky (commented) race condition @@ -211,9 +204,7 @@ mkdir -p %{buildroot}%{_localstatedir}/cache/glance/registry %pre -getent group %{groupname} >/dev/null || groupadd -r %{groupname} -getent passwd %{username} >/dev/null || useradd -r -g %{groupname} -d %{_localstatedir}/lib/glance -s /sbin/nologin -c "OpenStack Glance Daemons" %{username} -exit 0 +%openstack_pre_user_group_create %{username} %{groupname} %post %fillup_and_insserv openstack-glance-api openstack-glance-registry @@ -237,7 +228,8 @@ %config %{_sysconfdir}/glance/glance-registry-paste.ini %config %{_sysconfdir}/glance/logging.cnf.sample %config %{_sysconfdir}/glance/policy.json -%config %{_sysconfdir}/glance/property-protections.conf.sample +%config %{_sysconfdir}/glance/property-protections-policies.conf.sample +%config %{_sysconfdir}/glance/property-protections-roles.conf.sample %config %{_sysconfdir}/glance/schema-image.json %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %dir %attr(0755, %{username}, %{groupname}) %{_localstatedir}/lib/glance @@ -271,8 +263,9 @@ %{_mandir}/man1/glance-control.1%{?ext_man} %{_mandir}/man1/glance-manage.1%{?ext_man} %{_mandir}/man1/glance-registry.1%{?ext_man} +%{_mandir}/man1/glance-replicator.1%{?ext_man} %{_mandir}/man1/glance-scrubber.1%{?ext_man} -%dir %attr(0755, %{username}, %{groupname}) %{_localstatedir}/cache/glance +%dir %attr(0750, %{username}, %{groupname}) %{_localstatedir}/cache/glance %files -n python-glance %defattr(-,root,root,-) ++++++ _service ++++++ --- /var/tmp/diff_new_pack.ky6Azy/_old 2014-04-14 10:53:10.000000000 +0200 +++ /var/tmp/diff_new_pack.ky6Azy/_new 2014-04-14 10:53:10.000000000 +0200 @@ -5,6 +5,8 @@ <service mode="disabled" name="set_version"> <param name="basename">glance</param> </service> + <service mode="disabled" name="python_requires"> + </service> <service name="refresh_patches" mode="disabled"> <param name="changesgenerate">enable</param> </service> ++++++ glance-stable-havana.tar.gz -> glance-2014.1.b3.tar.gz ++++++ ++++ 356671 lines of diff (skipped) ++++++ openstack-glance.conf ++++++ --- /var/tmp/diff_new_pack.ky6Azy/_old 2014-04-14 10:53:11.000000000 +0200 +++ /var/tmp/diff_new_pack.ky6Azy/_new 2014-04-14 10:53:11.000000000 +0200 @@ -1 +1 @@ -d /var/run/openstack-glance 0755 openstack-glance openstack-glance - +d /var/run/openstack-glance 0755 glance glance - ++++++ openstack-glance.init ++++++ --- /var/tmp/diff_new_pack.ky6Azy/_old 2014-04-14 10:53:11.000000000 +0200 +++ /var/tmp/diff_new_pack.ky6Azy/_new 2014-04-14 10:53:11.000000000 +0200 @@ -13,7 +13,7 @@ ### END INIT INFO DAEMON="__NAME__" -USER="openstack-glance" +USER="glance" CONFFILE="/etc/glance/glance-$DAEMON.conf" RUNDIR="/var/run/glance" ++++++ openstack-glance.logrotate ++++++ --- /var/tmp/diff_new_pack.ky6Azy/_old 2014-04-14 10:53:11.000000000 +0200 +++ /var/tmp/diff_new_pack.ky6Azy/_new 2014-04-14 10:53:11.000000000 +0200 @@ -7,7 +7,7 @@ dateext missingok notifempty - su openstack-glance openstack-glance + su glance glance copytruncate sharedscripts } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit openstack-dashboard for openSUSE:Factory
by root＠hilbert.suse.de 14 Apr '14

14 Apr '14

Hello community, here is the log from the commit of package openstack-dashboard for openSUSE:Factory checked in at 2014-04-14 10:52:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openstack-dashboard (Old) and /work/SRC/openSUSE:Factory/.openstack-dashboard.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openstack-dashboard" Changes: -------- --- /work/SRC/openSUSE:Factory/openstack-dashboard/openstack-dashboard.changes 2014-03-09 18:27:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.openstack-dashboard.new/openstack-dashboard.changes 2014-04-14 10:52:56.000000000 +0200 @@ -2 +2 @@ -Sat Mar 1 00:54:21 UTC 2014 - cloud-devel(a)suse.de +Wed Apr 9 17:03:45 UTC 2014 - dmueller(a)suse.com @@ -4 +4,241 @@ -- Update to version horizon-2013.2.3.dev4.g206fa03: +- update to 2014.1.rc2: + * no real change + +------------------------------------------------------------------- +Mon Apr 7 14:44:22 UTC 2014 - dmueller(a)suse.com + +- switch to icehouse branch once again + +------------------------------------------------------------------- +Tue Apr 1 09:17:06 UTC 2014 - speilicke(a)suse.com + +- Update to version 2014.1.rc1: + * Added network's api mocking for the servers_update_addresses method + * Make "Gigabytes" quotas description more meaningful + * Plugin-based panel group configuration + * Fix Exceptions doc page generation + * Updated from global requirements + * Adding missing system dependencies to quickstart + * Enable settings/change password on keystone v3 + * Remove non dev dependency on mox + * Remove the update default quotas feature + * Handle "null" time values for Stacks + * Clarify description string for image metric + * Remove English compiled catalogs after compilemessages + * Sync default OPENSTACK_KEYSTONE_DEFAULT_ROLE with keystone + * Fix wrong links to volume detail + * Make makemessage ignore option work with Django 1.6 + * Add missing trunk segment type option for profile create + * Update .tx/config with type of files + * Switch over to oslosphinx + * Pre-select the network when there's only one + * Fix project name in the table for Cisco N1K profiles + * Disables the clear text password UI by default + * I18N: Fix untranslatable strings in LBaaS workflow + * Remove get_resource_or_fake method in VPN panel + * Make project left-side menu titles consistent + * Update "dashboard" setting documentation + * Error message in create vol with a vol source + * Selected instances are not deleted with pagination + * Changed the label from Edit Rules to Manage Rules + * Hidden checkboxes in Availability Zones table + * Remove I18N strings from test/settings.py + * Handle failures on column filters more gracefully + * Fix unbound local error in instance DetailView + * Host aggregates missing the metadata column + * Clarified success message for instance resize + * Improve help message in Retrieve Password form + * Remove verbose_name from hidden fields + * Fix username's maximum length to match the backend + * Mark string in routerrule template translatable + * Allow translator to control the word order (update extra spec) + * No need to mark strings in test_plugin translatable + * enable plugins to override templates + * Fix selenium imports on tests + * Fixing potential attribute access on None + * Updated from global requirements + * Fix unbound locals in IPAssociationWorkflow + * Adding django 1.6 support + * Enforce length checking for instance name field + * Fix Membership list loading bug + * Updated outdated docstring, fixed typo/space + * Updated from global requirements + * Raise an error when no slug on tab group + * Fixes description field extension + * Adding resource link to resource detail page in Heat view + * Additional optional Environment data to heat template selection + * On flavors menu, the _update.html file was deleted + * Fix distribution pie chart + * Allow 'Manage Host' to show membership action + * Fix middleware to not access session fields without user auth + * Updated from global requirements + * Fixing heat stack status column + +------------------------------------------------------------------- +Thu Mar 27 14:40:12 UTC 2014 - dmueller(a)suse.com + +- add 0001-Do-not-load-jasmine-without-DEBUG-setting.patch + +------------------------------------------------------------------- +Thu Mar 27 10:43:00 UTC 2014 - dmueller(a)suse.com + +- fix requires + +------------------------------------------------------------------- +Wed Mar 26 11:08:09 UTC 2014 - dmueller(a)suse.com + +- fix django compat with SLE11 + +------------------------------------------------------------------- +Fri Mar 7 08:52:43 UTC 2014 - speilicke(a)suse.com + +- Change to version 2014.1.b3 +- Add python_requires source service + +------------------------------------------------------------------- +Thu Mar 6 00:41:03 UTC 2014 - cloud-devel(a)suse.de + +- Update to version horizon-2014.1.dev240.g3a153c8: + * update test to hit default page instead of login + * Heat Stack update view/form + * Host aggregates panel + * Adds support for Nova RDP console + * Fix animation on pie charts + +------------------------------------------------------------------- +Wed Mar 5 00:45:24 UTC 2014 - cloud-devel(a)suse.de + +- Update to version horizon-2014.1.dev231.g9f8a5eb: + * Use unminified javascript files + * Add flavor extra spec key templates + * Plugin-based panel configuration + * Refactor CSV generation code to utils + * Sort requirement files in alphabetical order + * Add disk config option support + * Implementing accordion navigation + +------------------------------------------------------------------- +Tue Mar 4 00:39:24 UTC 2014 - cloud-devel(a)suse.de + +- Update to version horizon-2014.1.dev217.g7356386: + * Basic support for Cinder v2 + * Remove delete action and bar when stack is DELETE_COMPLETE + +------------------------------------------------------------------- +Mon Mar 3 11:37:44 UTC 2014 - cloud-devel(a)suse.de + +- Update to version horizon-2014.1.dev213.g898ccff: + * Fix typo + +------------------------------------------------------------------- +Sun Mar 2 00:51:53 UTC 2014 - cloud-devel(a)suse.de + +- Update to version horizon-2014.1.dev212.g24ff867: + * Integration tests - running the tests + * Add jasmine testing and helpers + +------------------------------------------------------------------- +Sat Mar 1 01:01:03 UTC 2014 - cloud-devel(a)suse.de + +- Update to version horizon-2014.1.dev208.g1cad534: + * Enhance pie chart capabilities + * Remove apps from settings + * Updated from global requirements + * update test to handle IntegerField html change + * Exclude local directory from flake8 tests + * Replace horizon.utils with an angular one + * Restrict the length of the Security Group name input + * get_user_home test fix for django 1.6 + +------------------------------------------------------------------- +Thu Feb 27 01:39:11 UTC 2014 - cloud-devel(a)suse.de + +- Update to version horizon-2014.1.dev192.gac0ccc8: + * Clean up Cinder client traces in the test output + * Rename UpdateDefaultQuotas to UpdateDefaultQuotasStep + * Add missing mocked calls to the Volumes tests + * Use six.StringIO/BytesIO instead of StringIO.StringIO + * Replace horizon.conf with an angular one + * The order of fields have changed for update default quota form + * Empty email for users gets saved as an empty string + +------------------------------------------------------------------- +Wed Feb 26 01:44:01 UTC 2014 - cloud-devel(a)suse.de + +- Update to version horizon-2014.1.dev180.g56801e0: + * Reduce number of novaclient calls + * Allow redisplay of the workflow from its handle() + * Fixing filesizeformat test issue with Django 1.6 + * sort flavors on Resize Instance modal + * Updated from global requirements + * List all tenant images/snapshots on admin images view + * Keep py3.X compatibility for urllib + * Use six.moves.urllib.parse instead of urlparse + * Add Daily Usage tab to Resource Usage panel + * Use the min_disk property for volume size + * Add a Row check to enable/disable checkbox on ajax updates + +------------------------------------------------------------------- +Tue Feb 25 01:00:33 UTC 2014 - cloud-devel(a)suse.de + +- Update to version horizon-2014.1.dev159.gb771d46: + * Enforce FlavorExtraSpecs Key format + * Fix a code indentation error + * Move volume snapshots table to volumes panel + +------------------------------------------------------------------- +Mon Feb 24 00:59:51 UTC 2014 - cloud-devel(a)suse.de + +- Update to version horizon-2014.1.dev153.gb41c1db: + * Bug fix on neutron's API to return the correct target ID + +------------------------------------------------------------------- +Sat Feb 22 01:42:32 UTC 2014 - cloud-devel(a)suse.de ++++ 827 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/openstack-dashboard/openstack-dashboard.changes ++++ and /work/SRC/openSUSE:Factory/.openstack-dashboard.new/openstack-dashboard.changes Old: ---- 0001-Give-no-background-color-to-the-pie-charts.patch 0001-Use-default_project_id-for-v3-users.patch horizon-stable-havana.tar.gz New: ---- 0001-Do-not-load-jasmine-without-DEBUG-setting.patch horizon-2014.1.rc2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openstack-dashboard.spec ++++++ --- /var/tmp/diff_new_pack.FLgjFn/_old 2014-04-14 10:52:56.000000000 +0200 +++ /var/tmp/diff_new_pack.FLgjFn/_new 2014-04-14 10:52:56.000000000 +0200 @@ -19,26 +19,24 @@ %define component horizon Name: openstack-dashboard -Version: 2013.2.3.dev4.g206fa03 +Version: 2014.1.rc2 Release: 0 Summary: OpenStack Dashboard (Horizon) License: Apache-2.0 Group: Development/Languages/Python Url: http://wiki.openstack.org/OpenStackDashboard -Source: http://tarballs.openstack.org/horizon/horizon-stable-havana.tar.gz +Source: http://tarballs.openstack.org/horizon/horizon-%{version}.tar.gz # Apache2 example configuration: Source2: openstack-dashboard.conf.sample # PATCH-FIX-SUSE: Use a saner default for static/media files Patch0: suse-fix-webroot-paths.diff -Patch2: 0001-Give-no-background-color-to-the-pie-charts.patch -Patch3: 0001-Use-default_project_id-for-v3-users.patch +Patch1: 0001-Do-not-load-jasmine-without-DEBUG-setting.patch BuildRequires: apache2 BuildRequires: fdupes BuildRequires: openstack-suse-macros BuildRequires: python-devel BuildRequires: python-pbr >= 0.5 -BuildRequires: python-setuptools -Requires: %{name}-branding = 2013.2 +Requires: %{name}-branding = 2014.1 Requires: apache2 Requires: apache2-mod_wsgi Requires: python >= 2.6.8 @@ -74,7 +72,7 @@ Summary: OpenStack Dashboard (Horizon) - Upstream Branding Group: Development/Languages/Python Provides: %{name}-branding = %{version} -Provides: %{name}-branding = 2013.2 +Provides: %{name}-branding = 2014.1 Conflicts: otherproviders(%{name}-branding) Supplements: packageand(%{name}:branding-upstream) %if 0%{?suse_version} && 0%{?suse_version} > 1110 @@ -87,27 +85,33 @@ %package -n python-horizon Summary: OpenStack Dashboard (Horizon) - Python Module Group: Development/Languages/Python -Requires: python-ceilometerclient >= 1.0.5 -Requires: python-cinderclient >= 1.0.6 +%if 0%{?suse_version} && 0%{?suse_version} <= 1110 Requires: python-django >= 1.4 +%else +Requires: python-Django >= 1.4 +%endif +Requires: python-ceilometerclient >= 1.0.6 +Requires: python-cinderclient >= 1.0.6 Requires: python-django_compressor >= 1.3 -Requires: python-django_openstack_auth >= 1.1.3 +Requires: python-django_openstack_auth >= 1.1.4 Requires: python-eventlet >= 0.13.0 Requires: python-glanceclient >= 0.9.0 Requires: python-heatclient >= 0.2.3 Requires: python-heatclient >= 0.2.3 -Requires: python-horizon-branding = 2013.2 -Requires: python-iso8601 >= 0.1.8 -Requires: python-keystoneclient >= 0.3.2 +Requires: python-horizon-branding = 2014.1 +Requires: python-iso8601 >= 0.1.9 +Requires: python-keystoneclient >= 0.7.0 Requires: python-kombu >= 2.4.8 Requires: python-lesscpy >= 0.9j Requires: python-lockfile >= 0.8 -Requires: python-netaddr -Requires: python-neutronclient >= 2.3.0 -Requires: python-novaclient >= 2.15.0 -Requires: python-pbr >= 0.5.21 +Requires: python-netaddr >= 0.7.6 +Requires: python-neutronclient >= 2.3.4 +Requires: python-novaclient >= 2.17.0 +Requires: python-pbr >= 0.6 Requires: python-pytz >= 2010h -Requires: python-swiftclient >= 1.5 +Requires: python-six >= 1.5.2 +Requires: python-swiftclient >= 1.6 +Requires: python-troveclient >= 1.0.3 %description -n python-horizon The Python module horizon is the core component of the OpenStack @@ -117,7 +121,7 @@ Summary: OpenStack Dashboard (Horizon) - Python Module Upstream Branding Group: Development/Languages/Python Provides: python-horizon-branding = %{version} -Provides: python-horizon-branding = 2013.2 +Provides: python-horizon-branding = 2014.1 Conflicts: otherproviders(python-horizon-branding) Supplements: packageand(python-horizon:branding-upstream) %if 0%{?suse_version} && 0%{?suse_version} > 1110 @@ -131,26 +135,17 @@ Summary: OpenStack Dashboard (Horizon) - Testsuite Group: Development/Languages/Python Requires: %{name} = %{version} -Requires: python-coverage >= 3.6 Requires: python-django-nose -Requires: python-django-nose-selenium -Requires: python-flake8 >= 2.0 -Requires: python-hacking >= 0.5.6 Requires: python-mox >= 0.5.3 -Requires: python-netaddr +Requires: python-netaddr >= 0.7.6 Requires: python-nose Requires: python-nose-exclude Requires: python-nosehtmloutput >= 0.0.3 Requires: python-nosexcover Requires: python-openstack.nose_plugin >= 0.7 -Requires: python-pep8 >= 1.4.5 -Requires: python-pyflakes >= 0.7.2 -%if 0%{?with_selenium} -Requires: python-selenium -%else # python-selenium is not available by default, but we can try to drag it in Recommends: python-selenium -%endif +Requires: python-testtools >= 0.9.34 %description test The OpenStack dashboard testsuite. It is used to verify the @@ -159,8 +154,7 @@ %prep %setup -q -n %{component}-%{version} %patch0 -%patch2 -p1 -%patch3 -p1 +%patch1 -p1 %openstack_cleanup_prep %build @@ -211,6 +205,7 @@ %dir %attr(0750, wwwrun, www) /srv/www/openstack-dashboard/openstack_dashboard/local %attr(0640, wwwrun, www) /srv/www/openstack-dashboard/openstack_dashboard/local/__init__.py* %config(noreplace) %attr(0640, wwwrun, www) /srv/www/openstack-dashboard/openstack_dashboard/local/local_settings.py +/srv/www/openstack-dashboard/openstack_dashboard/local/ /srv/www/openstack-dashboard/openstack_dashboard/api/ /srv/www/openstack-dashboard/openstack_dashboard/dashboards/ /srv/www/openstack-dashboard/openstack_dashboard/openstack/ @@ -219,6 +214,7 @@ %exclude /srv/www/openstack-dashboard/openstack_dashboard/templates %exclude /srv/www/openstack-dashboard/openstack_dashboard/test/ /srv/www/openstack-dashboard/openstack_dashboard/usage/ +/srv/www/openstack-dashboard/openstack_dashboard/enabled/ /srv/www/openstack-dashboard/openstack_dashboard/wsgi/ /srv/www/openstack-dashboard/openstack_dashboard/conf/ /srv/www/openstack-dashboard/openstack_dashboard/*.py* @@ -235,28 +231,20 @@ %dir /srv/www/openstack-dashboard/openstack_dashboard/locale %dir /srv/www/openstack-dashboard/openstack_dashboard/locale/* %dir /srv/www/openstack-dashboard/openstack_dashboard/locale/*/LC_MESSAGES -#%lang(bg-bg) /srv/www/openstack-dashboard/openstack_dashboard/locale/bg_BG/LC_MESSAGES/django.mo -#%lang(ca) /srv/www/openstack-dashboard/openstack_dashboard/locale/ca/LC_MESSAGES/django.mo -#%lang(cs) /srv/www/openstack-dashboard/openstack_dashboard/locale/cs/LC_MESSAGES/django.mo -#%lang(en) /srv/www/openstack-dashboard/openstack_dashboard/locale/en/LC_MESSAGES/django.mo +%lang(de) /srv/www/openstack-dashboard/openstack_dashboard/locale/de/LC_MESSAGES/django.mo %lang(en-au) /srv/www/openstack-dashboard/openstack_dashboard/locale/en_AU/LC_MESSAGES/django.mo %lang(en-gb) /srv/www/openstack-dashboard/openstack_dashboard/locale/en_GB/LC_MESSAGES/django.mo %lang(es) /srv/www/openstack-dashboard/openstack_dashboard/locale/es/LC_MESSAGES/django.mo -#%lang(fi-fi) /srv/www/openstack-dashboard/openstack_dashboard/locale/fi_FI/LC_MESSAGES/django.mo %lang(fr) /srv/www/openstack-dashboard/openstack_dashboard/locale/fr/LC_MESSAGES/django.mo -#%lang(hu) /srv/www/openstack-dashboard/openstack_dashboard/locale/hu/LC_MESSAGES/django.mo -#%lang(it) /srv/www/openstack-dashboard/openstack_dashboard/locale/it/LC_MESSAGES/django.mo +%lang(hi) /srv/www/openstack-dashboard/openstack_dashboard/locale/hi/LC_MESSAGES/django.mo %lang(ja) /srv/www/openstack-dashboard/openstack_dashboard/locale/ja/LC_MESSAGES/django.mo -#%lang(ka-ge) /srv/www/openstack-dashboard/openstack_dashboard/locale/ka_GE/LC_MESSAGES/django.mo %lang(ko) /srv/www/openstack-dashboard/openstack_dashboard/locale/ko_KR/LC_MESSAGES/django.mo %lang(nl-nl) /srv/www/openstack-dashboard/openstack_dashboard/locale/nl_NL/LC_MESSAGES/django.mo -#%lang(pl) /srv/www/openstack-dashboard/openstack_dashboard/locale/pl/LC_MESSAGES/django.mo %lang(pl-pl) /srv/www/openstack-dashboard/openstack_dashboard/locale/pl_PL/LC_MESSAGES/django.mo -#%lang(pt) /srv/www/openstack-dashboard/openstack_dashboard/locale/pt/LC_MESSAGES/django.mo -%lang(ru) /srv/www/openstack-dashboard/openstack_dashboard/locale/ru/LC_MESSAGES/django.mo %lang(pt-br) /srv/www/openstack-dashboard/openstack_dashboard/locale/pt_BR/LC_MESSAGES/django.mo +%lang(sr) /srv/www/openstack-dashboard/openstack_dashboard/locale/sr/LC_MESSAGES/django.mo %lang(zh-cn) /srv/www/openstack-dashboard/openstack_dashboard/locale/zh_CN/LC_MESSAGES/django.mo -%lang(zh-tw) /srv/www/openstack-dashboard/openstack_dashboard/locale/zh_TW/LC_MESSAGES/django.mo +%lang(zh_TW) /srv/www/openstack-dashboard/openstack_dashboard/locale/zh_TW/LC_MESSAGES/django.mo %files branding-upstream %defattr(-,root,root) ++++++ 0001-Do-not-load-jasmine-without-DEBUG-setting.patch ++++++ >From e823933506fbd194dba300326f4315dfd4c59ef9 Mon Sep 17 00:00:00 2001 From: Dirk Mueller <dirk(a)dmllr.de> Date: Thu, 27 Mar 2014 15:38:03 +0100 Subject: [PATCH] Do not load jasmine without DEBUG setting importing horizon.test.jasmine is pulling in quite a lot of test-only dependencies that are not needed during production deployment. Move it into the DEBUG section only. Change-Id: I01e6d406dd16940b5fccef749fb509602b1f2e46 --- horizon/site_urls.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/horizon/site_urls.py b/horizon/site_urls.py index a2cb4c4..c2d2353 100644 --- a/horizon/site_urls.py +++ b/horizon/site_urls.py @@ -23,7 +23,6 @@ from django.conf.urls import include # noqa from django.conf.urls import patterns # noqa from django.conf.urls import url # noqa from django.views.generic import TemplateView # noqa -from horizon.test.jasmine import jasmine urlpatterns = patterns('horizon.views', url(r'^home/$', 'user_home', name='user_home') @@ -41,6 +40,8 @@ urlpatterns += patterns('', ) if settings.DEBUG: + from horizon.test.jasmine import jasmine + urlpatterns += patterns('', url(r'^qunit/$', TemplateView.as_view(template_name="horizon/qunit.html"), -- 1.9.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.FLgjFn/_old 2014-04-14 10:52:56.000000000 +0200 +++ /var/tmp/diff_new_pack.FLgjFn/_new 2014-04-14 10:52:56.000000000 +0200 @@ -5,6 +5,8 @@ <service mode="disabled" name="set_version"> <param name="basename">horizon</param> </service> + <service mode="disabled" name="python_requires"> + </service> <service name="refresh_patches" mode="disabled"> <param name="changesgenerate">enable</param> </service> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit openstack-cinder for openSUSE:Factory
by root＠hilbert.suse.de 14 Apr '14

14 Apr '14

Hello community, here is the log from the commit of package openstack-cinder for openSUSE:Factory checked in at 2014-04-14 10:52:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openstack-cinder (Old) and /work/SRC/openSUSE:Factory/.openstack-cinder.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openstack-cinder" Changes: -------- --- /work/SRC/openSUSE:Factory/openstack-cinder/openstack-cinder-doc.changes 2013-08-07 20:46:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.openstack-cinder.new/openstack-cinder-doc.changes 2014-04-14 10:52:48.000000000 +0200 @@ -1,0 +2,227 @@ +Fri Mar 7 08:54:29 UTC 2014 - speilicke(a)suse.com + +- Update to version cinder-2014.1.dev7.gd6b3b12: + * Clean Up EMC VNX Direct Driver in Cinder + * Include next link when default limit is reached + * Fix HP LeftHand Performance issue with AO + * NetApp implementation for copy offload in clustered nfs driver + 2014.1.b3 + +------------------------------------------------------------------- +Thu Mar 6 01:17:24 UTC 2014 - cloud-devel(a)suse.de + +- Update to version cinder-2014.1.dev360.g586b284: + * Remove str() from LOG.* and exceptions + * Storwize volume manage/unmanage support + * Volume manage/unmanage support + * Add user defined extra capabilities + * Fix HP LeftHand migration with snapshots + * Add EMC VNX Direct Driver in Cinder + * Check if snapshot is deleted cleanly + * GlusterFS: Set permissions on qcow2 snapshot files + * Quota delete operation in cinder + * NetApp eseries iscsi driver implementation + +------------------------------------------------------------------- +Wed Mar 5 00:37:40 UTC 2014 - cloud-devel(a)suse.de + +- Update to version cinder-2014.1.dev340.gee371df: + * remove _check_container_exists from Swift backup driver + * Add initiator_target_map for IBM Storwize/SVC + * Typo corrections for test files in cinder + * gpfs volume driver backup file access fixes + * Add versioning output for the FC Zone Manager + * Remove unused methods + +------------------------------------------------------------------- +Tue Mar 4 00:41:02 UTC 2014 - cloud-devel(a)suse.de + +- Update to version cinder-2014.1.dev328.g283af11: + * Updated from global requirements + * Fix docstring ordering + +------------------------------------------------------------------- +Mon Mar 3 11:50:06 UTC 2014 - cloud-devel(a)suse.de + +- Update to version cinder-2014.1.dev324.g34f4b56: + * Add initiator target map in EMC SMI-S FC driver + * Replace httplib.HTTPSConnection in unittests + * Remove rabbit_notifier (Sync notifier with oslo d6e1ba7) + +------------------------------------------------------------------- +Mon Mar 3 01:31:02 UTC 2014 - cloud-devel(a)suse.de + +- Update to version cinder-2014.1.dev318.g55ca367: + * Restrict rootwrap find filter for IBM NAS and GPFS + * change time.sleep to use loopingcall + * Change RBD delete failure log level to warn + * Updated from global requirements + * Update Oslo wiki link in README + * Segment LUN clones in NetApp iSCSI + * test_volume unittest fails if ran only this module + * Deactivate LV before removing + * VMware: changing volumeops tests from mox to mock + +------------------------------------------------------------------- +Sun Mar 2 07:26:25 UTC 2014 - cloud-devel(a)suse.de + +- Update to version cinder-2014.1.dev301.g6c346e8: + * Give a way to save why a service has been disabled + +------------------------------------------------------------------- +Sun Mar 2 01:18:03 UTC 2014 - cloud-devel(a)suse.de + +- Update to version cinder-2014.1.dev299.ge43678f: + * Make EMC SMI-S driver unit tests faster + * Remove unused variable + +------------------------------------------------------------------- +Sat Mar 1 00:57:21 UTC 2014 - cloud-devel(a)suse.de + +- Update to version cinder-2014.1.dev296.g6b15c40: + * Fix volume stats with multiple LeftHand clusters + * Export and import backup service metadata + * Don't clear host_state_map when scheduling + * Add volume metadata backup suport to swift driver + * Add optional ionice to volume clearing process + * Restrict rootwrap find filter for NetAppNFS driver + * GlusterFS: Increase snapshot delete job timeout to two hours + * updating testing readme with more current information + * Python 3: replace "im_self" by "__self__" + * Change warning message in NetApp driver for vsadmin creds + * TSM backup driver changes to support file backup + +------------------------------------------------------------------- +Thu Feb 27 00:38:34 UTC 2014 - cloud-devel(a)suse.de + +- Update to version cinder-2014.1.dev274.g41ddaba: + * Update FibreChannel Zone Manager config + * 3PAR: Fix extend volume GiB to MiB + * Fix silly error in comment + * 3PAR: Create volume from snapshot with larger size + * Fix test_delete_should_not_.. to assert something + * Use len instead of for-loop to get the end index + +------------------------------------------------------------------- +Wed Feb 26 00:56:31 UTC 2014 - cloud-devel(a)suse.de + +- Update to version cinder-2014.1.dev262.gbcbca12: + * Fix free_capacity reporting in SolidFire driver + * Replace assertEqual(None, *) with assertIsNone in tests + * Replace tearDown with addCleanup + * Use six.StringIO instead of StringIO.StringIO + * Implement retype in IBM GPFS Driver and refactor + * 3PAR: Delete missing snapshot stuck in error_del + * Added 3par initiator target map for FCZM + * Fix race in test_delete_backup + * Storwize/SVC: Change volume copy task to async + * Fix invalid facilities documented in rootwrap.conf + * Removes use of timeutils.set_time_override + * Brick support for pNFS + +------------------------------------------------------------------- +Tue Feb 25 00:36:09 UTC 2014 - cloud-devel(a)suse.de + +- Update to version cinder-2014.1.dev239.gf2137b3: + * Driver for IBM SONAS and Storwize V7000 Unified + * Fix webob.exc.HTTPForbidden parameter miss + * Fix FC connection handling in the storwize driver + * Add support for FC zone lifecycle management + * 3PAR: Backend assisted volume migrate + * Add x-openstack-request-id to cinder responses + * Sync oslo imageutils, strutils to cinder + * Add encrypted flag to volumes + * Nexenta iSCSI driver: fixed volume_migration + * Change default policy for volume_extension:volume_tenant_attribute + +------------------------------------------------------------------- +Mon Feb 24 01:17:02 UTC 2014 - cloud-devel(a)suse.de + +- Update to version cinder-2014.1.dev219.gf028c8a: + * Remove old driver mapping deprecation + +------------------------------------------------------------------- +Sun Feb 23 01:42:43 UTC 2014 - cloud-devel(a)suse.de + +- Update to version cinder-2014.1.dev217.gc2807f0: + * Add HP MSA Fiber Channel driver + * Use six.moves cStringIO instead of cStringIO + +------------------------------------------------------------------- +Sat Feb 22 01:18:09 UTC 2014 - cloud-devel(a)suse.de + +- Update to version cinder-2014.1.dev213.gf3df7ef: + * Add support for qos_specs feature to 3PAR drivers + * Update 3PAR drivers to pass cert test + +------------------------------------------------------------------- +Fri Feb 21 01:08:43 UTC 2014 - cloud-devel(a)suse.de + +- Update to version cinder-2014.1.dev209.g4d4b5f7: + * Ensure return for db api functions + * HP LeftHand Backend assisted volume migrate + * Remove unused function + * IBM XIV and DS8000 Driver reorganizing (IBM dir) + * Update gpfs driver volume creation process + +------------------------------------------------------------------- +Thu Feb 20 00:55:53 UTC 2014 - cloud-devel(a)suse.de + +- Update to version cinder-2014.1.dev199.g7f7997d: + * Ensures NetApp iSCSI driver correctly compares int values for size + * Sync request_id, request_utils for cinder + * GPFS: Implement volume backup and restore + * Implement retype in HP LeftHand driver + +------------------------------------------------------------------- +Wed Feb 19 01:17:11 UTC 2014 - cloud-devel(a)suse.de + +- Update to version cinder-2014.1.dev192.ge96f3b5: + * Add support for backing up volume metadata + +------------------------------------------------------------------- +Sun Feb 16 00:58:19 UTC 2014 - cloud-devel(a)suse.de + +- Update to version cinder-2014.1.dev190.g37eb101: + * Imported Translations from Transifex + * Replace assertEqual(None, *) with assertIsNone in tests + * Cast the quota set values to integer before checking their validity + * Remove dependent module py3kcompat + * Add EMC SMI-S FC Driver in Cinder + * Fix wrong example of "nova_endpoint_template" + * Remove unused exception + * Add searchDepth when getClusterInfo called + * Fix cinder-backup volume restore with ceph driver + * lvm: unhandled exception when migrating volume + +------------------------------------------------------------------- ++++ 30 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/openstack-cinder/openstack-cinder-doc.changes ++++ and /work/SRC/openSUSE:Factory/.openstack-cinder.new/openstack-cinder-doc.changes --- /work/SRC/openSUSE:Factory/openstack-cinder/openstack-cinder.changes 2014-02-11 10:40:17.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.openstack-cinder.new/openstack-cinder.changes 2014-04-14 10:52:48.000000000 +0200 @@ -2 +2,293 @@ -Thu Feb 6 14:48:37 UTC 2014 - dmueller(a)suse.com +Mon Apr 7 14:58:37 UTC 2014 - dmueller(a)suse.com + +- switch over to icehouse branch + +------------------------------------------------------------------- +Mon Mar 17 09:42:57 UTC 2014 - rhafer(a)suse.com + +- switch over to non-openstack-prefix'ed users + +------------------------------------------------------------------- +Fri Mar 7 08:53:28 UTC 2014 - speilicke(a)suse.com + +- Change to version 2014.1.b3 + +------------------------------------------------------------------- +Thu Mar 6 01:17:29 UTC 2014 - cloud-devel(a)suse.de + +- Update to version cinder-2014.1.dev360.g586b284: + * Remove str() from LOG.* and exceptions + * Storwize volume manage/unmanage support + * Volume manage/unmanage support + * Add user defined extra capabilities + * Fix HP LeftHand migration with snapshots + * Add EMC VNX Direct Driver in Cinder + * Check if snapshot is deleted cleanly + * GlusterFS: Set permissions on qcow2 snapshot files + * Quota delete operation in cinder + * NetApp eseries iscsi driver implementation + +------------------------------------------------------------------- +Wed Mar 5 00:37:44 UTC 2014 - cloud-devel(a)suse.de + +- Update to version cinder-2014.1.dev340.gee371df: + * remove _check_container_exists from Swift backup driver + * Add initiator_target_map for IBM Storwize/SVC + * Typo corrections for test files in cinder + * gpfs volume driver backup file access fixes + * Add versioning output for the FC Zone Manager + * Remove unused methods + +------------------------------------------------------------------- +Tue Mar 4 00:41:06 UTC 2014 - cloud-devel(a)suse.de + +- Update to version cinder-2014.1.dev328.g283af11: + * Updated from global requirements + * Fix docstring ordering + +------------------------------------------------------------------- +Mon Mar 3 11:50:11 UTC 2014 - cloud-devel(a)suse.de + +- Update to version cinder-2014.1.dev324.g34f4b56: + * Add initiator target map in EMC SMI-S FC driver + * Replace httplib.HTTPSConnection in unittests + * Remove rabbit_notifier (Sync notifier with oslo d6e1ba7) + +------------------------------------------------------------------- +Mon Mar 3 01:31:07 UTC 2014 - bwiedemann(a)suse.com + +- Update to version cinder-2014.1.dev318.g55ca367: + * Restrict rootwrap find filter for IBM NAS and GPFS + * change time.sleep to use loopingcall + * Change RBD delete failure log level to warn + * Updated from global requirements + * Update Oslo wiki link in README + * Segment LUN clones in NetApp iSCSI + * test_volume unittest fails if ran only this module + * Deactivate LV before removing + - Drop 0001-Deactivate-LV-before-removing.patch + * VMware: changing volumeops tests from mox to mock + +------------------------------------------------------------------- +Sun Mar 2 07:26:31 UTC 2014 - cloud-devel(a)suse.de + +- Update to version cinder-2014.1.dev301.g6c346e8: + * Give a way to save why a service has been disabled + +------------------------------------------------------------------- +Sun Mar 2 01:18:29 UTC 2014 - cloud-devel(a)suse.de + +- Update to version cinder-2014.1.dev299.ge43678f: + * Make EMC SMI-S driver unit tests faster + * Remove unused variable + +------------------------------------------------------------------- +Sat Mar 1 00:57:25 UTC 2014 - cloud-devel(a)suse.de + +- Update to version cinder-2014.1.dev296.g6b15c40: + * Fix volume stats with multiple LeftHand clusters + * Export and import backup service metadata + * Don't clear host_state_map when scheduling + * Add volume metadata backup suport to swift driver + * Add optional ionice to volume clearing process + * Restrict rootwrap find filter for NetAppNFS driver + * GlusterFS: Increase snapshot delete job timeout to two hours + * updating testing readme with more current information + * Python 3: replace "im_self" by "__self__" + * Change warning message in NetApp driver for vsadmin creds + * TSM backup driver changes to support file backup + +------------------------------------------------------------------- +Thu Feb 27 00:38:38 UTC 2014 - cloud-devel(a)suse.de + +- Update to version cinder-2014.1.dev274.g41ddaba: + * Update FibreChannel Zone Manager config + * 3PAR: Fix extend volume GiB to MiB + * Fix silly error in comment + * 3PAR: Create volume from snapshot with larger size + * Fix test_delete_should_not_.. to assert something + * Use len instead of for-loop to get the end index + +------------------------------------------------------------------- +Wed Feb 26 00:56:36 UTC 2014 - cloud-devel(a)suse.de + +- Update to version cinder-2014.1.dev262.gbcbca12: + * Fix free_capacity reporting in SolidFire driver + * Replace assertEqual(None, *) with assertIsNone in tests + * Replace tearDown with addCleanup + * Use six.StringIO instead of StringIO.StringIO + * Implement retype in IBM GPFS Driver and refactor + * 3PAR: Delete missing snapshot stuck in error_del + * Added 3par initiator target map for FCZM + * Fix race in test_delete_backup + * Storwize/SVC: Change volume copy task to async + * Fix invalid facilities documented in rootwrap.conf + * Removes use of timeutils.set_time_override + * Brick support for pNFS + +------------------------------------------------------------------- +Tue Feb 25 00:36:13 UTC 2014 - cloud-devel(a)suse.de + +- Update to version cinder-2014.1.dev239.gf2137b3: + * Driver for IBM SONAS and Storwize V7000 Unified + * Fix webob.exc.HTTPForbidden parameter miss + * Fix FC connection handling in the storwize driver + * Add support for FC zone lifecycle management + * 3PAR: Backend assisted volume migrate + * Add x-openstack-request-id to cinder responses + * Sync oslo imageutils, strutils to cinder + * Add encrypted flag to volumes + * Nexenta iSCSI driver: fixed volume_migration + * Change default policy for volume_extension:volume_tenant_attribute + +------------------------------------------------------------------- +Mon Feb 24 01:17:06 UTC 2014 - cloud-devel(a)suse.de + +- Update to version cinder-2014.1.dev219.gf028c8a: + * Remove old driver mapping deprecation + +------------------------------------------------------------------- +Sun Feb 23 01:42:47 UTC 2014 - cloud-devel(a)suse.de + +- Update to version cinder-2014.1.dev217.gc2807f0: + * Add HP MSA Fiber Channel driver + * Use six.moves cStringIO instead of cStringIO + +------------------------------------------------------------------- +Sat Feb 22 01:18:13 UTC 2014 - cloud-devel(a)suse.de + +- Update to version cinder-2014.1.dev213.gf3df7ef: + * Add support for qos_specs feature to 3PAR drivers + * Update 3PAR drivers to pass cert test + +------------------------------------------------------------------- +Fri Feb 21 16:30:38 UTC 2014 - dmueller(a)suse.com + +- only run migrations on api service + +------------------------------------------------------------------- +Fri Feb 21 01:08:47 UTC 2014 - cloud-devel(a)suse.de + +- Update to version cinder-2014.1.dev209.g4d4b5f7: + * Ensure return for db api functions + * HP LeftHand Backend assisted volume migrate + * Remove unused function + * IBM XIV and DS8000 Driver reorganizing (IBM dir) + * Update gpfs driver volume creation process + +------------------------------------------------------------------- +Thu Feb 20 00:55:57 UTC 2014 - cloud-devel(a)suse.de + +- Update to version cinder-2014.1.dev199.g7f7997d: + * Ensures NetApp iSCSI driver correctly compares int values for size + * Sync request_id, request_utils for cinder + * GPFS: Implement volume backup and restore + * Implement retype in HP LeftHand driver + +------------------------------------------------------------------- +Wed Feb 19 01:17:16 UTC 2014 - cloud-devel(a)suse.de + +- Update to version cinder-2014.1.dev192.ge96f3b5: + * Add support for backing up volume metadata + +------------------------------------------------------------------- +Sun Feb 16 00:58:23 UTC 2014 - cloud-devel(a)suse.de + +- Update to version cinder-2014.1.dev190.g37eb101: ++++ 889 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/openstack-cinder/openstack-cinder.changes ++++ and /work/SRC/openSUSE:Factory/.openstack-cinder.new/openstack-cinder.changes Old: ---- 0001-Deactivate-LV-before-removing.patch 0001-NetApp-fix-for-vsadmin-role-failure-for-ssc.patch 0001-Robustify-skipactivation-detection.patch 0001-Set-useful-vendor-product-id-in-Cinder-ISCSI-exports.patch cinder-stable-havana.tar.gz New: ---- cinder-milestone-proposed.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openstack-cinder-doc.spec ++++++ --- /var/tmp/diff_new_pack.NIh1gk/_old 2014-04-14 10:52:49.000000000 +0200 +++ /var/tmp/diff_new_pack.NIh1gk/_new 2014-04-14 10:52:49.000000000 +0200 @@ -19,13 +19,13 @@ %define component cinder Name: openstack-%{component}-doc -Version: 2013.2.2.dev21.g240c81d +Version: 2014.1.dev17.g512170a Release: 0 Summary: OpenStack Block Storage (Cinder) - Documentation License: Apache-2.0 Group: Documentation/HTML Url: https://launchpad.net/cinder -Source: cinder-stable-havana.tar.gz +Source: http://tarballs.openstack.org/cinder/cinder-milestone-proposed.tar.gz BuildRequires: graphviz BuildRequires: openstack-suse-macros BuildRequires: python-Babel @@ -38,8 +38,6 @@ BuildRequires: python-base BuildRequires: python-cinder = %{version} BuildRequires: python-cinderclient -BuildRequires: python-d2to1 -BuildRequires: python-distribute BuildRequires: python-eventlet BuildRequires: python-feedparser BuildRequires: python-glanceclient < 2 @@ -47,9 +45,10 @@ BuildRequires: python-lxml BuildRequires: python-mox BuildRequires: python-oslo.config -BuildRequires: python-oslo.sphinx +BuildRequires: python-oslosphinx BuildRequires: python-paramiko BuildRequires: python-pbr +BuildRequires: python-setuptools BuildRequires: python-sqlalchemy-migrate BuildRequires: python-suds BuildArch: noarch @@ -62,7 +61,7 @@ This package contains documentation files for %{name}. %prep -%setup -q -n cinder-2013.2.2.dev21.g240c81d +%setup -q -n cinder-%{version} %openstack_cleanup_prep %build ++++++ openstack-cinder.spec ++++++ --- /var/tmp/diff_new_pack.NIh1gk/_old 2014-04-14 10:52:49.000000000 +0200 +++ /var/tmp/diff_new_pack.NIh1gk/_new 2014-04-14 10:52:49.000000000 +0200 @@ -17,17 +17,17 @@ %define component cinder -%define groupname openstack-%{component} -%define username openstack-%{component} +%define groupname %{component} +%define username %{component} Name: openstack-%{component} -Version: 2013.2.2.dev21.g240c81d +Version: 2014.1.dev17.g512170a Release: 0 Summary: OpenStack Block Storage (Cinder) License: Apache-2.0 Group: System/Management Url: https://launchpad.net/cinder -Source: cinder-stable-havana.tar.gz +Source: http://tarballs.openstack.org/cinder/cinder-milestone-proposed.tar.gz Source1: %{name}.init Source2: %{name}.logrotate Source3: cinder-sudoers @@ -36,16 +36,12 @@ BuildRequires: systemd %endif Patch0: 0001-Avoid-using-GREENDNS-due-to-dnspython.patch -Patch1: 0001-Set-useful-vendor-product-id-in-Cinder-ISCSI-exports.patch -Patch2: 0001-Robustify-skipactivation-detection.patch -Patch3: 0001-NetApp-fix-for-vsadmin-role-failure-for-ssc.patch -Patch4: 0001-Deactivate-LV-before-removing.patch BuildRequires: fdupes BuildRequires: openstack-suse-macros BuildRequires: openstack-suse-sudo BuildRequires: python-base -BuildRequires: python-distribute >= 0.6.24 BuildRequires: python-oslo.config +BuildRequires: python-setuptools BuildRequires: python-six # Documentation build requirements: BuildRequires: crudini @@ -55,7 +51,7 @@ BuildRequires: python-argparse BuildRequires: python-eventlet BuildRequires: python-iso8601 -BuildRequires: python-oslo.sphinx +BuildRequires: python-oslosphinx BuildRequires: python-paramiko BuildRequires: python-pbr BuildRequires: python-stevedore >= 0.8 @@ -65,7 +61,7 @@ Requires: python-cinder = %{version} Requires: python-kombu >= 2.4.8 Requires: python-oslo.config >= 1.2.0 -Requires: python-swiftclient >= 1.5 +Requires: python-swiftclient >= 1.6 %if 0%{?suse_version} > 1110 Requires(pre): pwdutils %else @@ -100,17 +96,19 @@ Requires: python-eventlet >= 0.13.0 Requires: python-glanceclient >= 0.9.0 Requires: python-greenlet >= 0.3.2 -Requires: python-iso8601 >= 0.1.8 -Requires: python-keystoneclient >= 0.3.2 -Requires: python-lockfile >= 0.8 +Requires: python-iso8601 >= 0.1.9 +Requires: python-keystoneclient >= 0.7.0 Requires: python-lxml >= 2.3 -Requires: python-netaddr -Requires: python-novaclient >= 2.15.0 -Requires: python-paramiko >= 1.8.0 -Requires: python-six >= 1.4.1 -Requires: python-sqlalchemy-migrate >= 0.7.2 -Requires: python-stevedore >= 0.10 +Requires: python-netaddr >= 0.7.6 +Requires: python-novaclient >= 2.17.0 +Requires: python-oslo.rootwrap +Requires: python-paramiko >= 1.9.0 +Requires: python-rtslib-fb >= 2.1.39 +Requires: python-six >= 1.5.2 +Requires: python-sqlalchemy-migrate >= 0.8.2 +Requires: python-stevedore >= 0.14 Requires: python-suds >= 0.4 +Requires: python-taskflow >= 0.1.3 Requires: python-wsgiref >= 0.1.2 %description -n python-cinder @@ -168,36 +166,28 @@ Requires: git-core Requires: python-amqplib >= 0.6.1 Requires: python-cinderclient -Requires: python-coverage >= 3.6 %if 0%{?suse_version} && 0%{?suse_version} <= 1110 Requires: python-discover %endif Requires: python-fixtures >= 0.3.14 -Requires: python-flake8 >= 2.0 Requires: python-glanceclient >= 0.9.0 -Requires: python-hacking >= 0.5.6 -Requires: python-hp3parclient >= 2.0 +Requires: python-hp3parclient >= 3.0 +Requires: python-hplefthandclient >= 1.0.0 Requires: python-mock >= 1.0 Requires: python-mox >= 0.5.3 -Requires: python-pbr >= 0.5.21 -Requires: python-pep8 >= 1.4.5 +Requires: python-pbr >= 0.6 Requires: python-psycopg2 -Requires: python-pyflakes >= 0.7.2 -Requires: python-python-subunit -Requires: python-testrepository >= 0.0.17 -Requires: python-testtools >= 0.9.32 +Requires: python-python-subunit >= 0.0.18 +Requires: python-testrepository >= 0.0.18 +Requires: python-testtools >= 0.9.34 %description test The OpenStack Cinder testsuite. It is used to verify the functionality of OpenStack Cinder. %prep -%setup -q -n cinder-2013.2.2.dev21.g240c81d +%setup -q -n cinder-2014.1.dev17.g512170a %patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 %openstack_cleanup_prep %build @@ -256,7 +246,6 @@ ### set default configuration (mostly applies to package-only setups and quickstart, i.e. not generally crowbar) %define cinder_conf %{buildroot}%{_sysconfdir}/cinder/cinder.conf crudini --set %{cinder_conf} DEFAULT verbose True -#NOTE(saschpe): Don't set 'log_file', each cinder deamon will create it's own if only 'log_dir' is set: crudini --set %{cinder_conf} DEFAULT log_dir /var/log/cinder crudini --set %{cinder_conf} DEFAULT auth_strategy keystone crudini --set %{cinder_conf} DEFAULT rootwrap_config /etc/cinder/rootwrap.conf @@ -269,9 +258,7 @@ crudini --set %{cinder_conf} DEFAULT lock_path /var/run/%component %pre -getent group %{groupname} >/dev/null || groupadd -r %{groupname} -getent passwd %{username} >/dev/null || useradd -r -g %{groupname} -d %{_localstatedir}/lib/%{component} -s /sbin/nologin -c "OpenStack Cinder Daemons" %{username} -exit 0 +%openstack_pre_user_group_create %{username} %{groupname} %post api %{fillup_and_insserv -f %{name}-api} @@ -333,6 +320,7 @@ %config %{_sysconfdir}/%{component}/policy.json %config %{_sysconfdir}/%{component}/rootwrap.conf %{_bindir}/%{component}-all +%{_bindir}/%{component}-rtstool %{_bindir}/%{component}-clear-rabbit-queues %{_bindir}/%{component}-manage %{_bindir}/%{component}-rootwrap ++++++ 0001-Avoid-using-GREENDNS-due-to-dnspython.patch ++++++ --- /var/tmp/diff_new_pack.NIh1gk/_old 2014-04-14 10:52:49.000000000 +0200 +++ /var/tmp/diff_new_pack.NIh1gk/_new 2014-04-14 10:52:49.000000000 +0200 @@ -15,11 +15,11 @@ cinder/tests/__init__.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) -diff --git a/cinder/tests/__init__.py b/cinder/tests/__init__.py -index cb73bd3..36cb11d 100644 ---- a/cinder/tests/__init__.py -+++ b/cinder/tests/__init__.py -@@ -30,6 +30,21 @@ +Index: cinder-2014.1.dev120.gf52cb1b/cinder/tests/__init__.py +=================================================================== +--- cinder-2014.1.dev120.gf52cb1b.orig/cinder/tests/__init__.py ++++ cinder-2014.1.dev120.gf52cb1b/cinder/tests/__init__.py +@@ -28,6 +28,21 @@ .. moduleauthor:: Andy Smith <andy(a)anarkystic.com> """ @@ -41,6 +41,3 @@ import eventlet eventlet.monkey_patch() --- -1.8.3.1 - ++++++ _service ++++++ --- /var/tmp/diff_new_pack.NIh1gk/_old 2014-04-14 10:52:49.000000000 +0200 +++ /var/tmp/diff_new_pack.NIh1gk/_new 2014-04-14 10:52:49.000000000 +0200 @@ -1,11 +1,12 @@ <services> - <service name="git_tarballs" mode="disabled"> -  - <param name="url">http://tarballs.openstack.org/cinder/cinder-stable-havana.tar.gz</param> - <param name="email">opensuse-cloud(a)opensuse.org</param> - <param name="plain-version">True</param> + <service mode="disabled" name="download_files"> + <param name="changesgenerate">enable</param> + </service> + <service mode="disabled" name="set_version"> + <param name="basename">cinder</param> + </service> + <service mode="disabled" name="python_requires"> </service> - <service name="refresh_patches" mode="disabled"> <param name="changesgenerate">enable</param> </service> ++++++ cinder-sudoers ++++++ --- /var/tmp/diff_new_pack.NIh1gk/_old 2014-04-14 10:52:49.000000000 +0200 +++ /var/tmp/diff_new_pack.NIh1gk/_new 2014-04-14 10:52:49.000000000 +0200 @@ -1 +1 @@ -openstack-cinder ALL = (root) NOPASSWD: /usr/bin/cinder-rootwrap /etc/cinder/rootwrap.conf * +cinder ALL = (root) NOPASSWD: /usr/bin/cinder-rootwrap /etc/cinder/rootwrap.conf * ++++++ openstack-cinder.conf ++++++ --- /var/tmp/diff_new_pack.NIh1gk/_old 2014-04-14 10:52:49.000000000 +0200 +++ /var/tmp/diff_new_pack.NIh1gk/_new 2014-04-14 10:52:49.000000000 +0200 @@ -1 +1 @@ -d /var/run/openstack-cinder 0700 openstack-cinder openstack-cinder - +d /var/run/openstack-cinder 0700 cinder cinder - ++++++ openstack-cinder.init ++++++ --- /var/tmp/diff_new_pack.NIh1gk/_old 2014-04-14 10:52:49.000000000 +0200 +++ /var/tmp/diff_new_pack.NIh1gk/_new 2014-04-14 10:52:49.000000000 +0200 @@ -13,7 +13,7 @@ ### END INIT INFO DAEMON="__NAME__" -USER="openstack-cinder" +USER="cinder" CONFFILE="/etc/cinder/cinder.conf" RUNDIR="/var/run/cinder" @@ -24,10 +24,11 @@ case "$1" in start) - echo -n "Checking for DB Migrations" - test -f /var/log/cinder/cinder-manage.log && chown $USER. /var/log/cinder/cinder-manage.log - su $USER -s /bin/sh -c "/usr/bin/cinder-manage db sync" - rc_status -v + if [ "$DAEMON" = "api" ]; then + echo -n "Checking for DB Migrations" + su $USER -s /bin/sh -c "/usr/bin/cinder-manage db sync" + rc_status -v + fi echo -n "Starting cinder-$DAEMON" su $USER -s /bin/sh -c "/sbin/startproc -q -s /usr/bin/cinder-$DAEMON --config-file=$CONFFILE" ++++++ openstack-cinder.logrotate ++++++ --- /var/tmp/diff_new_pack.NIh1gk/_old 2014-04-14 10:52:49.000000000 +0200 +++ /var/tmp/diff_new_pack.NIh1gk/_new 2014-04-14 10:52:49.000000000 +0200 @@ -7,7 +7,7 @@ dateext missingok notifempty - su openstack-cinder openstack-cinder + su cinder cinder copytruncate sharedscripts } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit openstack-ceilometer for openSUSE:Factory
by root＠hilbert.suse.de 14 Apr '14

14 Apr '14

Hello community, here is the log from the commit of package openstack-ceilometer for openSUSE:Factory checked in at 2014-04-14 10:52:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openstack-ceilometer (Old) and /work/SRC/openSUSE:Factory/.openstack-ceilometer.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openstack-ceilometer" Changes: -------- --- /work/SRC/openSUSE:Factory/openstack-ceilometer/openstack-ceilometer-doc.changes 2013-12-10 16:03:19.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.openstack-ceilometer.new/openstack-ceilometer-doc.changes 2014-04-14 10:52:43.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Jan 8 15:27:19 UTC 2014 - speilicke(a)suse.com + +- Fix requirements + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/openstack-ceilometer/openstack-ceilometer.changes 2014-01-30 17:41:20.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.openstack-ceilometer.new/openstack-ceilometer.changes 2014-04-14 10:52:44.000000000 +0200 @@ -2 +2,104 @@ -Thu Jan 30 01:18:33 UTC 2014 - cloud-devel(a)suse.de +Tue Apr 1 09:23:11 UTC 2014 - speilicke(a)suse.com + +- Update to version 2014.1.rc1: + * Imported Translations from Transifex + * Use ConectionPool instead of one Connection in HBase + * remove dump tables from previous migrations + * De-dupe selectable aggregate list in statistics API + * improve performance of resource-list in sql + * SSL errors thrown with Postgres on multi workers + * Remove escape character in string format + * Verify user/project ID for alarm created by non-admin user + * enable a single worker by default + * Fix ceilometer.conf.sample mismatch + * Fix order of arguments in assertEquals + * Documenting hypervisor support for nova meters + * Ensure idempotency of cardinality reduction in mongo + * VMware vSphere: Improve the accuracy of queried samples + * Fix validation error for invalid field name in simple query + * fix create_or_update logic to avoid rollbacks + * Avoid swallowing AssertionError in test skipping logic + * Fix hardware pollster to inspect multiple resources + * spawn multiple workers in services + * Install global lazy _() + * Fixes Hyper-V metrics units + * Ensure intended indices on project_id are created for mongo + * Fix the type of the disk IO rate measurements + * Change the sample_type from tuple to string + * Fix order of arguments in assertEquals + * Ensure alarm rule conform to alarm type + * insecure flag added to novaclient + * Fixes duplicated names in alarm time constraints + * Eventlet monkeypatch must be done before anything + * 028 migration script incorrectly skips over section + * Fix bug in get_capabilities behavior in DB drivers + * Added documentation for selectable aggregates + * Make sure use IPv6 sockets for ceilometer in IPv6 environment + * VMware vSphere: Bug fixes + * Ensure insecure config option propagated by alarm evaluator + * Fix order of arguments in assertEquals + * Fix order of arguments in assertEquals + * Fix order of arguments in assertEquals + * Rationalize get_resources for mongodb + * Ensure insecure config option propagated by alarm service + * add host meters to doc + * Add field translation to complex query from OldSample to Sample + * Extend test case to cover old alarm style conversion + * Updated doc with debug instructions + * Corrected the sample names in hardware pollsters + * Make ceilometer work with sqla 0.9.x + * Implements monitoring-network-from-opendaylight + * Add user-supplied arguments in log_handler + * VMware vSphere support: Disk rates + * Fix updating alarm can specify existing alarm name + * Changes for networking metrics support for vSphere + * VMware vSphere: Changes for cpu_util + * VMware vSphere support: Memory Usage + * Fix broken statistics in sqlalchemy + * Fixes Hyper-V Inspector network metrics values + * Set storage engine for the trait_type table + * Enable monkeypatch for select module + * Rename id to alarm_id of Alarm in SqlAlchemy + * Fix some spelling mistakes and a incorrect url + * Skip central agent interval_task when keystone fails +- Refreshed patches: + + 0001-Skip-tests-against-real-DB.patch (manually) + +------------------------------------------------------------------- +Wed Mar 26 23:10:13 UTC 2014 - dmueller(a)suse.com + +- add requires to pysnmp + +------------------------------------------------------------------- +Mon Mar 17 09:24:56 UTC 2014 - rhafer(a)suse.com + +- switch over to non-openstack-prefix'ed users + +------------------------------------------------------------------- +Fri Mar 7 08:53:28 UTC 2014 - speilicke(a)suse.com + +- Change to version 2014.1.b3 +- Sync requirements from master + +------------------------------------------------------------------- +Thu Mar 6 01:15:33 UTC 2014 - cloud-devel(a)suse.de + +- Update to version ceilometer-2014.1.dev261.g4d35b21: + * Per pipeline pluggable resource discovery + * VMware vSphere support: Performance Mgr APIs + +------------------------------------------------------------------- +Wed Mar 5 01:28:14 UTC 2014 - cloud-devel(a)suse.de + +- Update to version ceilometer-2014.1.dev257.gbf2a745: + * Wider selection of aggregates for sqlalchemy + * Wider selection of aggregates for mongodb + * Adds time constraints to alarms + * Remove code duplication Part 3 + * Decouple source and sink configuration for pipelines + * Selectable aggregate support in mongodb + * Selectable aggregation functions for statistics + * Add simple capabilities API + +------------------------------------------------------------------- +Tue Mar 04 01:18:08 UTC 2014 - cloud-devel(a)suse.de @@ -5 +108,219 @@ - + 0001-Skip-tests-against-real-DB.patch (only offset) + + remove-mysql-dependency.diff dropped (merged upstream) + +------------------------------------------------------------------- +Tue Mar 4 01:18:06 UTC 2014 - cloud-devel(a)suse.de + +- Update to version ceilometer-2014.1.dev241.gcae5b17: + * Removed global state modification by api test + * move databases to test requirements + * Make recording and scanning data more determined + * Alarms support in HBase Part 2 + +------------------------------------------------------------------- +Mon Mar 3 11:35:47 UTC 2014 - cloud-devel(a)suse.de + +- Update to version ceilometer-2014.1.dev233.ga18d028: + * Fix typo on testing doc page + +------------------------------------------------------------------- +Mon Mar 3 01:16:59 UTC 2014 - cloud-devel(a)suse.de + +- Update to version ceilometer-2014.1.dev231.gc60d2fa: + * Add comments for _build_paginate_query + +------------------------------------------------------------------- +Sun Mar 2 01:34:52 UTC 2014 - cloud-devel(a)suse.de + +- Update to version ceilometer-2014.1.dev229.g9a159dd: + * Alarm support in HBase Part 1 + +------------------------------------------------------------------- +Sat Mar 1 01:05:18 UTC 2014 - cloud-devel(a)suse.de + +- Update to version ceilometer-2014.1.dev227.g77b6458: + * Implements "not" operator for complex query + * Implements metadata query for complex query feature + * Remove unused variable + * Added hardware pollsters for the central agent + * Added hardware agent's inspector and snmp implementation + * Updated from global requirements + * Pluggable resource discovery for agents + * Remove code duplication Part 2 + * Imported Translations from Transifex + +------------------------------------------------------------------- +Thu Feb 27 01:41:35 UTC 2014 - cloud-devel(a)suse.de + +- Update to version ceilometer-2014.1.dev209.gd75d969: + * remove audit logging on flush + * Set default log level of iso8601 to WARN + * Sync latest config file generator from oslo-incubator + +------------------------------------------------------------------- +Wed Feb 26 01:40:49 UTC 2014 - cloud-devel(a)suse.de + +- Update to version ceilometer-2014.1.dev203.g9f60075: + * Tolerate absent recorded_at on older mongo/db2 samples + * api: export recorded_at in returned samples + * Fix the way how metadata is stored in HBase + * Remove code duplication + * sample table contains redundant/duplicate data + * rename meter table to sample + * Implements monitoring-network + * Implements in operator for complex query functionality + +------------------------------------------------------------------- +Sat Feb 22 16:18:39 UTC 2014 - dmueller(a)suse.com + +- Update to version ceilometer-2014.1.dev189.g2f9300f: + * storage: store recording timestamp + * Fixed spelling error in Ceilometer + * Updated from global requirements + * Remove code that works around a (now-resolved) bug in pecan + * Fix missing source field content on /v2/samples API + +------------------------------------------------------------------- +Fri Feb 21 08:39:14 UTC 2014 - dmueller(a)suse.com + +- use root-owned dir for pidfiles + +------------------------------------------------------------------- +Fri Feb 21 01:01:03 UTC 2014 - cloud-devel(a)suse.de + +- Update to version ceilometer-2014.1.dev180.g168e0e3: + * Refactor timestamp existence validation in V2 API + * Implements field validation for complex query functionality + * allow hacking to set dependencies + * Fix some flaws in ceilometer docstrings + * Fix recursive_keypairs output + +------------------------------------------------------------------- ++++ 721 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/openstack-ceilometer/openstack-ceilometer.changes ++++ and /work/SRC/openSUSE:Factory/.openstack-ceilometer.new/openstack-ceilometer.changes Old: ---- 0001-enable-sql-metadata-query.patch ceilometer-stable-havana.tar.gz New: ---- ceilometer-2014.1.rc1.tar.gz openstack-ceilometer.conf ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openstack-ceilometer-doc.spec ++++++ --- /var/tmp/diff_new_pack.ZJXlh0/_old 2014-04-14 10:52:45.000000000 +0200 +++ /var/tmp/diff_new_pack.ZJXlh0/_new 2014-04-14 10:52:45.000000000 +0200 @@ -19,13 +19,13 @@ %define component ceilometer Name: openstack-%{component}-doc -Version: 2013.2.2.dev6.g16eb199 +Version: 2014.1.rc1 Release: 0 Summary: OpenStack Metering (Ceilometer) - Documentation License: Apache-2.0 Group: Documentation/HTML Url: http://openstack.org/projects/compute/ -Source: ceilometer-stable-havana.tar.gz +Source: http://tarballs.openstack.org/ceilometer/ceilometer-%{version}.tar.gz BuildRequires: openstack-suse-macros BuildRequires: python-Babel BuildRequires: python-Flask @@ -36,7 +36,7 @@ BuildRequires: python-WebOb BuildRequires: python-anyjson >= 0.3.1 BuildRequires: python-argparse -BuildRequires: python-d2to1 +BuildRequires: python-croniter >= 0.3.4 BuildRequires: python-eventlet BuildRequires: python-glance BuildRequires: python-iso8601 @@ -49,9 +49,10 @@ BuildRequires: python-nova BuildRequires: python-novaclient BuildRequires: python-oslo.config -BuildRequires: python-oslo.sphinx +BuildRequires: python-oslosphinx BuildRequires: python-pbr BuildRequires: python-pecan +BuildRequires: python-sphinxcontrib-docbookrestapi BuildRequires: python-sphinxcontrib-httpdomain BuildRequires: python-sphinxcontrib-pecanwsme BuildRequires: python-stevedore >= 0.6 @@ -70,7 +71,7 @@ This package contains documentation files for openstack-ceilometer. %prep -%setup -q -n ceilometer-2013.2.2.dev6.g16eb199 +%setup -q -n ceilometer-%{version} %openstack_cleanup_prep sed -i "s|'sphinxcontrib.autohttp.flask',||" doc/source/conf.py ++++++ openstack-ceilometer.spec ++++++ --- /var/tmp/diff_new_pack.ZJXlh0/_old 2014-04-14 10:52:45.000000000 +0200 +++ /var/tmp/diff_new_pack.ZJXlh0/_new 2014-04-14 10:52:45.000000000 +0200 @@ -18,32 +18,33 @@ %define component ceilometer -%define groupname openstack-%{component} -%define username openstack-%{component} +%define groupname %{component} +%define username %{component} Name: openstack-%{component} -Version: 2013.2.2.dev6.g16eb199 +Version: 2014.1.rc1 Release: 0 Summary: OpenStack Metering (Ceilometer) License: Apache-2.0 Group: System/Management Url: https://launchpad.net/ceilometer -Source: ceilometer-stable-havana.tar.gz +Source: http://tarballs.openstack.org/ceilometer/ceilometer-%{version}.tar.gz Source1: %{name}.init Source2: %{name}.logrotate Source9: org.openstack.ceilometer.pkla +%if 0%{?suse_version} > 1230 +Source10: %name.conf +BuildRequires: systemd +%endif Source13: openstack-ceilometer-polkit.rules # PATCH-FIX-SUSE: Skip testing against DB2 and Mongodb Patch0: 0001-Skip-tests-against-real-DB.patch -Patch1: 0001-enable-sql-metadata-query.patch BuildRequires: crudini BuildRequires: fdupes BuildRequires: openstack-suse-macros BuildRequires: python-base -BuildRequires: python-d2to1 -BuildRequires: python-distribute BuildRequires: python-happybase >= 0.4 -BuildRequires: python-pbr +BuildRequires: python-pbr >= 0.6 %if 0%{?suse_version} > 1110 # to make orphaned-file-tests happy BuildRequires: polkit-default-privs @@ -54,7 +55,7 @@ Requires: logrotate Requires: python >= 2.6.8 Requires: python-ceilometer = %{version} -Requires: python-pbr >= 0.5.21 +Requires: python-pbr >= 0.6 %if 0%{?suse_version} > 1110 Requires(pre): pwdutils %else @@ -83,30 +84,35 @@ Requires: python-Flask >= 0.10 Requires: python-PyYAML >= 3.1.0 Requires: python-SQLAlchemy >= 0.7.8 -Requires: python-WSME >= 0.5b5 +Requires: python-WSME >= 0.6 Requires: python-WebOb >= 1.2.3 Requires: python-alembic >= 0.4.1 Requires: python-anyjson >= 0.3.3 -Requires: python-argparse -Requires: python-ceilometerclient >= 1.0.5 +Requires: python-ceilometerclient >= 1.0.6 +Requires: python-croniter >= 0.3.4 Requires: python-eventlet >= 0.13.0 Requires: python-glanceclient >= 0.9.0 Requires: python-happybase >= 0.4 Requires: python-iso8601 >= 0.1.8 -Requires: python-keystoneclient >= 0.3.2 +Requires: python-jsonpath-rw >= 1.2.0 +Requires: python-jsonschema >= 2.0.0 +Requires: python-keystoneclient >= 0.6.0 Requires: python-kombu >= 2.4.8 +Requires: python-lockfile >= 0.8 Requires: python-lxml >= 2.3 Requires: python-msgpack-python -Requires: python-netaddr Requires: python-novaclient >= 2.15.0 Requires: python-oslo.config >= 1.2.0 -Requires: python-pecan >= 0.2.0 +Requires: python-oslo.vmware +Requires: python-pecan >= 0.4.5 Requires: python-pymongo >= 2.4 +Requires: python-pysnmp >= 4.2.1 +Requires: python-pytz >= 2010h Requires: python-requests >= 1.1 -Requires: python-six >= 1.4.1 -Requires: python-sqlalchemy-migrate >= 0.7.2 -Requires: python-stevedore >= 0.10 -Requires: python-swiftclient >= 1.5 +Requires: python-six >= 1.5.2 +Requires: python-sqlalchemy-migrate >= 0.8.2 +Requires: python-stevedore >= 0.14 +Requires: python-swiftclient >= 1.6 %description -n python-ceilometer This package contains the core Python module of %{name}. @@ -133,7 +139,7 @@ Requires: %{name} = %{version} %description agent-central -This package contains the %{name} agent central. +This package contains the %{name} central agent. %package agent-compute Summary: OpenStack Metering (Ceilometer) - Agent Compute @@ -141,7 +147,15 @@ Requires: %{name} = %{version} %description agent-compute -This package contains the %{name} agent compute. +This package contains the %{name} compute agent. + +%package agent-notification +Summary: OpenStack Metering (Ceilometer) - Agent Notification +Group: Development/Languages/Python +Requires: %{name} = %{version} + +%description agent-notification +This package contains the %{name} notification agent. %package alarm-evaluator Summary: OpenStack Metering (Ceilometer) - Alarm Evaluator @@ -163,35 +177,34 @@ Summary: OpenStack Metering (Ceilometer) - Testsuite Group: Development/Languages/Python Requires: %{name} = %{version} -Requires: openstack-nova-test -Requires: python-coverage >= 3.6 +Requires: openstack-ceilometer-agent-central = %{version} +Requires: openstack-ceilometer-agent-compute = %{version} +Requires: openstack-ceilometer-api = %{version} +Requires: openstack-ceilometer-collector = %{version} +Requires: openstack-nova-test >= 2014.1 %if 0%{?suse_version} && 0%{?suse_version} <= 1110 Requires: python-discover %endif +Requires: python-MySQL-python Requires: python-fixtures >= 0.3.14 -Requires: python-flake8 >= 2.0 Requires: python-glance -Requires: python-hacking >= 0.5.6 -Requires: python-httplib2 +Requires: python-httplib2 >= 0.7.5 Requires: python-mock >= 1.0 Requires: python-mox >= 0.5.3 Requires: python-nova -Requires: python-pep8 >= 1.4.5 -Requires: python-pyflakes >= 0.7.2 -Requires: python-python-subunit -Requires: python-sphinxcontrib-pecanwsme >= 0.5 +Requires: python-python-subunit >= 0.0.18 +Requires: python-sphinxcontrib-pecanwsme >= 0.6 Requires: python-swift -Requires: python-testrepository >= 0.0.17 +Requires: python-testrepository >= 0.0.18 Requires: python-testscenarios >= 0.4 -Requires: python-testtools >= 0.9.32 +Requires: python-testtools >= 0.9.34 %description test This package contains testsuite files for %{name}. %prep -%setup -q -n ceilometer-2013.2.2.dev6.g16eb199 +%setup -q -n %{component}-%{version} %patch0 -p1 -%patch1 -p1 %openstack_cleanup_prep %build @@ -206,7 +219,11 @@ ### directories #TODO: Check what we need: install -d -m 755 %{buildroot}%{_localstatedir}/{lib,log}/%{component} -install -d -m 750 %{buildroot}%{_localstatedir}/{lock,cache,run}/%{component} +install -d -m 750 %{buildroot}%{_localstatedir}/{cache}/%{component} +install -d -m 700 %{buildroot}%{_localstatedir}/run/%{component} +%if 0%{?suse_version} > 1230 +install -D -m 644 %{SOURCE10} %{buildroot}/%_tmpfilesdir/%name.conf +%endif ### configuration files install -d -m 0755 %{buildroot}%{_sysconfdir}/%{component} @@ -219,7 +236,7 @@ ### init scripts mkdir -p %{buildroot}%{_initddir} mkdir -p %{buildroot}%{_sbindir} -for i in api collector collector-udp agent-central agent-compute alarm-evaluator alarm-notifier ; do +for i in api collector agent-central agent-compute agent-notification alarm-evaluator alarm-notifier ; do tmp=$(mktemp) cat %{SOURCE1} | sed "s/__NAME__/$i/g" > $tmp install -m 755 $tmp %{buildroot}%{_initddir}/%{name}-$i @@ -242,25 +259,23 @@ ### test subpackage %openstack_test_package_install # Skip functional tests that require mongodb -rm %{buildroot}/var/lib/openstack-%{component}-test/tests/storage/test_impl_mongodb.py \ - %{buildroot}/var/lib/openstack-%{component}-test/tests/api/v2/test_statistics_scenarios.py +rm %{buildroot}%{python_sitelib}/ceilometer/tests/{storage/test_impl_mongodb.py*,api/v2/test_statistics_scenarios.py*} ### set default configuration (mostly applies to package-only setups and quickstart, i.e. not generally crowbar) %define ceilometer_conf %{buildroot}%{_sysconfdir}/%{component}/%{component}.conf crudini --set %{ceilometer_conf} DEFAULT verbose True #NOTE(saschpe): Don't set 'log_file', each ceilometer deamon will create it's own if only 'log_dir' is set: crudini --set %{ceilometer_conf} DEFAULT log_dir %{_localstatedir}/log/%{component} -crudini --set %{ceilometer_conf} DEFAULT lock_path %{_localstatedir}/lock/%{component} -crudini --set %{ceilometer_conf} keystone_authtoken signing_dir /var/cache/%component/keystone-signing crudini --set %{ceilometer_conf} DEFAULT policy_file %{_sysconfdir}/%{component}/policy.json +crudini --set %{ceilometer_conf} DEFAULT lock_path %{_localstatedir}/run/%{component} +crudini --set %{ceilometer_conf} keystone_authtoken signing_dir /var/cache/%component/keystone-signing +crudini --set %{ceilometer_conf} database connection sqlite:////var/lib/ceilometer/ceilometer.db ### authentication cache dir mkdir -p %{buildroot}%{_localstatedir}/cache/ceilometer %pre -getent group %{groupname} >/dev/null || groupadd -r %{groupname} -getent passwd %{username} >/dev/null || useradd -r -g %{groupname} -d %{_localstatedir}/lib/%{component} -s /sbin/nologin -c "OpenStack Ceilometer Daemons" %{username} -exit 0 +%openstack_pre_user_group_create %{username} %{groupname} %post api %{fillup_and_insserv -f openstack-ceilometer-api} @@ -323,10 +338,21 @@ %restart_on_update openstack-ceilometer-alarm-notifier %insserv_cleanup +%post agent-notification +%{fillup_and_insserv -f openstack-ceilometer-agent-notification} + +%preun agent-notification +%stop_on_removal openstack-ceilometer-agent-notification + +%postun agent-notification +%restart_on_update openstack-ceilometer-agent-notification +%insserv_cleanup + %files %defattr(-,root,root) %doc README.rst %{_bindir}/ceilometer-dbsync +%{_bindir}/ceilometer-send-sample %dir %{_sysconfdir}/%{component} %config(noreplace) %attr(0640, root, %{groupname}) %{_sysconfdir}/%{component}/%{component}.conf %config %{_sysconfdir}/%{component}/pipeline.yaml @@ -335,9 +361,13 @@ %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %dir %attr(0755, %{username}, %{groupname}) %{_localstatedir}/lib/%{component} %dir %attr(0750, %{username}, %{groupname}) %{_localstatedir}/cache/%{component} -%dir %attr(0750, %{username}, %{groupname}) %{_localstatedir}/lock/%{component} %dir %attr(0750, %{username}, %{groupname}) %{_localstatedir}/log/%{component} -%ghost %dir %attr(0750, %{username}, %{groupname}) %{_localstatedir}/run/%{component} +%if 0%{?suse_version} > 1230 +%ghost %dir %attr(700,%{username},%{groupname}) %{_localstatedir}/run/%{component} +%_tmpfilesdir/%name.conf +%else +%dir %attr(0700, %{username}, %{groupname}) %{_localstatedir}/run/%{component} +%endif %files -n python-ceilometer %defattr(-,root,root,-) @@ -355,11 +385,8 @@ %files collector %defattr(-,root,root,-) %{_initddir}/%{name}-collector -%{_initddir}/%{name}-collector-udp %{_sbindir}/rc%{name}-collector -%{_sbindir}/rc%{name}-collector-udp %{_bindir}/%{component}-collector -%{_bindir}/%{component}-collector-udp %{_bindir}/%{component}-expirer %files agent-central @@ -380,6 +407,12 @@ %{_datadir}/polkit-1/rules.d/11-openstack-ceilometer.rules %endif +%files agent-notification +%defattr(-,root,root,-) +%{_initddir}/%{name}-agent-notification +%{_sbindir}/rc%{name}-agent-notification +%{_bindir}/%{component}-agent-notification + %files alarm-evaluator %defattr(-,root,root,-) %{_initddir}/%{name}-alarm-evaluator ++++++ 0001-Skip-tests-against-real-DB.patch ++++++ --- /var/tmp/diff_new_pack.ZJXlh0/_old 2014-04-14 10:52:45.000000000 +0200 +++ /var/tmp/diff_new_pack.ZJXlh0/_new 2014-04-14 10:52:45.000000000 +0200 @@ -1,32 +1,8 @@ -From af83706391477fc8bd16e592a7fc1b0132dbe3bb Mon Sep 17 00:00:00 2001 -From: Dirk Mueller <dirk(a)dmllr.de> -Date: Fri, 27 Sep 2013 22:59:17 +0200 -Subject: [PATCH] Skip tests against real DB - -Change-Id: I0f00d423205f251e9d670eca93708929caa06cdf ---- - ceilometer/tests/db.py | 3 --- - tests/api/v2/test_app.py | 11 +---------- - tests/api/v2/test_statistics_scenarios.py | 5 +---- - 3 files changed, 2 insertions(+), 17 deletions(-) - -Index: ceilometer-2013.2.2.dev6.g16eb199/ceilometer/tests/db.py +Index: ceilometer-2014.1.rc1/ceilometer/tests/api/v2/test_app.py =================================================================== ---- ceilometer-2013.2.2.dev6.g16eb199.orig/ceilometer/tests/db.py -+++ ceilometer-2013.2.2.dev6.g16eb199/ceilometer/tests/db.py -@@ -83,7 +83,4 @@ class MixinTestsWithBackendScenarios(obj - - scenarios = [ - ('sqlalchemy', dict(database_connection='sqlite://')), -- ('mongodb', dict(database_connection=MongoDBFakeConnectionUrl())), -- ('hbase', dict(database_connection='hbase://__test__')), -- ('db2', dict(database_connection=DB2FakeConnectionUrl())), - ] -Index: ceilometer-2013.2.2.dev6.g16eb199/tests/api/v2/test_app.py -=================================================================== ---- ceilometer-2013.2.2.dev6.g16eb199.orig/tests/api/v2/test_app.py -+++ ceilometer-2013.2.2.dev6.g16eb199/tests/api/v2/test_app.py -@@ -66,19 +66,10 @@ class TestApp(base.TestCase): +--- ceilometer-2014.1.rc1.orig/ceilometer/tests/api/v2/test_app.py ++++ ceilometer-2014.1.rc1/ceilometer/tests/api/v2/test_app.py +@@ -74,19 +74,10 @@ class TestApp(base.BaseTestCase): os.unlink(tmpfile) @@ -36,7 +12,7 @@ - def test_pecan_extension_guessing_unset(self): - # check Pecan does not assume .jpg is an extension - response = self.app.get(self.PATH_PREFIX + '/meters/meter.jpg') -- self.assertEqual(response.content_type, 'application/json') +- self.assertEqual('application/json', response.content_type) - - class TestApiMiddleware(FunctionalTest): @@ -47,19 +23,31 @@ no_lang_translated_error = 'No lang translated error' en_US_translated_error = 'en-US translated error' -Index: ceilometer-2013.2.2.dev6.g16eb199/tests/api/v2/test_statistics_scenarios.py +Index: ceilometer-2014.1.rc1/ceilometer/tests/api/v2/test_statistics_scenarios.py =================================================================== ---- ceilometer-2013.2.2.dev6.g16eb199.orig/tests/api/v2/test_statistics_scenarios.py -+++ ceilometer-2013.2.2.dev6.g16eb199/tests/api/v2/test_statistics_scenarios.py -@@ -1234,10 +1234,7 @@ class TestGroupBySource(base.FunctionalT +--- ceilometer-2014.1.rc1.orig/ceilometer/tests/api/v2/test_statistics_scenarios.py ++++ ceilometer-2014.1.rc1/ceilometer/tests/api/v2/test_statistics_scenarios.py +@@ -1228,10 +1228,7 @@ class TestGroupBySource(FunctionalTest, # tests. scenarios = [ - ('mongodb', - dict(database_connection=tests_db.MongoDBFakeConnectionUrl())), -- ('hbase', dict(database_connection='hbase://__test__')), +- ('hbase', dict(database_connection=tests_db.HBaseFakeConnectionUrl())), - ('db2', dict(database_connection=tests_db.DB2FakeConnectionUrl())), + ('sqlalchemy', dict(database_connection='sqlite://')) ] PATH = '/meters/instance/statistics' +Index: ceilometer-2014.1.rc1/ceilometer/tests/db.py +=================================================================== +--- ceilometer-2014.1.rc1.orig/ceilometer/tests/db.py ++++ ceilometer-2014.1.rc1/ceilometer/tests/db.py +@@ -116,7 +116,4 @@ class MixinTestsWithBackendScenarios(obj + + scenarios = [ + ('sqlalchemy', dict(database_connection='sqlite://')), +- ('mongodb', dict(database_connection=MongoDBFakeConnectionUrl())), +- ('hbase', dict(database_connection=HBaseFakeConnectionUrl())), +- ('db2', dict(database_connection=DB2FakeConnectionUrl())), + ] ++++++ _service ++++++ --- /var/tmp/diff_new_pack.ZJXlh0/_old 2014-04-14 10:52:45.000000000 +0200 +++ /var/tmp/diff_new_pack.ZJXlh0/_new 2014-04-14 10:52:45.000000000 +0200 @@ -1,11 +1,13 @@ <services> - <service name="git_tarballs" mode="disabled"> - <param name="url">http://tarballs.openstack.org/ceilometer/ceilometer-stable-havana.tar.gz</param> - <param name="email">opensuse-cloud(a)opensuse.org</param> - <param name="plain-version">True</param> + <service mode="disabled" name="download_files"> + <param name="changesgenerate">enable</param> + </service> + <service mode="disabled" name="set_version"> + <param name="basename">ceilometer</param> </service> - <service name="refresh_patches" mode="disabled"> <param name="changesgenerate">enable</param> </service> + <service name="python_requires" mode="disabled"> + </service> </services> ++++++ openstack-ceilometer-polkit.rules ++++++ --- /var/tmp/diff_new_pack.ZJXlh0/_old 2014-04-14 10:52:45.000000000 +0200 +++ /var/tmp/diff_new_pack.ZJXlh0/_new 2014-04-14 10:52:45.000000000 +0200 @@ -1,8 +1,8 @@ -// grant nova-compute libvirt management permissions +// grant ceilometer libvirt management permissions polkit.addRule(function(action, subject) { if (action.id == "org.libvirt.unix.monitor" && - subject.user == "openstack-ceilometer") { + subject.user == "ceilometer") { return polkit.Result.YES; } }); ++++++ openstack-ceilometer.conf ++++++ d /var/run/openstack-ceilometer 0700 ceilometer ceilometer - ++++++ openstack-ceilometer.init ++++++ --- /var/tmp/diff_new_pack.ZJXlh0/_old 2014-04-14 10:52:45.000000000 +0200 +++ /var/tmp/diff_new_pack.ZJXlh0/_new 2014-04-14 10:52:45.000000000 +0200 @@ -13,9 +13,10 @@ ### END INIT INFO DAEMON="__NAME__" -USER="openstack-ceilometer" +USER="ceilometer" CONFFILE="/etc/ceilometer/ceilometer.conf" RUNDIR="/var/run/ceilometer" +PIDFILE="/var/run/$DAEMON.pid" LOGFILE="/var/log/ceilometer/$DAEMON.log" # $RUNDIR can be tmpfs, thus we have to create/own it here: @@ -28,18 +29,19 @@ start) if [ "$DAEMON" == "api" ]; then echo -n "Checking DB Migrations for ceilometer" - test -f /var/log/ceilometer/ceilometer-dbsync.log && chown $USER. /var/log/ceilometer/ceilometer-dbsync.log su $USER -s /bin/sh -c "ceilometer-dbsync --config-file=$CONFFILE" > /dev/null rc_status -v fi echo -n "Starting ceilometer-$DAEMON" - /sbin/startproc -s -u $USER -t ${STARTUP_TIMEOUT:-5} -q /usr/bin/ceilometer-$DAEMON --config-file=$CONFFILE --logfile=$LOGFILE + /sbin/startproc -s -p $PIDFILE -u $USER -t ${STARTUP_TIMEOUT:-5} -q /usr/bin/ceilometer-$DAEMON --config-file=$CONFFILE --logfile=$LOGFILE + /sbin/pidof -x /usr/bin/ceilometer-$DAEMON > $PIDFILE rc_status -v ;; stop) echo -n "Shutting down ceilometer-$DAEMON" - /sbin/killproc /usr/bin/ceilometer-$DAEMON + /sbin/killproc -p $PIDFILE /usr/bin/ceilometer-$DAEMON + rm -f $PIDFILE rc_status -v ;; restart) @@ -51,7 +53,7 @@ ;; status) echo -n "Checking ceilometer-$DAEMON" - /sbin/checkproc /usr/bin/ceilometer-$DAEMON + /sbin/checkproc -p $PIDFILE /usr/bin/ceilometer-$DAEMON rc_status -v ;; condrestart|try-restart) ++++++ openstack-ceilometer.logrotate ++++++ --- /var/tmp/diff_new_pack.ZJXlh0/_old 2014-04-14 10:52:45.000000000 +0200 +++ /var/tmp/diff_new_pack.ZJXlh0/_new 2014-04-14 10:52:45.000000000 +0200 @@ -7,7 +7,7 @@ dateext missingok notifempty - su openstack-ceilometer openstack-ceilometer + su ceilometer ceilometer copytruncate sharedscripts } ++++++ org.openstack.ceilometer.pkla ++++++ --- /var/tmp/diff_new_pack.ZJXlh0/_old 2014-04-14 10:52:45.000000000 +0200 +++ /var/tmp/diff_new_pack.ZJXlh0/_new 2014-04-14 10:52:45.000000000 +0200 @@ -1,5 +1,5 @@ -[Grant openstack-ceilometer libvirt monitor permissions] -Identity=unix-user:openstack-ceilometer +[Grant ceilometer libvirt monitor permissions] +Identity=unix-user:ceilometer Action=org.libvirt.unix.monitor ResultAny=yes ResultInactive=yes -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit git for openSUSE:Factory
by root＠hilbert.suse.de 14 Apr '14

14 Apr '14

Hello community, here is the log from the commit of package git for openSUSE:Factory checked in at 2014-04-14 10:52:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/git (Old) and /work/SRC/openSUSE:Factory/.git.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "git" Changes: -------- --- /work/SRC/openSUSE:Factory/git/git.changes 2014-03-21 13:30:17.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.git.new/git.changes 2014-04-14 10:52:37.000000000 +0200 @@ -1,0 +2,34 @@ +Sun Apr 13 20:19:26 UTC 2014 - andreas.stieger(a)gmx.de + +- git 1.9.2: + * Fix an issue with "git fetch --prune" removing paths on + multiple fetch + * "git update-ref --stdin" did not fail a request to create a + ref when the ref already existed. + * "git diff --no-index -Mq a b" fell into an infinite loop. + * Do not override GIT_EDITOR when no commit message is required + to not affect other uses + * "git status --porcelain --branch" showed its output with labels + "ahead/behind/gone" translated to the user's locale. + * "git mv" that moves a submodule forgot to adjust the array that + uses to keep track of which submodules were to be moved to + update its configuration + * Length limit for the pathname used when removing a path in a + deep subdirectory has been removed to avoid buffer overflows. + * "git index-pack" used a wrong variable to name the keep-file in + an error message when the file cannot be written or closed. + * "rebase -i" produced a broken insn sheet when the title of a + commit happened to contain '\n' (or ended with '\c') due to a + careless use of 'echo'. + * Serving objects from a shallow repository needs to write a + new file to hold the temporary shallow boundaries but it was not + cleaned when we exit due to die() or a signal. + * When "git stash pop" stops after failing to apply the stash + (e.g. due to conflicting changes), the stash is not dropped. + State that explicitly in the output to let the users know. + * The labels in "git status" output that describe the nature of + conflicts (e.g. "both deleted") were limited to 20 bytes, which + was too short for some l10n (e.g. fr). + * minor documentation updates + +------------------------------------------------------------------- Old: ---- v1.9.1.tar.gz New: ---- v1.9.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ git.spec ++++++ --- /var/tmp/diff_new_pack.ZvN34A/_old 2014-04-14 10:52:38.000000000 +0200 +++ /var/tmp/diff_new_pack.ZvN34A/_new 2014-04-14 10:52:38.000000000 +0200 @@ -20,7 +20,7 @@ %define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services Name: git -Version: 1.9.1 +Version: 1.9.2 Release: 0 Summary: Fast, scalable, distributed revision control system License: GPL-2.0 ++++++ v1.9.1.tar.gz -> v1.9.2.tar.gz ++++++ ++++ 2381 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 rubygem-chef for openSUSE:Factory
by root＠hilbert.suse.de 14 Apr '14

14 Apr '14

Hello community, here is the log from the commit of package rubygem-chef for openSUSE:Factory checked in at 2014-04-14 09:25:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-chef (Old) and /work/SRC/openSUSE:Factory/.rubygem-chef.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-chef" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-chef/rubygem-chef.changes 2013-08-06 11:46:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rubygem-chef.new/rubygem-chef.changes 2014-04-14 09:25:24.000000000 +0200 @@ -1,0 +2,18 @@ +Sun Apr 13 15:27:27 UTC 2014 - e.istomin(a)edss.ee + +- Updated to 11.12.2 +- See also http://www.getchef.com/blog/2014/04/09/release-chef-client-11-12-2/ + +------------------------------------------------------------------- +Mon Dec 9 16:51:36 UTC 2013 - e.istomin(a)edss.ee + +- Update to 11.8.2 +- See also http://www.getchef.com/blog/2013/12/06/release-chef-client-10-30-2-11-8-2-m… + +------------------------------------------------------------------- +Fri Nov 29 10:20:18 UTC 2013 - e.istomin(a)edss.ee + +- Update to 11.8.0 +- See also http://docs.opscode.com/release/11-8/release_notes.html + +------------------------------------------------------------------- Old: ---- chef-11.6.0.gem New: ---- chef-11.12.2.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-chef.spec ++++++ --- /var/tmp/diff_new_pack.ayINAJ/_old 2014-04-14 09:25:25.000000000 +0200 +++ /var/tmp/diff_new_pack.ayINAJ/_new 2014-04-14 09:25:25.000000000 +0200 @@ -19,7 +19,7 @@ %global with_systemd 0%{?suse_version} >= 1230 Name: rubygem-chef -Version: 11.6.0 +Version: 11.12.2 Release: 0 %define mod_name chef %define mod_full_name %{mod_name}-%{version} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-oauthlib for openSUSE:Factory
by root＠hilbert.suse.de 14 Apr '14

14 Apr '14

Hello community, here is the log from the commit of package python-oauthlib for openSUSE:Factory checked in at 2014-04-14 09:25:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-oauthlib (Old) and /work/SRC/openSUSE:Factory/.python-oauthlib.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-oauthlib" Changes: -------- --- /work/SRC/openSUSE:Factory/python-oauthlib/python-oauthlib.changes 2014-01-23 15:54:26.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-oauthlib.new/python-oauthlib.changes 2014-04-14 09:25:19.000000000 +0200 @@ -1,0 +2,20 @@ +Sun Apr 13 17:25:38 UTC 2014 - p.drouand(a)gmail.com + +- Update to version 0.6.1 + + (OAuth 2 Provider) is_within_original_scope to check whether a + refresh token is trying to aquire a new set of scopes that are + a subset of the original scope. + + (OAuth 2 Provider) expires_in token lifetime can be set per request. + + (OAuth 2 Provider) client_authentication_required method added to + differentiate between public and confidential clients. + + (OAuth 2 Provider) rotate_refresh_token now indicates whether a + new refresh token should be generated during token refresh or + if old should be kept. + + (OAuth 2 Provider) returned JSON headers no longer include charset. + + (OAuth 2 Provider) validate_authorizatoin_request now also includes + the internal request object in the returned dictionary. Note that + this is not meant to be relied upon heavily and its interface might + change. + + many style and typo fixes. + +------------------------------------------------------------------- Old: ---- oauthlib-0.6.0.tar.gz New: ---- oauthlib-0.6.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-oauthlib.spec ++++++ --- /var/tmp/diff_new_pack.PbNRSn/_old 2014-04-14 09:25:20.000000000 +0200 +++ /var/tmp/diff_new_pack.PbNRSn/_new 2014-04-14 09:25:20.000000000 +0200 @@ -17,7 +17,7 @@ Name: python-oauthlib -Version: 0.6.0 +Version: 0.6.1 Release: 0 Url: https://github.com/idangazit/oauthlib Summary: A Generic Implementation of the OAuth Request-Signing Logic ++++++ oauthlib-0.6.0.tar.gz -> oauthlib-0.6.1.tar.gz ++++++ ++++ 2477 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 phpMyAdmin for openSUSE:Factory
by root＠hilbert.suse.de 14 Apr '14

14 Apr '14

Hello community, here is the log from the commit of package phpMyAdmin for openSUSE:Factory checked in at 2014-04-14 09:25:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/phpMyAdmin (Old) and /work/SRC/openSUSE:Factory/.phpMyAdmin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "phpMyAdmin" Changes: -------- --- /work/SRC/openSUSE:Factory/phpMyAdmin/phpMyAdmin.changes 2014-03-28 13:17:36.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.phpMyAdmin.new/phpMyAdmin.changes 2014-04-14 09:25:14.000000000 +0200 @@ -1,0 +2,17 @@ +Sun Apr 13 14:14:42 UTC 2014 - ecsos(a)schirra.net + +- update to 4.1.13 (2014-04-13) + * sf#4279 CTRL + up or down moves 2 fields + * sf#4336 List server css style wrong + * sf Missing value on the Status > Server page + * sf#4347 Fixed PHP Parse error in Advisor + * sf#4350 Deleting the DB if it is renamed by the same name + * sf#4353 makeProfilingChart is not defined + * sf#4355 Precision specifier for DOUBLE type is truncated + * sf#4346 Incorrect "Export incomplete" message + * sf#4359 Notices on create table page + * sf#4356 GROUPed selects show number of rows as if not grouped + * sf#4357 JS Form submitted on "enter" even if focus + is inside a select field + +------------------------------------------------------------------- Old: ---- phpMyAdmin-4.1.12-all-languages.tar.bz2 New: ---- phpMyAdmin-4.1.13-all-languages.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ phpMyAdmin.spec ++++++ --- /var/tmp/diff_new_pack.aj1Cw3/_old 2014-04-14 09:25:15.000000000 +0200 +++ /var/tmp/diff_new_pack.aj1Cw3/_new 2014-04-14 09:25:15.000000000 +0200 @@ -34,7 +34,7 @@ Summary: Administration of MySQL over the web License: GPL-2.0+ Group: Productivity/Networking/Web/Frontends -Version: 4.1.12 +Version: 4.1.13 Release: 0 Url: http://www.phpMyAdmin.net Source0: http://sourceforge.net/projects/phpmyadmin/files/%{name}-%{version}-all-lan… ++++++ phpMyAdmin-4.1.12-all-languages.tar.bz2 -> phpMyAdmin-4.1.13-all-languages.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/phpMyAdmin/phpMyAdmin-4.1.12-all-languages.tar.bz2 /work/SRC/openSUSE:Factory/.phpMyAdmin.new/phpMyAdmin-4.1.13-all-languages.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit MozillaFirefox for openSUSE:Factory
by root＠hilbert.suse.de 14 Apr '14

14 Apr '14

Hello community, here is the log from the commit of package MozillaFirefox for openSUSE:Factory checked in at 2014-04-14 09:25:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/MozillaFirefox (Old) and /work/SRC/openSUSE:Factory/.MozillaFirefox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "MozillaFirefox" Changes: -------- --- /work/SRC/openSUSE:Factory/MozillaFirefox/MozillaFirefox.changes 2014-04-02 17:25:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.MozillaFirefox.new/MozillaFirefox.changes 2014-04-14 09:25:09.000000000 +0200 @@ -1,0 +2,14 @@ +Mon Apr 7 15:34:31 UTC 2014 - dmueller(a)suse.com + +- add mozilla-aarch64-599882cfb998.patch, + mozilla-aarch64-bmo-810631.patch, + mozilla-aarch64-bmo-962488.patch, + mozilla-aarch64-bmo-963030.patch, + mozilla-aarch64-bmo-963027.patch, + mozilla-aarch64-bmo-963028.patch, + mozilla-aarch64-bmo-963029.patch, + mozilla-aarch64-bmo-963023.patch, + mozilla-aarch64-bmo-963024.patch, + mozilla-aarch64-bmo-963031.patch: AArch64 porting + +------------------------------------------------------------------- New: ---- mozilla-aarch64-599882cfb998.diff mozilla-aarch64-bmo-810631.patch mozilla-aarch64-bmo-962488.patch mozilla-aarch64-bmo-963023.patch mozilla-aarch64-bmo-963024.patch mozilla-aarch64-bmo-963027.patch mozilla-aarch64-bmo-963028.patch mozilla-aarch64-bmo-963029.patch mozilla-aarch64-bmo-963030.patch mozilla-aarch64-bmo-963031.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaFirefox.spec ++++++ --- /var/tmp/diff_new_pack.JO42LK/_old 2014-04-14 09:25:13.000000000 +0200 +++ /var/tmp/diff_new_pack.JO42LK/_new 2014-04-14 09:25:13.000000000 +0200 @@ -113,13 +113,25 @@ Patch19: mozilla-ppc64le-webrtc.patch Patch20: mozilla-ppc64le-xpcom.patch Patch21: mozilla-ppc64-xpcom.patch +# Gecko/Toolkit AArch64 Porting +Patch36: mozilla-aarch64-599882cfb998.diff +Patch37: mozilla-aarch64-bmo-810631.patch +Patch38: mozilla-aarch64-bmo-962488.patch +Patch39: mozilla-aarch64-bmo-963030.patch +Patch40: mozilla-aarch64-bmo-963027.patch +Patch41: mozilla-aarch64-bmo-963028.patch +Patch42: mozilla-aarch64-bmo-963029.patch +Patch43: mozilla-aarch64-bmo-963023.patch +Patch44: mozilla-aarch64-bmo-963024.patch +Patch45: mozilla-aarch64-bmo-963031.patch + # Firefox/browser -Patch30: firefox-browser-css.patch -Patch31: firefox-kde.patch -Patch32: firefox-kde-114.patch -Patch33: firefox-no-default-ualocale.patch -Patch34: firefox-multilocale-chrome.patch -Patch35: firefox-branded-icons.patch +Patch100: firefox-browser-css.patch +Patch101: firefox-kde.patch +Patch102: firefox-kde-114.patch +Patch103: firefox-no-default-ualocale.patch +Patch104: firefox-multilocale-chrome.patch +Patch105: firefox-branded-icons.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires(post): coreutils shared-mime-info desktop-file-utils Requires(postun): shared-mime-info desktop-file-utils @@ -152,7 +164,7 @@ %define _google_api_key AIzaSyD1hTe85_a14kr1Ks8T3Ce75rvbR1_Dx7Q %define branding 1 %define localize 1 -%ifarch ppc ppc64 ppc64le s390 s390x ia64 %arm +%ifarch aarch64 ppc ppc64 ppc64le s390 s390x ia64 %arm %define crashreporter 0 %else %define crashreporter 1 @@ -259,15 +271,26 @@ %patch19 -p1 %patch20 -p1 %patch21 -p1 -# -%patch30 -p1 -%patch31 -p1 +%patch36 -p1 +%patch37 -p1 +%patch38 -p1 +%patch39 -p1 +%patch40 -p1 +%patch41 -p1 +%patch42 -p1 +%patch43 -p1 +%patch44 -p1 +%patch45 -p1 + +# Firefox +%patch100 -p1 +%patch101 -p1 %if %suse_version >= 1140 -%patch32 -p1 +%patch102 -p1 %endif -%patch33 -p1 -%patch34 -p1 -%patch35 -p1 +%patch103 -p1 +%patch104 -p1 +%patch105 -p1 %build # no need to add build time to binaries ++++++ mozilla-aarch64-599882cfb998.diff ++++++ diff --git a/js/src/assembler/wtf/Platform.h b/js/src/assembler/wtf/Platform.h --- a/js/src/assembler/wtf/Platform.h +++ b/js/src/assembler/wtf/Platform.h @@ -205,16 +205,23 @@ #endif /* WTF_CPU_S390 - S390 32-bit */ #if defined(__s390__) #define WTF_CPU_S390 1 #define WTF_CPU_BIG_ENDIAN 1 #endif +#if defined(__aarch64__) +#define WTF_CPU_AARCH64 1 +#if defined(__AARCH64EB__) +#define WTF_CPU_BIG_ENDIAN 1 +#endif +#endif + /* WTF_CPU_X86 - i386 / x86 32-bit */ #if defined(__i386__) \ || defined(i386) \ || defined(_M_IX86) \ || defined(_X86_) \ || defined(__THW_INTEL) #define WTF_CPU_X86 1 #endif ++++++ mozilla-aarch64-bmo-810631.patch ++++++ ++++ 100372 lines (skipped) ++++++ mozilla-aarch64-bmo-962488.patch ++++++ # HG changeset patch # User Marcin Juszkiewicz <mjuszkiewicz(a)redhat.com> # Date 1393440196 18000 # Node ID 6a46f53ad944b44385398822d7bcf7621a785d91 # Parent 0aa56e2a5f816a30da48701f73d03060ee9692b2 Bug 962488 - Update double-conversion for proper AArch64 support. r=froydnj Fix imported from upstream repository: https://code.google.com/p/double-conversion/source/detail?r=4e24bb31bcc76d6… diff --git a/mfbt/double-conversion/fix-aarch64-macro.patch b/mfbt/double-conversion/fix-aarch64-macro.patch new file mode 100644 --- /dev/null +++ b/mfbt/double-conversion/fix-aarch64-macro.patch @@ -0,0 +1,23 @@ +Backport from upstream. + +https://code.google.com/p/double-conversion/source/detail?r=4e24bb31bcc76d6d218f3056b4c24a109d367561 + +--- + mfbt/double-conversion/utils.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/mfbt/double-conversion/utils.h ++++ b/mfbt/double-conversion/utils.h +@@ -58,11 +58,11 @@ + defined(__mips__) || \ + defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__) || \ + defined(__sparc__) || defined(__sparc) || defined(__s390__) || \ + defined(__SH4__) || defined(__alpha__) || \ + defined(_MIPS_ARCH_MIPS32R2) || \ +- defined(_AARCH64EL_) ++ defined(__AARCH64EL__) + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 + #elif defined(_M_IX86) || defined(__i386__) || defined(__i386) + #if defined(_WIN32) + // Windows uses a 64bit wide floating point stack. + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 diff --git a/mfbt/double-conversion/update.sh b/mfbt/double-conversion/update.sh --- a/mfbt/double-conversion/update.sh +++ b/mfbt/double-conversion/update.sh @@ -15,9 +15,12 @@ cp $1/src/*.h ./ # Source cp $1/src/*.cc ./ patch -p3 < add-mfbt-api-markers.patch patch -p3 < use-StandardInteger.patch patch -p3 < use-mozilla-assertions.patch patch -p3 < use-static_assert.patch -patch -p3 < ToPrecision-exponential.patch \ No newline at end of file +patch -p3 < ToPrecision-exponential.patch + +# Merged upstream, part of 2.0.1 version +patch -p3 < fix-aarch64-macro.patch diff --git a/mfbt/double-conversion/utils.h b/mfbt/double-conversion/utils.h --- a/mfbt/double-conversion/utils.h +++ b/mfbt/double-conversion/utils.h @@ -55,17 +55,17 @@ #if defined(_M_X64) || defined(__x86_64__) || \ defined(__ARMEL__) || defined(__avr32__) || \ defined(__hppa__) || defined(__ia64__) || \ defined(__mips__) || \ defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__) || \ defined(__sparc__) || defined(__sparc) || defined(__s390__) || \ defined(__SH4__) || defined(__alpha__) || \ defined(_MIPS_ARCH_MIPS32R2) || \ - defined(_AARCH64EL_) + defined(__AARCH64EL__) #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 #elif defined(_M_IX86) || defined(__i386__) || defined(__i386) #if defined(_WIN32) // Windows uses a 64bit wide floating point stack. #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 #else #undef DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS #endif // _WIN32 ++++++ mozilla-aarch64-bmo-963023.patch ++++++ # HG changeset patch # User Marcin Juszkiewicz <mjuszkiewicz(a)redhat.com> # Date 1392217668 18000 # Node ID 4e9b713f435ade266a68a8d7ba08aad65c3fa6c5 # Parent 282b6e88f9d4c2367a72836f6f9efeab2aadaa58 Bug 963023 - AArch64 support for libevent. r=froydnj diff --git a/ipc/chromium/src/third_party/libevent-use-non-deprecated-syscalls.patch b/ipc/chromium/src/third_party/libevent-use-non-deprecated-syscalls.patch new file mode 100644 --- /dev/null +++ b/ipc/chromium/src/third_party/libevent-use-non-deprecated-syscalls.patch @@ -0,0 +1,43 @@ +--- + ipc/chromium/src/third_party/libevent/epoll_sub.c | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +--- mozilla-central.orig/ipc/chromium/src/third_party/libevent/epoll_sub.c ++++ mozilla-central/ipc/chromium/src/third_party/libevent/epoll_sub.c +@@ -29,15 +29,24 @@ + #include <sys/param.h> + #include <sys/types.h> + #include <sys/syscall.h> + #include <sys/epoll.h> + #include <unistd.h> ++#include <errno.h> + + int + epoll_create(int size) + { ++#if !defined(__NR_epoll_create) && defined(__NR_epoll_create1) ++ if (size <= 0) { ++ errno = EINVAL; ++ return -1; ++ } ++ return (syscall(__NR_epoll_create1, 0)); ++#else + return (syscall(__NR_epoll_create, size)); ++#endif + } + + int + epoll_ctl(int epfd, int op, int fd, struct epoll_event *event) + { +@@ -46,7 +55,11 @@ epoll_ctl(int epfd, int op, int fd, stru + } + + int + epoll_wait(int epfd, struct epoll_event *events, int maxevents, int timeout) + { ++#if !defined(__NR_epoll_wait) && defined(__NR_epoll_pwait) ++ return (syscall(__NR_epoll_pwait, epfd, events, maxevents, timeout, NULL, 0)); ++#else + return (syscall(__NR_epoll_wait, epfd, events, maxevents, timeout)); ++#endif + } diff --git a/ipc/chromium/src/third_party/libevent/README.mozilla b/ipc/chromium/src/third_party/libevent/README.mozilla --- a/ipc/chromium/src/third_party/libevent/README.mozilla +++ b/ipc/chromium/src/third_party/libevent/README.mozilla @@ -8,8 +8,10 @@ android/event2/event-config.h These files are taken from libevent-2.0.21-stable built on the development environment indicated by the first path component. You have to run "./configure" and "make" to get all of the pre-processing done. The file can then be found in "include/event2/". 2. This is ugly, prepare yourself. OS X has a weird problem with how the "TAILQ_END(head)" is used, causing a linking error. Just replace all use of the "TAILQ_END(head)" macro with "NULL". 3. Apply "add mac-arc4random-buf.patch", which removes some bad OS X compatibility code. This will allow libevent to compile on all supported versions of OS X. 4. Apply "openbsd-no-arc4random_addrandom.patch", which fixes the build on OpenBSD (which doesnt provide arc4random_addrandom anymore, see #931354) + +5. Apply "libevent-use-non-deprecated-syscalls.patch", which fixes the build on AArch64 architecture (which does not provide deprecated syscalls) diff --git a/ipc/chromium/src/third_party/libevent/epoll_sub.c b/ipc/chromium/src/third_party/libevent/epoll_sub.c --- a/ipc/chromium/src/third_party/libevent/epoll_sub.c +++ b/ipc/chromium/src/third_party/libevent/epoll_sub.c @@ -26,27 +26,40 @@ */ #include <stdint.h> #include <sys/param.h> #include <sys/types.h> #include <sys/syscall.h> #include <sys/epoll.h> #include <unistd.h> +#include <errno.h> int epoll_create(int size) { +#if !defined(__NR_epoll_create) && defined(__NR_epoll_create1) + if (size <= 0) { + errno = EINVAL; + return -1; + } + return (syscall(__NR_epoll_create1, 0)); +#else return (syscall(__NR_epoll_create, size)); +#endif } int epoll_ctl(int epfd, int op, int fd, struct epoll_event *event) { return (syscall(__NR_epoll_ctl, epfd, op, fd, event)); } int epoll_wait(int epfd, struct epoll_event *events, int maxevents, int timeout) { +#if !defined(__NR_epoll_wait) && defined(__NR_epoll_pwait) + return (syscall(__NR_epoll_pwait, epfd, events, maxevents, timeout, NULL, 0)); +#else return (syscall(__NR_epoll_wait, epfd, events, maxevents, timeout)); +#endif } ++++++ mozilla-aarch64-bmo-963024.patch ++++++ # HG changeset patch # User Marcin Juszkiewicz <mjuszkiewicz(a)redhat.com> # Date 1393440196 18000 # Node ID d56b5c1a557348d4ac14a4d1ea7a5b5d240e3647 # Parent 6a46f53ad944b44385398822d7bcf7621a785d91 Bug 963024 - AArch64 support for XPCOM. r=froydnj diff --git a/xpcom/reflect/xptcall/src/md/unix/moz.build b/xpcom/reflect/xptcall/src/md/unix/moz.build --- a/xpcom/reflect/xptcall/src/md/unix/moz.build +++ b/xpcom/reflect/xptcall/src/md/unix/moz.build @@ -144,16 +144,23 @@ if CONFIG['OS_ARCH'] == 'NetBSD': if CONFIG['OS_TEST'] in ('amiga', 'atari', 'hp300', 'mac68k', 'mvme68k', 'next68k', 'sun3', 'sun3x', 'x68k'): SOURCES += [ 'xptcinvoke_netbsd_m68k.cpp', 'xptcstubs_netbsd_m68k.cpp' ] if CONFIG['OS_ARCH'] == 'Linux': + if CONFIG['OS_TEST'] == 'aarch64': + SOURCES += [ + 'xptcinvoke_aarch64.cpp', + 'xptcinvoke_asm_aarch64.s', + 'xptcstubs_aarch64.cpp', + 'xptcstubs_asm_aarch64.s', + ] if CONFIG['OS_TEST'] == 'm68k': SOURCES += [ 'xptcinvoke_linux_m68k.cpp', 'xptcstubs_linux_m68k.cpp', ] if CONFIG['OS_TEST'].find('mips') != -1: if CONFIG['OS_TEST'].find('mips64') != -1: SOURCES += [ diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_aarch64.cpp b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_aarch64.cpp new file mode 100644 --- /dev/null +++ b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_aarch64.cpp @@ -0,0 +1,136 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +/* Platform specific code to invoke XPCOM methods on native objects */ + +#include "xptcprivate.h" + +#if !defined(__aarch64__) +#error "This code is for Linux AArch64 only." +#endif + + +/* "Procedure Call Standard for the ARM 64-bit Architecture" document, sections + * "5.4 Parameter Passing" and "6.1.2 Procedure Calling" contain all the + * needed information. + * + * http://infocenter.arm.com/help/topic/com.arm.doc.ihi0042d/IHI0042D_aapcs.pdf + */ + +#ifndef __AARCH64EL__ +#error "Only little endian compatibility was tested" +#endif + +/* + * Allocation of integer function arguments initially to registers r1-r7 + * and then to stack. Handling of 'that' argument which goes to register r0 + * is handled separately and does not belong here. + * + * 'ireg_args' - pointer to the current position in the buffer, + * corresponding to the register arguments + * 'stack_args' - pointer to the current position in the buffer, + * corresponding to the arguments on stack + * 'end' - pointer to the end of the registers argument + * buffer. + */ +static inline void alloc_word(uint64_t* &ireg_args, + uint64_t* &stack_args, + uint64_t* end, + uint64_t data) +{ + if (ireg_args < end) { + *ireg_args = data; + ireg_args++; + } else { + *stack_args = data; + stack_args++; + } +} + +static inline void alloc_double(double* &freg_args, + uint64_t* &stack_args, + double* end, + double data) +{ + if (freg_args < end) { + *freg_args = data; + freg_args++; + } else { + memcpy(stack_args, &data, sizeof(data)); + stack_args++; + } +} + +static inline void alloc_float(double* &freg_args, + uint64_t* &stack_args, + double* end, + float data) +{ + if (freg_args < end) { + memcpy(freg_args, &data, sizeof(data)); + freg_args++; + } else { + memcpy(stack_args, &data, sizeof(data)); + stack_args++; + } +} + + +extern "C" void +invoke_copy_to_stack(uint64_t* stk, uint64_t *end, + uint32_t paramCount, nsXPTCVariant* s) +{ + uint64_t *ireg_args = stk; + uint64_t *ireg_end = ireg_args + 8; + double *freg_args = (double *)ireg_end; + double *freg_end = freg_args + 8; + uint64_t *stack_args = (uint64_t *)freg_end; + + // leave room for 'that' argument in x0 + ++ireg_args; + + for (uint32_t i = 0; i < paramCount; i++, s++) { + if (s->IsPtrData()) { + alloc_word(ireg_args, stack_args, ireg_end, (uint64_t)s->ptr); + continue; + } + // According to the ABI, integral types that are smaller than 8 bytes + // are to be passed in 8-byte registers or 8-byte stack slots. + switch (s->type) { + case nsXPTType::T_FLOAT: + alloc_float(freg_args, stack_args, freg_end, s->val.f); + break; + case nsXPTType::T_DOUBLE: + alloc_double(freg_args, stack_args, freg_end, s->val.d); + break; + case nsXPTType::T_I8: alloc_word(ireg_args, stk, end, s->val.i8); break; + case nsXPTType::T_I16: alloc_word(ireg_args, stk, end, s->val.i16); break; + case nsXPTType::T_I32: alloc_word(ireg_args, stk, end, s->val.i32); break; + case nsXPTType::T_I64: alloc_word(ireg_args, stk, end, s->val.i64); break; + case nsXPTType::T_U8: alloc_word(ireg_args, stk, end, s->val.u8); break; + case nsXPTType::T_U16: alloc_word(ireg_args, stk, end, s->val.u16); break; + case nsXPTType::T_U32: alloc_word(ireg_args, stk, end, s->val.u32); break; + case nsXPTType::T_U64: alloc_word(ireg_args, stk, end, s->val.u64); break; + case nsXPTType::T_BOOL: alloc_word(ireg_args, stk, end, s->val.b); break; + case nsXPTType::T_CHAR: alloc_word(ireg_args, stk, end, s->val.c); break; + case nsXPTType::T_WCHAR: alloc_word(ireg_args, stk, end, s->val.wc); break; + default: + // all the others are plain pointer types + alloc_word(ireg_args, stack_args, ireg_end, + reinterpret_cast<uint64_t>(s->val.p)); + break; + } + } +} + +extern "C" nsresult _NS_InvokeByIndex(nsISupports* that, uint32_t methodIndex, + uint32_t paramCount, nsXPTCVariant* params); + +EXPORT_XPCOM_API(nsresult) +NS_InvokeByIndex(nsISupports* that, uint32_t methodIndex, + uint32_t paramCount, nsXPTCVariant* params) +{ + return _NS_InvokeByIndex(that, methodIndex, paramCount, params); +} diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_aarch64.s b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_aarch64.s new file mode 100644 --- /dev/null +++ b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_aarch64.s @@ -0,0 +1,67 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + + .section ".text" + .globl _NS_InvokeByIndex + .type _NS_InvokeByIndex,@function + +/* + * _NS_InvokeByIndex(nsISupports* that, uint32_t methodIndex, + * uint32_t paramCount, nsXPTCVariant* params) + */ + +_NS_InvokeByIndex: + # set up frame + stp x29, x30, [sp,#-32]! + mov x29, sp + stp x19, x20, [sp,#16] + + # save methodIndex across function calls + mov w20, w1 + + # end of stack area passed to invoke_copy_to_stack + mov x1, sp + + # assume 8 bytes of stack for each argument with 16-byte alignment + add w19, w2, #1 + and w19, w19, #0xfffffffe + sub sp, sp, w19, uxth #3 + + # temporary place to store args passed in r0-r7,v0-v7 + sub sp, sp, #128 + + # save 'that' on stack + str x0, [sp] + + # start of stack area passed to invoke_copy_to_stack + mov x0, sp + bl invoke_copy_to_stack + + # load arguments passed in r0-r7 + ldp x6, x7, [sp, #48] + ldp x4, x5, [sp, #32] + ldp x2, x3, [sp, #16] + ldp x0, x1, [sp],#64 + + # load arguments passed in v0-v7 + ldp d6, d7, [sp, #48] + ldp d4, d5, [sp, #32] + ldp d2, d3, [sp, #16] + ldp d0, d1, [sp],#64 + + # call the method + ldr x16, [x0] + add x16, x16, w20, uxth #3 + ldr x16, [x16] + blr x16 + + add sp, sp, w19, uxth #3 + ldp x19, x20, [sp,#16] + ldp x29, x30, [sp],#32 + ret + + .size _NS_InvokeByIndex, . - _NS_InvokeByIndex + + diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_aarch64.cpp b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_aarch64.cpp new file mode 100644 --- /dev/null +++ b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_aarch64.cpp @@ -0,0 +1,219 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +#include "xptcprivate.h" +#include "xptiprivate.h" + +#ifndef __AARCH64EL__ +#error "Only little endian compatibility was tested" +#endif + +/* + * This is for AArch64 ABI + * + * When we're called, the "gp" registers are stored in gprData and + * the "fp" registers are stored in fprData. Each array has 8 regs + * but first reg in gprData is a placeholder for 'self'. + */ +extern "C" nsresult +PrepareAndDispatch(nsXPTCStubBase* self, uint32_t methodIndex, uint64_t* args, + uint64_t *gprData, double *fprData) +{ +#define PARAM_BUFFER_COUNT 16 +#define PARAM_GPR_COUNT 8 +#define PARAM_FPR_COUNT 8 + + nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT]; + nsXPTCMiniVariant* dispatchParams = NULL; + const nsXPTMethodInfo* info; + nsresult result = NS_ERROR_FAILURE; + + NS_ASSERTION(self,"no self"); + + self->mEntry->GetMethodInfo(uint16_t(methodIndex), &info); + NS_ASSERTION(info,"no method info"); + + uint32_t paramCount = info->GetParamCount(); + + // setup variant array pointer + if (paramCount > PARAM_BUFFER_COUNT) { + dispatchParams = new nsXPTCMiniVariant[paramCount]; + } else { + dispatchParams = paramBuffer; + } + NS_ASSERTION(dispatchParams,"no place for params"); + + uint64_t* ap = args; + uint32_t next_gpr = 1; // skip first arg which is 'self' + uint32_t next_fpr = 0; + for (uint32_t i = 0; i < paramCount; i++) { + const nsXPTParamInfo& param = info->GetParam(i); + const nsXPTType& type = param.GetType(); + nsXPTCMiniVariant* dp = &dispatchParams[i]; + + if (param.IsOut() || !type.IsArithmetic()) { + if (next_gpr < PARAM_GPR_COUNT) { + dp->val.p = (void*)gprData[next_gpr++]; + } else { + dp->val.p = (void*)*ap++; + } + continue; + } + + switch (type) { + case nsXPTType::T_I8: + if (next_gpr < PARAM_GPR_COUNT) { + dp->val.i8 = (int8_t)gprData[next_gpr++]; + } else { + dp->val.i8 = (int8_t)*ap++; + } + break; + + case nsXPTType::T_I16: + if (next_gpr < PARAM_GPR_COUNT) { + dp->val.i16 = (int16_t)gprData[next_gpr++]; + } else { + dp->val.i16 = (int16_t)*ap++; + } + break; + + case nsXPTType::T_I32: + if (next_gpr < PARAM_GPR_COUNT) { + dp->val.i32 = (int32_t)gprData[next_gpr++]; + } else { + dp->val.i32 = (int32_t)*ap++; + } + break; + + case nsXPTType::T_I64: + if (next_gpr < PARAM_GPR_COUNT) { + dp->val.i64 = (int64_t)gprData[next_gpr++]; + } else { + dp->val.i64 = (int64_t)*ap++; + } + break; + + case nsXPTType::T_U8: + if (next_gpr < PARAM_GPR_COUNT) { + dp->val.u8 = (uint8_t)gprData[next_gpr++]; + } else { + dp->val.u8 = (uint8_t)*ap++; + } + break; + + case nsXPTType::T_U16: + if (next_gpr < PARAM_GPR_COUNT) { + dp->val.u16 = (uint16_t)gprData[next_gpr++]; + } else { + dp->val.u16 = (uint16_t)*ap++; + } + break; + + case nsXPTType::T_U32: + if (next_gpr < PARAM_GPR_COUNT) { + dp->val.u32 = (uint32_t)gprData[next_gpr++]; + } else { + dp->val.u32 = (uint32_t)*ap++; + } + break; + + case nsXPTType::T_U64: + if (next_gpr < PARAM_GPR_COUNT) { + dp->val.u64 = (uint64_t)gprData[next_gpr++]; + } else { + dp->val.u64 = (uint64_t)*ap++; + } + break; + + case nsXPTType::T_FLOAT: + if (next_fpr < PARAM_FPR_COUNT) { + memcpy(&dp->val.f, &fprData[next_fpr++], sizeof(dp->val.f)); + } else { + memcpy(&dp->val.f, ap++, sizeof(dp->val.f)); + } + break; + + case nsXPTType::T_DOUBLE: + if (next_fpr < PARAM_FPR_COUNT) { + memcpy(&dp->val.d, &fprData[next_fpr++], sizeof(dp->val.d)); + } else { + memcpy(&dp->val.d, ap++, sizeof(dp->val.d)); + } + break; + + case nsXPTType::T_BOOL: + if (next_gpr < PARAM_GPR_COUNT) { + dp->val.b = (bool)gprData[next_gpr++]; + } else { + dp->val.b = (bool)*ap++; + } + break; + + case nsXPTType::T_CHAR: + if (next_gpr < PARAM_GPR_COUNT) { + dp->val.c = (char)gprData[next_gpr++]; + } else { + dp->val.c = (char)*ap++; + } + break; + + case nsXPTType::T_WCHAR: + if (next_gpr < PARAM_GPR_COUNT) { + dp->val.wc = (wchar_t)gprData[next_gpr++]; + } else { + dp->val.wc = (wchar_t)*ap++; + } + break; + + default: + NS_ASSERTION(0, "bad type"); + break; + } + } + + result = self->mOuter->CallMethod((uint16_t)methodIndex, info, dispatchParams); + + if (dispatchParams != paramBuffer) { + delete [] dispatchParams; + } + + return result; +} + +// Load w17 with the constant 'n' and branch to SharedStub(). +# define STUB_ENTRY(n) \ + __asm__ ( \ + ".section \".text\" \n\t" \ + ".align 2\n\t" \ + ".if "#n" < 10 \n\t" \ + ".globl _ZN14nsXPTCStubBase5Stub"#n"Ev \n\t" \ + ".hidden _ZN14nsXPTCStubBase5Stub"#n"Ev \n\t" \ + ".type _ZN14nsXPTCStubBase5Stub"#n"Ev,@function \n\n" \ + "_ZN14nsXPTCStubBase5Stub"#n"Ev: \n\t" \ + ".elseif "#n" < 100 \n\t" \ + ".globl _ZN14nsXPTCStubBase6Stub"#n"Ev \n\t" \ + ".hidden _ZN14nsXPTCStubBase6Stub"#n"Ev \n\t" \ + ".type _ZN14nsXPTCStubBase6Stub"#n"Ev,@function \n\n" \ + "_ZN14nsXPTCStubBase6Stub"#n"Ev: \n\t" \ + ".elseif "#n" < 1000 \n\t" \ + ".globl _ZN14nsXPTCStubBase7Stub"#n"Ev \n\t" \ + ".hidden _ZN14nsXPTCStubBase7Stub"#n"Ev \n\t" \ + ".type _ZN14nsXPTCStubBase7Stub"#n"Ev,@function \n\n" \ + "_ZN14nsXPTCStubBase7Stub"#n"Ev: \n\t" \ + ".else \n\t" \ + ".err \"stub number "#n" >= 1000 not yet supported\"\n" \ + ".endif \n\t" \ + "mov w17,#"#n" \n\t" \ + "b SharedStub \n" \ +); + +#define SENTINEL_ENTRY(n) \ + nsresult nsXPTCStubBase::Sentinel##n() \ +{ \ + NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \ + return NS_ERROR_NOT_IMPLEMENTED; \ +} + +#include "xptcstubsdef.inc" diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_aarch64.s b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_aarch64.s new file mode 100644 --- /dev/null +++ b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_aarch64.s @@ -0,0 +1,39 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + + .set NGPREGS,8 + .set NFPREGS,8 + + .section ".text" + .globl SharedStub + .hidden SharedStub + .type SharedStub,@function +SharedStub: + stp x29, x30, [sp,#-16]! + mov x29, sp + + sub sp, sp, #8*(NGPREGS+NFPREGS) + stp x0, x1, [sp, #64+(0*8)] + stp x2, x3, [sp, #64+(2*8)] + stp x4, x5, [sp, #64+(4*8)] + stp x6, x7, [sp, #64+(6*8)] + stp d0, d1, [sp, #(0*8)] + stp d2, d3, [sp, #(2*8)] + stp d4, d5, [sp, #(4*8)] + stp d6, d7, [sp, #(6*8)] + + # methodIndex passed from stub + mov w1, w17 + + add x2, sp, #16+(8*(NGPREGS+NFPREGS)) + add x3, sp, #8*NFPREGS + add x4, sp, #0 + + bl PrepareAndDispatch + + add sp, sp, #8*(NGPREGS+NFPREGS) + ldp x29, x30, [sp],#16 + ret + + .size SharedStub, . - SharedStub ++++++ mozilla-aarch64-bmo-963027.patch ++++++ # HG changeset patch # User Marcin Juszkiewicz <mjuszkiewicz(a)redhat.com> # Date 1392218661 18000 # Node ID 38fca44b6b86e2f12535900e2084f0378217570f # Parent 8858624d813a6200b059590c146cf774fc16ff38 Bug 963027 - AArch64 support for WebRTC. r=derf Index: mozilla/media/webrtc/trunk/webrtc/typedefs.h =================================================================== --- mozilla.orig/media/webrtc/trunk/webrtc/typedefs.h +++ mozilla/media/webrtc/trunk/webrtc/typedefs.h @@ -113,6 +113,16 @@ #define WEBRTC_ARCH_32_BITS 1 #define WEBRTC_ARCH_BIG_ENDIAN #define WEBRTC_BIG_ENDIAN +#elif defined(__aarch64__) +#define WEBRTC_ARCH_AARCH64 1 +#define WEBRTC_ARCH_64_BITS 1 +#if defined(__AARCH64EL__) +#define WEBRTC_ARCH_LITTLE_ENDIAN +#define WEBRTC_LITTLE_ENDIAN +#elif defined(__AARCH64EB__) +#define WEBRTC_ARCH_BIG_ENDIAN +#define WEBRTC_BIG_ENDIAN +#endif #elif defined(__alpha__) #define WEBRTC_ARCH_ALPHA 1 #define WEBRTC_ARCH_64_BITS 1 ++++++ mozilla-aarch64-bmo-963028.patch ++++++ # HG changeset patch # User Marcin Juszkiewicz <mjuszkiewicz(a)redhat.com> # Date 1390512871 18000 # Node ID feaf8bd56a82749f5d0d8869b7c0a1c01e300362 # Parent 2a082f03cd1d64c8bfff9641284f2dc23617f806 Bug 963028 - AArch64 support for jemalloc. r=froydnj diff --git a/memory/jemalloc/src/include/jemalloc/internal/jemalloc_internal.h.in b/memory/jemalloc/src/include/jemalloc/internal/jemalloc_internal.h.in --- a/memory/jemalloc/src/include/jemalloc/internal/jemalloc_internal.h.in +++ b/memory/jemalloc/src/include/jemalloc/internal/jemalloc_internal.h.in @@ -283,16 +283,19 @@ static const bool config_ivsalloc = # define LG_QUANTUM 4 # endif # ifdef __SH4__ # define LG_QUANTUM 4 # endif # ifdef __tile__ # define LG_QUANTUM 4 # endif +# ifdef __aarch64__ +# define LG_QUANTUM 4 +# endif # ifndef LG_QUANTUM # error "No LG_QUANTUM definition for architecture; specify via CPPFLAGS" # endif #endif #define QUANTUM ((size_t)(1U << LG_QUANTUM)) #define QUANTUM_MASK (QUANTUM - 1) diff --git a/memory/mozjemalloc/jemalloc.c b/memory/mozjemalloc/jemalloc.c --- a/memory/mozjemalloc/jemalloc.c +++ b/memory/mozjemalloc/jemalloc.c @@ -1097,17 +1097,17 @@ static unsigned ncpus; /* * VM page size. It must divide the runtime CPU page size or the code * will abort. * Platform specific page size conditions copied from js/public/HeapAPI.h */ #if (defined(SOLARIS) || defined(__FreeBSD__)) && \ (defined(__sparc) || defined(__sparcv9) || defined(__ia64)) #define pagesize_2pow ((size_t) 13) -#elif defined(__powerpc64__) +#elif defined(__powerpc64__) || defined(__aarch64__) #define pagesize_2pow ((size_t) 16) #else #define pagesize_2pow ((size_t) 12) #endif #define pagesize ((size_t) 1 << pagesize_2pow) #define pagesize_mask (pagesize - 1) /* Various quantum-related settings. */ ++++++ mozilla-aarch64-bmo-963029.patch ++++++ # HG changeset patch # User Marcin Juszkiewicz <mjuszkiewicz(a)redhat.com> # Date 1390512871 18000 # Node ID 89e06a821ad5986035de99c8bc1f9d7a99541b2a # Parent feaf8bd56a82749f5d0d8869b7c0a1c01e300362 Bug 963029 - AArch64 support for MFBT. r=froydnj Index: mozilla/mfbt/Endian.h =================================================================== --- mozilla.orig/mfbt/Endian.h +++ mozilla/mfbt/Endian.h @@ -121,14 +121,14 @@ #elif defined(__sparc) || defined(__sparc__) || \ defined(_POWER) || defined(__hppa) || \ defined(_MIPSEB) || defined(__ARMEB__) || \ - defined(__s390__) || \ + defined(__s390__) || defined(__AARCH64EB__) || \ (defined(__sh__) && defined(__LITTLE_ENDIAN__)) || \ (defined(__ia64) && defined(__BIG_ENDIAN__)) # define MOZ_BIG_ENDIAN 1 #elif defined(__i386) || defined(__i386__) || \ defined(__x86_64) || defined(__x86_64__) || \ defined(_MIPSEL) || defined(__ARMEL__) || \ - defined(__alpha__) || \ + defined(__alpha__) || defined(__AARCH64EL__) || \ (defined(__sh__) && defined(__BIG_ENDIAN__)) || \ (defined(__ia64) && !defined(__BIG_ENDIAN__)) # define MOZ_LITTLE_ENDIAN 1 Index: mozilla/mfbt/tests/TestPoisonArea.cpp =================================================================== --- mozilla.orig/mfbt/tests/TestPoisonArea.cpp +++ mozilla/mfbt/tests/TestPoisonArea.cpp @@ -161,6 +161,9 @@ #elif defined __s390__ #define RETURN_INSTR 0x07fe0000 /* br %r14 */ +#elif defined __aarch64__ +#define RETURN_INSTR 0xd65f03c0 /* ret */ + #elif defined __ia64 struct ia64_instr { uint32_t i[4]; }; static const ia64_instr _return_instr = ++++++ mozilla-aarch64-bmo-963030.patch ++++++ # HG changeset patch # User Marcin Juszkiewicz <mjuszkiewicz(a)redhat.com> # Date 1391033256 18000 # Node ID 8a76622ce10d83a9dd070b968367efd8e73dc7cc # Parent d890e603d751c465f2a0e2d2221e033b32afe4a9 Bug 963030 - AArch64 support for IPC. r=bsmedberg diff --git a/ipc/chromium/src/build/build_config.h b/ipc/chromium/src/build/build_config.h --- a/ipc/chromium/src/build/build_config.h +++ b/ipc/chromium/src/build/build_config.h @@ -97,16 +97,19 @@ #define ARCH_CPU_S390X 1 #define ARCH_CPU_64_BITS 1 #elif defined(__s390__) #define ARCH_CPU_S390 1 #define ARCH_CPU_32_BITS 1 #elif defined(__alpha__) #define ARCH_CPU_ALPHA 1 #define ARCH_CPU_64_BITS 1 +#elif defined(__aarch64__) +#define ARCH_CPU_AARCH64 1 +#define ARCH_CPU_64_BITS 1 #else #error Please add support for your architecture in build/build_config.h #endif // Type detection for wchar_t. #if defined(OS_WIN) #define WCHAR_T_IS_UTF16 #else ++++++ mozilla-aarch64-bmo-963031.patch ++++++ # HG changeset patch # User Marcin Juszkiewicz <mjuszkiewicz(a)redhat.com> # Date 1390828707 18000 # Node ID 01c406c513473eef5c98940ba8d3040c456044d8 # Parent b781647898f4a82e6cdeeb907ebbc402545698db Bug 963031 - AArch support for Graphics. r=doublec diff --git a/gfx/ycbcr/chromium_types.h b/gfx/ycbcr/chromium_types.h --- a/gfx/ycbcr/chromium_types.h +++ b/gfx/ycbcr/chromium_types.h @@ -41,13 +41,17 @@ typedef uint32_t uint32; #elif defined(__sparc) #define ARCH_CPU_SPARC_FAMILY 1 #define ARCH_CPU_SPARC 1 #define ARCH_CPU_32_BITS 1 #elif defined(__sparcv9) #define ARCH_CPU_SPARC_FAMILY 1 #define ARCH_CPU_SPARC 1 #define ARCH_CPU_64_BITS 1 +#elif defined(__aarch64__) +#define ARCH_CPU_AARCH64_FAMILY 1 +#define ARCH_CPU_AARCH64 1 +#define ARCH_CPU_64_BITS 1 #else #warning Please add support for your architecture in chromium_types.h #endif #endif // GFX_CHROMIUMTYPES_H -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnonlin for openSUSE:Factory
by root＠hilbert.suse.de 14 Apr '14

14 Apr '14

Hello community, here is the log from the commit of package gnonlin for openSUSE:Factory checked in at 2014-04-14 09:25:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnonlin (Old) and /work/SRC/openSUSE:Factory/.gnonlin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnonlin" Changes: -------- --- /work/SRC/openSUSE:Factory/gnonlin/gnonlin.changes 2013-12-02 15:07:07.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gnonlin.new/gnonlin.changes 2014-04-14 09:25:02.000000000 +0200 @@ -1,0 +2,7 @@ +Sat Apr 12 18:19:16 UTC 2014 - zaitor(a)opensuse.org + +- Update to version 1.2.0: + + Bugs fixed: bgo#596374, bgo#690881, bgo#691041, bgo#701015, + bgo#706831. + +------------------------------------------------------------------- Old: ---- gnonlin-1.1.90.tar.xz New: ---- gnonlin-1.2.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnonlin.spec ++++++ --- /var/tmp/diff_new_pack.5XLXdL/_old 2014-04-14 09:25:03.000000000 +0200 +++ /var/tmp/diff_new_pack.5XLXdL/_new 2014-04-14 09:25:03.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package gnonlin # -# 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: gnonlin -Version: 1.1.90 +Version: 1.2.0 Release: 0 %define gst_branch 1.0 Summary: Non-liner audio and video support for GStreamer ++++++ gnonlin-1.1.90.tar.xz -> gnonlin-1.2.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnonlin-1.1.90/ChangeLog new/gnonlin-1.2.0/ChangeLog --- old/gnonlin-1.1.90/ChangeLog 2013-09-28 20:21:30.000000000 +0200 +++ new/gnonlin-1.2.0/ChangeLog 2014-03-15 18:38:52.000000000 +0100 @@ -1,24 +1,78 @@ -=== release 1.1.90 === +=== release 1.2.0 === -2013-09-24 Thibault Saunier <thibault.saunier(a)collabora.com> +2014-03-15 Thibault Saunier <tsaunier(a)gnome.org> * configure.ac: - releasing 1.1.90 + releasing 1.2.0 -2013-09-24 14:39:47 +0200 Thibault Saunier <thibault.saunier(a)collabora.com> +2014-02-28 09:36:24 +0100 Sebastian Dröge <sebastian(a)centricular.com> - * configure.ac: - RELEASE WIP + * common: + Automatic update of common submodule + From fe1672e to bcb1518 + +2014-02-26 22:15:19 +0100 Stefan Sauer <ensonic(a)users.sf.net> + + * common: + Automatic update of common submodule + From 1a07da9 to fe1672e + +2014-01-30 10:45:29 +0100 Edward Hervey <bilboed(a)bilboed.com> + + * common: + Automatic update of common submodule + From d48bed3 to 1a07da9 + +2013-12-30 16:29:54 +0100 Edward Hervey <bilboed(a)bilboed.com> + + * gnl/gnloperation.c: + gnloperation: Remove dead code + ret is only set before leaving the loop. + COVERITY CID 1139661 + COVERITY CID 1139662 + +2013-12-22 22:35:42 +0000 Tim-Philipp Müller <tim(a)centricular.com> + + * common: + Automatic update of common submodule + From dbedaa0 to d48bed3 -2013-08-31 12:05:43 -0400 Thibault Saunier <thibault.saunier(a)collabora.com> +2013-11-29 09:50:33 +0100 Sebastian Dröge <sebastian(a)centricular.com> * gnl/gnlcomposition.c: - composition: Never take the OBJECTS_LOCK when sending events - We should never have the OBJECTS_LOCK when sending or receiving - events. This lock is usefull only when we deal with children of - composition, so it should be used exclusivly for that purpose - Avoiding deadlocks - https://bugzilla.gnome.org/show_bug.cgi?id=706831 + gnlcomposition: Fix typo + +2013-11-05 11:22:15 +0000 Tim-Philipp Müller <tim(a)centricular.com> + + * common: + Automatic update of common submodule + From 865aa20 to dbedaa0 + +2013-09-28 21:06:41 +0200 Thibault Saunier <thibault.saunier(a)collabora.com> + + * configure.ac: + Back to development + +=== release 1.1.90 === + +2013-09-24 14:39:47 +0200 Thibault Saunier <thibault.saunier(a)collabora.com> + + * ChangeLog: + * configure.ac: + * docs/libs/gnonlin.hierarchy: + * docs/libs/gnonlin.interfaces: + * docs/libs/gnonlin.prerequisites: + * docs/libs/gnonlin.signals: + * docs/libs/inspect-build.stamp: + * docs/libs/inspect.stamp: + * docs/libs/inspect/plugin-gnonlin.xml: + Release 1.1.90 + +2013-09-24 18:34:58 +0100 Tim-Philipp Müller <tim(a)centricular.net> + + * common: + Automatic update of common submodule + From 6b03ba7 to 865aa20 2013-09-20 16:18:30 +0200 Edward Hervey <edward(a)collabora.com> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnonlin-1.1.90/NEWS new/gnonlin-1.2.0/NEWS --- old/gnonlin-1.1.90/NEWS 2013-05-30 23:15:39.000000000 +0200 +++ new/gnonlin-1.2.0/NEWS 2014-03-15 18:43:20.000000000 +0100 @@ -1,94 +1 @@ -This is GNonLin 0.10.17 "Flight from Hawaii coming out of the sun" - -Features of this release - - * documentation and debugging fixes - * Use glib 2.22 API if available - -This is GNonLin 0.10.16 "I needed time to think to get the memories from my mind" - -Features of this release - - * More race fixes - * gnlcomposition: propagate caps to childs - * gnlurisource: Only use needed streams - * gnlcomposition: Fix QoS handling - -This is GNonLin 0.10.15 "I missed the snow in Barcelona" - -Features of this release - - * Many fixes for complex compositions - -This is GNonLin 0.10.14 "Slicing, Dicing and Chopping" - -Features of this release - - * New gnlurisource element - * Documentation update - -This is GNonLin 0.10.13 "Service of Quality" - -Features of this release - - * Fix QoS event handling - * Fix racyness in source pad handlings - * GnlOperation: Add signal to know input stream priorities - -This is GNonLin 0.10.12 "Lots of people on the clothesline" - -Features of this release - - * New property for faster composition updates - * Speedups - * various fixes - - -This is GNonLin 0.10.11 "How about green for the bikeshed?" - -Features of this release - - * Speedup option to avoid recalculation during composition changes - * Switch to regular seeks for more efficient beheaviour - * More GstQuery/GstEvent handling - * Bugfixes on GnlOperation - * Switch to GIT - * Documentation - -This is GNonLin 0.10.10 "All Good Things..." - -Features of this release - - * Documentation in gtk-doc format - * Can handle more complicated combinations/types of operations - -This is GNonLin 0.10.9 "Cheese and Wine" - -Features of this release - - * Improved support for modifying compositions during playback. - -This is GNonLin 0.10.8 "Half a kilo of power points" - -Features of this release - - * Fix for latest GstGhostPad behaviour - * Memory leak fixes - -This is GNonLin 0.10.7 "Anything better ?" - -Features of this release - - * GnlFileSource can use decodebin2 if the USE_DECODEBIN2 -env variable is set - * Deadlock fixes for modifying GnlComposition - - -This is GNonLin 0.10.6, "Who stole my beard ?" - -New GnlOperation element for using filters/effects in GnlComposition -Modification of GnlComposition internal structure for faster behaviour -Lots of fixes for complex compositions -Fixes for default sources -Many more unit tests -Code and documentation cleanups, more memory leaks fixes +This is the GNonLin Plugin release Version 1.2.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnonlin-1.1.90/RELEASE new/gnonlin-1.2.0/RELEASE --- old/gnonlin-1.1.90/RELEASE 2013-05-30 23:15:39.000000000 +0200 +++ new/gnonlin-1.2.0/RELEASE 2014-03-15 18:41:54.000000000 +0100 @@ -1,10 +1,9 @@ -Release notes for GNonLin Non-Linear Editing Plug-ins 0.10.17 "Flight from Hawaii coming out of the sun" - +Release notes for GNonLin Non-Linear Editing Plug-ins 1.2.0 -The GStreamer team is proud to announce a new release -in the 0.10.x stable series of GNonLin. +The GStreamer team is proud to announce the first stable release +in the 1.x stable series of GNonLin. @@ -29,35 +28,47 @@ Features of this release - * documentation and debugging fixes - * Use glib 2.22 API if available + * Bugs fixed in this release - * 628943 : make check fails if videomixer element can't be found - * 633721 : tests: gnl/simple: test_one_under_another failure / timeout + * 596374 : GnlObject: " priority " property should be changed to int type for special -1 value + * 690881 : Replace AM_CONFIG_HEADER with AC_CONFIG_HEADERS in configure.ac + * 691041 : pitivi frozen when after drag'n drop to timeline: GstVideoTestSrc Internal data flow error + * 701015 : Using a g_thread for gnonlin pipeline update / forward eos on the streaming thread. + * 706831 : composition: Release objects lock while forwarding an event + +==== Download ==== -Download +You can find source releases of gnonlin in the download +directory: http://gstreamer.freedesktop.org/src/gnonlin/ -You can find source releases of gnonlin in the download directory: -http://gstreamer.freedesktop.org/src/gnonlin/ +The git repository and details how to clone it can be found at +http://cgit.freedesktop.org/gstreamer/gnonlin/ -GStreamer Homepage +==== Homepage ==== -More details can be found on the project's website: -http://gstreamer.freedesktop.org/ +The project's website is http://gstreamer.freedesktop.org/ -Support and Bugs +==== Support and Bugs ==== We use GNOME's bugzilla for bug reports and feature requests: http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer -Developers +Please submit patches via bugzilla as well. + +For help and support, please subscribe to and send questions to the +gstreamer-devel mailing list (see below for details). + +There is also a #gstreamer IRC channel on the Freenode IRC network. + +==== Developers ==== + +GStreamer is stored in Git, hosted at git.freedesktop.org, and can be cloned +from there (see link above). -GStreamer is stored in Git, hosted at git.freedesktop.org, and can be cloned from there. -Interested developers of the core library, plug-ins, and applications should -subscribe to the gstreamer-devel list. If there is sufficient interest we -will create more lists as necessary. +Interested developers of the core library, plugins, and applications should +subscribe to the gstreamer-devel list. Applications @@ -65,10 +76,9 @@ Contributors to this release - * David Schleef * Edward Hervey - * Jan Schmidt * Sebastian Dröge - * Stefan Kost + * Stefan Sauer + * Thibault Saunier * Tim-Philipp Müller \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnonlin-1.1.90/configure new/gnonlin-1.2.0/configure --- old/gnonlin-1.1.90/configure 2013-09-28 20:43:25.000000000 +0200 +++ new/gnonlin-1.2.0/configure 2014-03-15 18:38:44.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for GNonLin 1.1.90. +# Generated by GNU Autoconf 2.69 for GNonLin 1.2.0. # # Report bugs to <http://gnonlin.sourceforge.net/>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='GNonLin' PACKAGE_TARNAME='gnonlin' -PACKAGE_VERSION='1.1.90' -PACKAGE_STRING='GNonLin 1.1.90' +PACKAGE_VERSION='1.2.0' +PACKAGE_STRING='GNonLin 1.2.0' PACKAGE_BUGREPORT='http://gnonlin.sourceforge.net/' PACKAGE_URL='' @@ -1483,7 +1483,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 GNonLin 1.1.90 to adapt to many kinds of systems. +\`configure' configures GNonLin 1.2.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1554,7 +1554,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GNonLin 1.1.90:";; + short | recursive ) echo "Configuration of GNonLin 1.2.0:";; esac cat <<\_ACEOF @@ -1726,7 +1726,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GNonLin configure 1.1.90 +GNonLin configure 1.2.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2004,7 +2004,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by GNonLin $as_me 1.1.90, which was +It was created by GNonLin $as_me 1.2.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2982,7 +2982,7 @@ # Define the identity of the package. PACKAGE='gnonlin' - VERSION='1.1.90' + VERSION='1.2.0' cat >>confdefs.h <<_ACEOF @@ -3151,9 +3151,9 @@ - PACKAGE_VERSION_MAJOR=$(echo 1.1.90 | cut -d'.' -f1) - PACKAGE_VERSION_MINOR=$(echo 1.1.90 | cut -d'.' -f2) - PACKAGE_VERSION_MICRO=$(echo 1.1.90 | cut -d'.' -f3) + PACKAGE_VERSION_MAJOR=$(echo 1.2.0 | cut -d'.' -f1) + PACKAGE_VERSION_MINOR=$(echo 1.2.0 | cut -d'.' -f2) + PACKAGE_VERSION_MICRO=$(echo 1.2.0 | cut -d'.' -f3) @@ -3164,7 +3164,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking nano version" >&5 $as_echo_n "checking nano version... " >&6; } - NANO=$(echo 1.1.90 | cut -d'.' -f4) + NANO=$(echo 1.2.0 | cut -d'.' -f4) if test x"$NANO" = x || test "x$NANO" = "x0" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: 0 (release)" >&5 @@ -16954,7 +16954,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by GNonLin $as_me 1.1.90, which was +This file was extended by GNonLin $as_me 1.2.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17020,7 +17020,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -GNonLin config.status 1.1.90 +GNonLin config.status 1.2.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnonlin-1.1.90/configure.ac new/gnonlin-1.2.0/configure.ac --- old/gnonlin-1.1.90/configure.ac 2013-09-28 20:29:30.000000000 +0200 +++ new/gnonlin-1.2.0/configure.ac 2014-03-15 18:38:20.000000000 +0100 @@ -3,7 +3,7 @@ dnl initialize autoconf dnl when going to/from release please set the nano (fourth number) right ! dnl releases only do Wall, cvs and prerelease does Werror too -AC_INIT(GNonLin, 1.1.90, +AC_INIT(GNonLin, 1.2.0, http://gnonlin.sourceforge.net/, gnonlin) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnonlin-1.1.90/gnl/gnlcomposition.c new/gnonlin-1.2.0/gnl/gnlcomposition.c --- old/gnonlin-1.1.90/gnl/gnlcomposition.c 2013-09-24 18:16:29.000000000 +0200 +++ new/gnonlin-1.2.0/gnl/gnlcomposition.c 2014-02-18 13:46:08.000000000 +0100 @@ -664,7 +664,7 @@ /* FIXME: Do we want to create a new stream ID here? */ GST_DEBUG_OBJECT (comp, "forward stream-start %p", event); } else { - GST_DEBUG_OBJECT (comp, "droping stream-start %p", event); + GST_DEBUG_OBJECT (comp, "dropping stream-start %p", event); retval = GST_PAD_PROBE_DROP; } break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnonlin-1.1.90/gnl/gnloperation.c new/gnonlin-1.2.0/gnl/gnloperation.c --- old/gnonlin-1.1.90/gnl/gnloperation.c 2013-08-15 13:49:17.000000000 +0200 +++ new/gnonlin-1.2.0/gnl/gnloperation.c 2014-01-15 21:43:13.000000000 +0100 @@ -498,9 +498,6 @@ break; } case GST_ITERATOR_RESYNC: - if (ret) - gst_object_unref (ret); - ret = NULL; gst_iterator_resync (pads); break; default: @@ -553,9 +550,6 @@ break; } case GST_ITERATOR_RESYNC: - if (ret) - gst_object_unref (ret); - ret = NULL; gst_iterator_resync (pads); break; default: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnonlin-1.1.90/gnonlin.spec new/gnonlin-1.2.0/gnonlin.spec --- old/gnonlin-1.1.90/gnonlin.spec 2013-09-28 20:43:28.000000000 +0200 +++ new/gnonlin-1.2.0/gnonlin.spec 2014-03-15 18:38:48.000000000 +0100 @@ -1,5 +1,5 @@ Name: gnonlin -Version: 1.1.90 +Version: 1.2.0 Release: 1 Summary: GStreamer extension library for non-linear editing -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdebase4-workspace for openSUSE:Factory
by root＠hilbert.suse.de 14 Apr '14

14 Apr '14

Hello community, here is the log from the commit of package kdebase4-workspace for openSUSE:Factory checked in at 2014-04-14 06:49:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdebase4-workspace (Old) and /work/SRC/openSUSE:Factory/.kdebase4-workspace.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdebase4-workspace" Changes: -------- --- /work/SRC/openSUSE:Factory/kdebase4-workspace/kdebase4-workspace.changes 2014-04-04 16:35:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdebase4-workspace.new/kdebase4-workspace.changes 2014-04-14 06:49:12.000000000 +0200 @@ -1,0 +2,13 @@ +Thu Apr 10 12:09:26 UTC 2014 - wbauer(a)tmo.at + +- Added kdm-fix-resumption-from-console-mode.patch: + * fix resumption from console mode when monotonic clock is in use + (kde#312947, bnc#756198) +- Added screenlocker-always-show-password-dialog-when-needed.patch: + * password input dialog was not shown under certain circumstances + (kde#327947, kde#329076, bnc#864305) +- Added screenlocker-dont-leak-screensaver-processes.patch: + * screensaver processes might keep running in background when + unlocking the screen (kde#224200, bnc#809835) + +------------------------------------------------------------------- New: ---- kdm-fix-resumption-from-console-mode.patch screenlocker-always-show-password-dialog-when-needed.patch screenlocker-dont-leak-screensaver-processes.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-workspace.spec ++++++ --- /var/tmp/diff_new_pack.UKa93i/_old 2014-04-14 06:49:14.000000000 +0200 +++ /var/tmp/diff_new_pack.UKa93i/_new 2014-04-14 06:49:14.000000000 +0200 @@ -103,6 +103,8 @@ # Patch is based on the changes within GDM to detect running plymouth # and issue a quit to the plymouth daemon Patch15: kdm_plymouth.patch +# PATCH-FIX-UPSTREAM kdm-fix-resumption-from-console-mode.patch (kde#312947, bnc#756198) +Patch16: kdm-fix-resumption-from-console-mode.patch ## Workspace patches # PATCH-FIX-OPENSUSE startkde.diff -- Injects branded startupconfigkeys to users $KDEHOME, and adds %datadir/kde4/env # to list of read enviroments @@ -139,6 +141,12 @@ Patch66: add-calculator-hotkey.patch # PATCH-FIX-OPENSUSE Remove the dependencies on strigi Patch67: remove_strigi.patch +# PATCH-FIX-UPSTREAM screenlocker-always-show-password-dialog-when-needed.patch -- password input dialog was not shown +# under certain circumstances (kde#327947, kde#329076, bnc#864305) +Patch68: screenlocker-always-show-password-dialog-when-needed.patch +# PATCH-FIX-UPSTREAM screenlocker-dont-leak-screensaver-processes.patch -- screensaver processes might keep running in +# background when unlocking the screen (kde#224200, bnc#809835) +Patch69: screenlocker-dont-leak-screensaver-processes.patch # Taken from fedora, additional changes resubmitted to fedora Patch71: kde-workspace-4.11.0-kdm-logind-multiseat.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -334,6 +342,7 @@ %patch13 %patch14 -p1 %patch15 -p1 +%patch16 -p1 ## Workspace patches %patch50 %patch51 @@ -351,6 +360,8 @@ %patch65 -p1 %patch66 -p1 %patch67 -p1 +%patch68 -p0 +%patch69 -p1 %if %{with_multiseat} %patch71 -p1 %endif ++++++ kdm-fix-resumption-from-console-mode.patch ++++++ commit 3b3f247f28b25e61a9d1820ea25f3c4a2b699a1d Author: Oswald Buddenhagen <ossi(a)kde.org> Date: Fri Mar 28 17:52:23 2014 +0100 fix resumption from console mode when monotonic clock is in use BUG: 312947 FIXED-IN: 4.11.8 diff --git a/kdm/backend/dm.c b/kdm/backend/dm.c index e0f1366..77a2ef7 100644 --- a/kdm/backend/dm.c +++ b/kdm/backend/dm.c @@ -74,8 +74,11 @@ static int stopping; SdRec sdRec = { 0, 0, 0, TO_INF, TO_INF, 0, 0, 0 }; time_t now; -#ifndef nowMonotonic +#if (_POSIX_MONOTONIC_CLOCK >= 0) +time_t nowWallDelta; +# ifndef nowMonotonic int nowMonotonic; +# endif #endif #if KDM_LIBEXEC_STRIP != -1 @@ -339,6 +342,11 @@ updateNow(void) clock_gettime(CLOCK_MONOTONIC, &ts); /* Linux' monotonic clock starts at zero, but this is assumed to mean "long ago". */ now = ts.tv_sec + 10000; + /* When we read wall clock dates (e.g. from UTMP), we need to map + them to the monotonic clock. Of course, such mapping defeats the + point of a monotonic clock in the first place, but we have little + choice. */ + nowWallDelta = time(0) - now; } else #endif time(&now); @@ -486,11 +494,14 @@ checkUtmp(void) utp->hadSess = True; utp->state = UtActive; } + nck = ut->ut_time - nowWallDelta; + if (nck > now) + nck = 0; /* Clock jumped. Time out immediately. */ #ifdef HAVE_VTS /* tty with latest activity wins */ - if (utp->time < ut->ut_time) + if (utp->time < nck) #endif - utp->time = ut->ut_time; + utp->time = nck; } #ifdef BSD_UTMP close(fd); diff --git a/kdm/backend/dm.h b/kdm/backend/dm.h index 64e106b..b2f8c61 100644 --- a/kdm/backend/dm.h +++ b/kdm/backend/dm.h @@ -406,12 +406,16 @@ int activateVT(int vt); #ifndef _POSIX_MONOTONIC_CLOCK # define _POSIX_MONOTONIC_CLOCK -1 #endif -#if (_POSIX_MONOTONIC_CLOCK > 0) -# define nowMonotonic 1 -#elif (_POSIX_MONOTONIC_CLOCK < 0) +#if (_POSIX_MONOTONIC_CLOCK < 0) # define nowMonotonic 0 +# define nowWallDelta 0 #else +# if (_POSIX_MONOTONIC_CLOCK > 0) +# define nowMonotonic 1 +# else extern int nowMonotonic; +# endif +extern time_t nowWallDelta; #endif void updateNow(void); ++++++ screenlocker-always-show-password-dialog-when-needed.patch ++++++ diff --git ksmserver/screenlocker/greeter/greeterapp.h ksmserver/screenlocker/greeter/greeterapp.h index 8b79188..895337e 100644 --- ksmserver/screenlocker/greeter/greeterapp.h +++ ksmserver/screenlocker/greeter/greeterapp.h @@ -44,6 +44,7 @@ public: void setTesting(bool enable); void setImmediateLock(bool immediateLock); + void switchToImmediateLock(); public Q_SLOTS: void desktopResized(); diff --git ksmserver/screenlocker/greeter/greeterapp.cpp ksmserver/screenlocker/greeter/greeterapp.cpp index c5e2f85..475d223 100644 --- ksmserver/screenlocker/greeter/greeterapp.cpp +++ ksmserver/screenlocker/greeter/greeterapp.cpp @@ -383,6 +383,12 @@ void UnlockApp::setImmediateLock(bool immediate) m_immediateLock = immediate; } +void UnlockApp::switchToImmediateLock() +{ + setImmediateLock(true); + setLockedPropertyOnViews(); +} + bool UnlockApp::eventFilter(QObject *obj, QEvent *event) { if (obj != this && event->type() == QEvent::Show) { diff --git ksmserver/screenlocker/greeter/main.cpp ksmserver/screenlocker/greeter/main.cpp index d898734..d5c6a2b 100644 --- ksmserver/screenlocker/greeter/main.cpp +++ ksmserver/screenlocker/greeter/main.cpp @@ -24,11 +24,20 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include <iostream> +#include <signal.h> + #include "greeterapp.h" static const char description[] = I18N_NOOP( "Greeter for the KDE Plasma Workspaces Screen locker" ); static const char version[] = "0.1"; +ScreenLocker::UnlockApp *m_instance; + +static void signalhandler(int signum) +{ + m_instance->switchToImmediateLock(); +} + int main(int argc, char* argv[]) { KAboutData aboutData( "kscreenlocker_greet", 0, ki18n( "KScreenLocker Greeter" ), @@ -60,6 +77,7 @@ int main(int argc, char* argv[]) KCmdLineArgs::addCmdLineOptions(options); ScreenLocker::UnlockApp app; + m_instance = &app; KGlobal::locale()->insertCatalog(QLatin1String( "libkworkspace" )); app.disableSessionManagement(); // manually-started KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); @@ -75,5 +93,11 @@ int main(int argc, char* argv[]) // This allow ksmserver to know when the applicaion has actually finished setting itself up. // Crucial for blocking until it is ready, ensuring locking happens before sleep, e.g. std::cout << "Locked at " << QDateTime::currentDateTime().toTime_t() << std::endl; + + struct sigaction sa; + sa.sa_handler = signalhandler; + sigemptyset(&sa.sa_mask); + sa.sa_flags = 0; + sigaction(SIGUSR1, &sa, 0); return app.exec(); } diff --git ksmserver/screenlocker/ksldapp.cpp ksmserver/screenlocker/ksldapp.cpp index 3dfcc9e..d43fde7 100644 --- ksmserver/screenlocker/ksldapp.cpp +++ ksmserver/screenlocker/ksldapp.cpp @@ -46,6 +46,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include <X11/Xlib.h> // other #include <unistd.h> +#include <signal.h> namespace ScreenLocker { @@ -174,6 +175,10 @@ void KSldApp::lock(bool immediateLock) // already locked or acquiring lock, no need to lock again // but make sure it's really locked endGraceTime(); + if (immediateLock) { + // signal the greeter to switch to immediateLock mode + kill(m_lockProcess->pid(), SIGUSR1); + } return; } ++++++ screenlocker-dont-leak-screensaver-processes.patch ++++++ diff -ur kde-workspace-4.11.8/ksmserver/screenlocker/greeter/main.cpp kde-workspace-4.11.8.new/ksmserver/screenlocker/greeter/main.cpp --- kde-workspace-4.11.8/ksmserver/screenlocker/greeter/main.cpp 2014-04-10 13:48:09.000000000 +0200 +++ kde-workspace-4.11.8.new/ksmserver/screenlocker/greeter/main.cpp 2014-04-10 13:50:10.000000000 +0200 @@ -35,7 +35,18 @@ static void signalhandler(int signum) { - m_instance->switchToImmediateLock(); + switch(signum) + { + case SIGTERM: + // exit gracefully to not leave behind screensaver processes (bug#224200) + // return exit code 1 to indicate that a valid password was not entered, + // to prevent circumventing the password input by sending a SIGTERM + m_instance->exit(1); + break; + case SIGUSR1: + m_instance->switchToImmediateLock(); + break; + } } int main(int argc, char* argv[]) @@ -90,6 +101,7 @@ sa.sa_handler = signalhandler; sigemptyset(&sa.sa_mask); sa.sa_flags = 0; + sigaction(SIGTERM, &sa, 0); sigaction(SIGUSR1, &sa, 0); return app.exec(); } diff -ur kde-workspace-4.11.8/ksmserver/screenlocker/ksldapp.cpp kde-workspace-4.11.8.new/ksmserver/screenlocker/ksldapp.cpp --- kde-workspace-4.11.8/ksmserver/screenlocker/ksldapp.cpp 2014-04-10 13:48:09.000000000 +0200 +++ kde-workspace-4.11.8.new/ksmserver/screenlocker/ksldapp.cpp 2014-04-10 13:50:10.000000000 +0200 @@ -374,7 +374,7 @@ return; } s_graceTimeKill = true; - m_lockProcess->kill(); + m_lockProcess->terminate(); } void KSldApp::inhibit() -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit linuxrc for openSUSE:Factory
by root＠hilbert.suse.de 14 Apr '14

14 Apr '14

Hello community, here is the log from the commit of package linuxrc for openSUSE:Factory checked in at 2014-04-14 06:43:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/linuxrc (Old) and /work/SRC/openSUSE:Factory/.linuxrc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "linuxrc" Changes: -------- --- /work/SRC/openSUSE:Factory/linuxrc/linuxrc.changes 2014-04-09 18:17:23.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.linuxrc.new/linuxrc.changes 2014-04-14 06:43:28.000000000 +0200 @@ -1,0 +2,15 @@ +Fri Apr 11 14:25:12 CEST 2014 - snwint(a)suse.de + +- simplify s390x hypervisor detection code +- passing ssl_verify option to yast (bnc #807799) +- don't load edd.ko on efi systems (bnc #837747) +- fix nextmedia handling (bnc #813141) +- get ibft parsing code from sle11 branch +- try harder to resolve mac addresses to interface names (bnc #806593) + +------------------------------------------------------------------- +Fri Apr 11 10:07:45 CEST 2014 - snwint(a)suse.de + +- add withipoib option to trigger loading ip over infiniband modules (bnc #865852) + +------------------------------------------------------------------- Old: ---- linuxrc-4.2.16.tar.bz2 New: ---- linuxrc-4.2.18.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.BZBHda/_old 2014-04-14 06:43:28.000000000 +0200 +++ /var/tmp/diff_new_pack.BZBHda/_new 2014-04-14 06:43:28.000000000 +0200 @@ -25,9 +25,9 @@ Summary: SUSE Installation Program License: GPL-3.0+ Group: System/Boot -Version: 4.2.16 +Version: 4.2.18 Release: 0 -Source: linuxrc-4.2.16.tar.bz2 +Source: linuxrc-4.2.18.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description ++++++ linuxrc-4.2.16.tar.bz2 -> linuxrc-4.2.18.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.16/VERSION new/linuxrc-4.2.18/VERSION --- old/linuxrc-4.2.16/VERSION 2014-04-08 09:08:35.000000000 +0200 +++ new/linuxrc-4.2.18/VERSION 2014-04-11 14:25:05.000000000 +0200 @@ -1 +1 @@ -4.2.16 +4.2.18 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.16/changelog new/linuxrc-4.2.18/changelog --- old/linuxrc-4.2.16/changelog 2014-04-08 09:08:36.000000000 +0200 +++ new/linuxrc-4.2.18/changelog 2014-04-11 14:25:07.000000000 +0200 @@ -1,4 +1,17 @@ -2014-04-08: HEAD +2014-04-11: HEAD + - simplify s390x hypervisor detection code + - fix include + - passing ssl_verify option to yast (bnc #807799) + - more fixes for nextmedia handling (bnc #813141) + - don't load edd.ko on efi systems (bnc #837747) + - fix nextmedia handling (bnc #813141) + - get ibft parsing code from sle11 branch + - try harder to resolve mac addresses to interface names (bnc #806593) + +2014-04-11: 4.2.17 + - add withipoib option to trigger loading ip over infiniband modules (bnc #865852) + +2014-04-08: 4.2.16 - Merge pull request #6 from openSUSE/iucvtest - Introduce detection of z/VM or LPAR hypervisors. - Added util_umount('/sys/hypervisor/s390'); to lxrc_end. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.16/file.c new/linuxrc-4.2.18/file.c --- old/linuxrc-4.2.16/file.c 2014-03-10 13:09:19.000000000 +0100 +++ new/linuxrc-4.2.18/file.c 2014-04-11 14:04:54.000000000 +0200 @@ -307,6 +307,7 @@ { key_restart, "Restart", kf_cfg }, { key_restarted, "Restarted", kf_cfg }, { key_wicked, "Wicked", kf_cfg + kf_cmd + kf_cmd_early }, + { key_withipoib, "WithIPoIB", kf_cfg + kf_cmd_early }, }; static struct { @@ -1638,6 +1639,10 @@ if(f->is.numeric) config.wicked = f->nvalue; break; + case key_withipoib: + if(f->is.numeric) config.withipoib = f->nvalue; + break; + default: break; } @@ -1815,6 +1820,7 @@ fprintf(f, "RepoURL: %s\n", url_print(url, 3)); fprintf(f, "InstsysURL: %s\n", url_print(config.url.instsys, 3)); fprintf(f, "ZyppRepoURL: %s\n", url_print(url, 4)); + if(!config.sslcerts) fprintf(f, "ssl_verify: no\n"); file_write_str(f, key_instmode, get_instmode_name(url->scheme)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.16/file.h new/linuxrc-4.2.18/file.h --- old/linuxrc-4.2.16/file.h 2014-03-10 13:09:19.000000000 +0100 +++ new/linuxrc-4.2.18/file.h 2014-04-11 09:50:20.000000000 +0200 @@ -52,7 +52,8 @@ key_ipv6, key_ipv6only, key_usesax2, key_efi, key_supporturl, key_portno, key_osahwaddr, key_zen, key_zenconfig, key_udevrule, key_dhcpfail, key_namescheme, key_ptoptions, key_is_ptoption, key_withfcoe, key_digests, - key_plymouth, key_sslcerts, key_restart, key_restarted, key_wicked, key_autoyast2 + key_plymouth, key_sslcerts, key_restart, key_restarted, key_wicked, key_autoyast2, + key_withipoib } file_key_t; typedef enum { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.16/global.h new/linuxrc-4.2.18/global.h --- old/linuxrc-4.2.16/global.h 2014-04-08 08:07:11.000000000 +0200 +++ new/linuxrc-4.2.18/global.h 2014-04-11 09:49:55.000000000 +0200 @@ -374,6 +374,7 @@ unsigned usesax2:1; /* just passed to yast */ unsigned withiscsi; /* iSCSI parameter */ unsigned withfcoe; /* FCoE parameter */ + unsigned withipoib; /* IPoIB */ unsigned restart_method; /* 0: start new root fs, 1: reboot, 2: halt, 3: kexec */ unsigned efi_vars:1; /* efi vars exist */ int efi; /* use efi; -1 = auto */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.16/linuxrc.c new/linuxrc-4.2.18/linuxrc.c --- old/linuxrc-4.2.16/linuxrc.c 2014-04-08 08:07:11.000000000 +0200 +++ new/linuxrc-4.2.18/linuxrc.c 2014-04-11 14:23:16.000000000 +0200 @@ -43,6 +43,7 @@ #include "auto2.h" #include "scsi_rename.h" #include "checkmedia.h" +#include "url.h" #if defined(__alpha__) || defined(__ia64__) #define SIGNAL_ARGS int signum, int x, struct sigcontext *scp @@ -695,32 +696,22 @@ #if defined(__s390__) || defined(__s390x__) if(util_check_exist("/sys/hypervisor/s390")) { - mount("s390_hypfs","/sys/hypervisor/s390","s390_hypfs", 0, 0); - if(util_check_exist("/sys/hypervisor/s390/hyp/type")) { + char *type; - FILE *hyp_type; - *buf = 0; + mount("s390_hypfs", "/sys/hypervisor/s390", "s390_hypfs", 0, 0); - hyp_type = fopen("/sys/hypervisor/s390/hyp/type", "r"); - if(hyp_type) { - fgets(buf, sizeof buf -1 , hyp_type); - if(*buf) { - if(strncmp(buf,"z/VM",4)==0) { - config.hwp.hypervisor="z/VM"; - } - else if(strncmp(buf,"LPAR",4)==0) { - config.hwp.hypervisor="LPAR"; - } - else { - config.hwp.hypervisor="Unknown"; - } - *buf = 0; - } - fclose(hyp_type); - } + type = util_get_attr("/sys/hypervisor/s390/hyp/type"); + + if(!strncmp(type, "z/VM", sizeof "z/VM" - 1)) { + config.hwp.hypervisor = "z/VM"; + } + else if(!strncmp(type, "LPAR", sizeof "LPAR" - 1)) { + config.hwp.hypervisor = "LPAR"; + } + else { + config.hwp.hypervisor = "Unknown"; } } - #endif /* add cmdline to info file */ @@ -804,7 +795,7 @@ if(!config.had_segv) { lxrc_add_parts(); // we need edd for udev - if(util_check_exist("/modules/edd.ko")) { + if(!config.udev_mods && util_check_exist("/modules/edd.ko")) { system("/sbin/insmod /modules/edd.ko"); } } @@ -943,7 +934,7 @@ info_init(); - read_iscsi_ibft(); + if(iscsi_check()) config.withiscsi = 1; config.withfcoe = fcoe_check(); printf("Loading basic drivers..."); @@ -975,6 +966,12 @@ /* get usb keyboard working */ if(config.manual == 1 && !config.had_segv) util_load_usb(); + /* load ip over infiniband modules */ + if(config.withipoib) { + mod_modprobe("ib_cm", NULL); + mod_modprobe("ib_ipoib", NULL); + } + #if defined(__s390__) || defined(__s390x__) /* activate boot FCP adapter */ { @@ -1096,7 +1093,7 @@ config.cd1texts = file_parse_xmllike("/nextmedia", "text"); } - if(config.url.install && config.url.install->is.cdrom) { + if(config.url.install && (config.url.install->is.cdrom || config.cd1texts)) { char *s = get_translation(config.cd1texts, current_language()->locale); char *buf = NULL; @@ -1105,7 +1102,14 @@ j = dia_okcancel(buf, YES) == YES ? 1 : 0; if(j) { config.manual = 0; + url_free(config.url.install); + config.url.install = url_set("cd:/"); i = auto2_find_repo(); + if(!i) { + url_free(config.url.install); + config.url.install = url_set("hd:/"); + i = auto2_find_repo(); + } } } while(!i && j); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.16/net.c new/linuxrc-4.2.18/net.c --- old/linuxrc-4.2.16/net.c 2014-04-08 08:07:11.000000000 +0200 +++ new/linuxrc-4.2.18/net.c 2014-04-11 13:49:26.000000000 +0200 @@ -568,9 +568,16 @@ int net_activate_ns() { int err4 = 1, err6 = 1; + char *s; if(config.net.keep) return 0; + /* make sure we get the interface name if a mac was passed */ + if((s = mac_to_interface(config.net.device, NULL))) { + free(config.net.device); + config.net.device = s; + } + if(config.net.ipv4) err4 = net_activate4(); if(config.net.ipv6) err6 = net_activate6(); @@ -1794,6 +1801,13 @@ int net_dhcp() { unsigned active4, active = config.net.dhcp_active; + char *s; + + /* make sure we get the interface name if a mac was passed */ + if((s = mac_to_interface(config.net.device, NULL))) { + free(config.net.device); + config.net.device = s; + } if(config.wicked) { net_wicked(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.16/util.c new/linuxrc-4.2.18/util.c --- old/linuxrc-4.2.16/util.c 2014-03-26 08:09:51.000000000 +0100 +++ new/linuxrc-4.2.18/util.c 2014-04-11 13:51:30.000000000 +0200 @@ -110,6 +110,8 @@ static int skip_spaces(unsigned char **str); static int word_size(unsigned char *str, int *width, int *enc_len); +static char *mac_to_interface_log(char *mac, int log); + static void util_extend_usr1(int signum); static int util_extend(char *extension, char task, int verbose); @@ -1193,6 +1195,9 @@ add_flag(&sl0, buf, config.digests.sha512, "sha512"); add_flag(&sl0, buf, config.devtmpfs, "devtmpfs"); add_flag(&sl0, buf, config.plymouth, "plymouth"); + add_flag(&sl0, buf, config.withiscsi, "iscsi"); + add_flag(&sl0, buf, config.withfcoe, "fcoe"); + add_flag(&sl0, buf, config.withipoib, "ipoib"); if(*buf) slist_append_str(&sl0, buf); sprintf(buf, "net_config_mask = 0x%x", net_config_mask()); @@ -3366,7 +3371,8 @@ hd_free_hd_data(hd_data); } -int util_set_sysfs_attr(char* attr, char* value) + +int util_set_attr(char* attr, char* value) { int i, fd; @@ -3379,12 +3385,15 @@ return i < 0 ? i : 0; } -int util_get_sysfs_int_attr(char* attr, int *retval) + +char *util_get_attr(char* attr) { int i, fd; - char buf[1024]; + static char buf[1024]; - if((fd = open(attr, O_RDONLY)) < 0) return -1; + *buf = 0; + + if((fd = open(attr, O_RDONLY)) < 0) return buf; i = read(fd, buf, sizeof buf - 1); @@ -3392,16 +3401,23 @@ if(i >= 0) { buf[i] = 0; - } - else { - return -1; + + while(i > 0 && isspace(buf[i - 1])) { + buf[--i] = 0; + } + } - *retval = strtol(buf, NULL, 0); + return buf; +} - return 0; + +int util_get_int_attr(char* attr) +{ + return strtol(util_get_attr(attr), NULL, 0); } + char *print_driverid(driver_t *drv, int with_0x) { static char buf[256], *s; @@ -3649,61 +3665,6 @@ } -void read_iscsi_ibft() -{ - file_t *f0, *f; - - if(!util_check_exist("/sbin/iscsiadm")) return; - - system("/sbin/iscsiadm -m fw >/var/log/ibft"); - - f0 = file_read_file("/var/log/ibft", kf_ibft); - - if(config.debug) { - if(f0) { - fprintf(stderr, "ibft values:\n"); - for(f = f0; f; f = f->next) { - fprintf(stderr, " %s=%s\n", f->key_str, f->value); - } - } - else { - fprintf(stderr, "no ibft\n"); - } - } - - for(f = f0; f; f = f->next) { - switch(f->key) { - case key_ibft_hwaddr: - str_copy(&config.netdevice, f->value); - break; - - case key_ibft_ipaddr: - name2inet(&config.net.hostname, f->value); - net_check_address(&config.net.hostname, 0); - break; - - case key_ibft_netmask: - name2inet(&config.net.netmask, f->value); - net_check_address(&config.net.netmask, 0); - break; - - case key_ibft_gateway: - name2inet(&config.net.gateway, f->value); - net_check_address(&config.net.gateway, 0); - break; - - case key_ibft_dns: - name2inet(&config.net.nameserver[0], f->value); - net_check_address(&config.net.nameserver[0], 0); - break; - - default: - break; - } - } -} - - char *blk_ident(char *dev) { char *type, *label, *size; @@ -4197,6 +4158,212 @@ } +int iscsi_check() +{ + int iscsi_ok = 0; + char *attr, *s, *t; + char *sysfs_ibft = "/sys/firmware/ibft/ethernet0"; + unsigned use_dhcp = 0; + int mac_ofs = 2; + + if(util_check_exist("/modules/iscsi_ibft.ko")) { + system("/sbin/modprobe iscsi_ibft"); + sleep(1); + } + + if(!util_check_exist(sysfs_ibft)) return iscsi_ok; + + asprintf(&attr, "%s/origin", sysfs_ibft); + s = util_get_attr(attr); + fprintf(stderr, "ibft: origin = %s\n", s); + if(s[0] == '3') use_dhcp = 1; + fprintf(stderr, "ibft: dhcp = %d\n", use_dhcp); + free(attr); + + asprintf(&attr, "%s/mac", sysfs_ibft); + s = strdup(util_get_attr(attr)); + fprintf(stderr, "ibft: mac = %s\n", s); + if(*s) { + /* try to get the interface name, up to offset 2 */ + if((t = mac_to_interface(s, &mac_ofs))) { + free(s); + s = t; + } + str_copy(&config.netdevice, s); + iscsi_ok++; + } + free(s); + free(attr); + + if(use_dhcp) { + config.net.do_setup |= DS_SETUP; + config.net.setup = NS_DHCP; + } + else { + /* use ibft config only if mac matches */ + if(!mac_ofs) { + asprintf(&attr, "%s/ip-addr", sysfs_ibft); + s = util_get_attr(attr); + fprintf(stderr, "ibft: ip-addr = %s\n", s); + if(*s) { + name2inet(&config.net.hostname, s); + net_check_address(&config.net.hostname, 0); + iscsi_ok++; + } + free(attr); + } + else { + iscsi_ok++; + } + + asprintf(&attr, "%s/subnet-mask", sysfs_ibft); + s = util_get_attr(attr); + fprintf(stderr, "ibft: subnet-mask = %s\n", s); + if(*s) { + name2inet(&config.net.netmask, s); + net_check_address(&config.net.netmask, 0); + iscsi_ok++; + } + free(attr); + + if(iscsi_ok == 3) { + config.net.do_setup |= DS_SETUP; + config.net.setup = NS_HOSTIP | NS_NETMASK; + + asprintf(&attr, "%s/gateway", sysfs_ibft); + s = util_get_attr(attr); + fprintf(stderr, "ibft: gateway = %s\n", s); + if(*s) { + name2inet(&config.net.gateway, s); + net_check_address(&config.net.gateway, 0); + config.net.setup |= NS_GATEWAY; + } + free(attr); + + asprintf(&attr, "%s/primary-dns", sysfs_ibft); + s = util_get_attr(attr); + fprintf(stderr, "ibft: primary-dns = %s\n", s); + if(*s) { + name2inet(&config.net.nameserver[0], s); + net_check_address(&config.net.nameserver[0], 0); + config.net.nameservers = 1; + config.net.setup |= NS_NAMESERVER; + } + free(attr); + + asprintf(&attr, "%s/secondary-dns", sysfs_ibft); + s = util_get_attr(attr); + fprintf(stderr, "ibft: secondary-dns = %s\n", s); + if(*s) { + name2inet(&config.net.nameserver[1], s); + net_check_address(&config.net.nameserver[1], 0); + config.net.nameservers = 2; + } + free(attr); + } + } + + return use_dhcp || iscsi_ok == 3; +} + + +/* + * Interal function, use mac_to_interface(). + * + * return value must be freed + */ +char *mac_to_interface_log(char *mac, int log) +{ + struct dirent *de; + DIR *d; + char *sys = "/sys/class/net", *if_name = NULL, *attr, *if_mac; + + if(util_check_exist2(sys, mac)) return strdup(mac); + + if(log) fprintf(stderr, "%s = ?\n", mac); + + if(!(d = opendir(sys))) return NULL; + + while((de = readdir(d))) { + if(de->d_name[0] == '.') continue; + asprintf(&attr, "%s/%s/address", sys, de->d_name); + if_mac = util_get_attr(attr); + free(attr); + if(!*if_mac || !strcmp(if_mac, "00:00:00:00:00:00")) continue; + + if(!if_name && !fnmatch(mac, if_mac, FNM_CASEFOLD)) { + if_name = strdup(de->d_name); + } + + if(log) { + fprintf(stderr, "%s = %s%s\n", + if_mac, + de->d_name, + if_name && !strcmp(if_name, de->d_name) ? " *" : "" + ); + } + } + + closedir(d); + + return if_name; +} + + +/* + * Get network interface name from mac. If max_offset + * is set decrease mac and retry up to max_offset. + * + * If max_offset is not NULL, set to actual offset. + * + * Note: The max_offset param is there to help ibft parsing. Don't worry too + * much about it. + * + * return value must be freed + */ +char *mac_to_interface(char *mac, int *max_offset) +{ + char *if_name, *s, *t; + unsigned u; + int ofs = 0, max_ofs = 0; + + if(max_offset) max_ofs = *max_offset; + + if(!mac || mac[0] == 0 || mac[0] == '.') return NULL; + + if_name = mac_to_interface_log(mac, 1); + + if(!if_name) { + /* no direct match, retry with offset */ + + mac = strdup(mac); + + if((s = strrchr(mac, ':'))) { + if(strlen(s) == 3) { + u = strtoul(s + 1, &t, 16); + if(!*t) { + for(ofs = 1; ofs <= max_ofs; ofs++) { + sprintf(s + 1, "%02x", (u - ofs) & 0xff); + if_name = mac_to_interface_log(mac, 0); + if(if_name) break; + } + } + } + } + + free(mac); + } + + if(if_name && max_offset) *max_offset = ofs; + + fprintf(stderr, "if = %s", if_name); + if(if_name && ofs) fprintf(stderr, ", offset = %u", ofs); + fprintf(stderr, "\n"); + + return if_name; +} + + void util_run_script(char *name) { char *buf = NULL; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.16/util.h new/linuxrc-4.2.18/util.h --- old/linuxrc-4.2.16/util.h 2014-03-26 08:09:51.000000000 +0100 +++ new/linuxrc-4.2.18/util.h 2014-04-11 13:39:52.000000000 +0200 @@ -107,8 +107,9 @@ void util_get_ram_size(void); void util_load_usb(void); -int util_set_sysfs_attr(char* attr, char* value); -int util_get_sysfs_int_attr(char* attr, int *retval); +int util_set_attr(char* attr, char* value); +char *util_get_attr(char* attr); +int util_get_int_attr(char* attr); char *print_driverid(driver_t *drv, int with_0x); int apply_driverid(driver_t *drv); @@ -124,8 +125,6 @@ int system_log(char *cmd); -void read_iscsi_ibft(void); - char *blk_size_str(char *dev); uint64_t blk_size(char *dev); char *blk_ident(char *dev); @@ -142,6 +141,10 @@ hd_t *fix_device_names(hd_t *hd); int fcoe_check(void); +int iscsi_check(void); + +char *mac_to_interface(char *mac, int *max_offset); + void util_run_script(char *name); void util_plymouth_off(void); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit dummy-release for openSUSE:Factory
by root＠hilbert.suse.de 14 Apr '14

14 Apr '14

Hello community, here is the log from the commit of package dummy-release for openSUSE:Factory checked in at 2014-04-14 06:43:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dummy-release (Old) and /work/SRC/openSUSE:Factory/.dummy-release.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dummy-release" Changes: -------- --- /work/SRC/openSUSE:Factory/dummy-release/dummy-release.changes 2011-09-23 01:55:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dummy-release.new/dummy-release.changes 2014-04-14 06:43:27.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Apr 11 11:50:24 UTC 2014 - coolo(a)suse.com + +- also add an os-release + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dummy-release.spec ++++++ --- /var/tmp/diff_new_pack.SIHNBt/_old 2014-04-14 06:43:27.000000000 +0200 +++ /var/tmp/diff_new_pack.SIHNBt/_new 2014-04-14 06:43:27.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package dummy-release # -# Copyright (c) 2011 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,24 +16,19 @@ # - Name: dummy-release -%define product SUSE_SLES -%define flavor DVD -%define real_version %{version} -%define ncc_target sle-11 -License: BSD-3-Clause -Group: System/Fhs -Version: 11 -Release: 3 +Version: 12 +Release: 0 Provides: distribution-release Conflicts: openSUSE-release sled-release sles-release Summary: SuSE release version files +License: BSD-3-Clause +Group: System/Fhs BuildRoot: %{_tmppath}/%{name}-%{version}-build %description This package contains the files: /etc/SuSE-release, /etc/issue, -/etc/issue.net, and /etc/products.d/openSUSE.prod +/etc/issue.net and /etc/os-release %prep @@ -46,9 +41,13 @@ echo "Dummy Product (%{_target_cpu})" > $RPM_BUILD_ROOT/etc/SuSE-release touch $RPM_BUILD_ROOT/etc/motd +echo 'NAME=Dummy' > $RPM_BUILD_ROOT/etc/os-release +echo 'ID_LIKE="suse"' >> $RPM_BUILD_ROOT/etc/os-release + %files %defattr(644,root,root,755) /etc/SuSE-release +/etc/os-release %config(noreplace) /etc/motd %config(noreplace) /etc/issue %config(noreplace) /etc/issue.net -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit btrfsprogs for openSUSE:Factory
by root＠hilbert.suse.de 14 Apr '14

14 Apr '14

Hello community, here is the log from the commit of package btrfsprogs for openSUSE:Factory checked in at 2014-04-14 06:43:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/btrfsprogs (Old) and /work/SRC/openSUSE:Factory/.btrfsprogs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "btrfsprogs" Changes: -------- --- /work/SRC/openSUSE:Factory/btrfsprogs/btrfsprogs.changes 2014-04-09 18:17:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.btrfsprogs.new/btrfsprogs.changes 2014-04-14 06:43:25.000000000 +0200 @@ -1,0 +2,8 @@ +Fri Apr 11 11:30:32 UTC 2014 - dsterba(a)suse.cz + +- add missing symbol to library (bnc#873164) +- add version dependency for devel package +- Added patches: + * 0001-btrfs-progs-move-arg_strtou64-to-a-separate-file-for.patch + +------------------------------------------------------------------- New: ---- 0001-btrfs-progs-move-arg_strtou64-to-a-separate-file-for.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ btrfsprogs.spec ++++++ --- /var/tmp/diff_new_pack.TVtTqa/_old 2014-04-14 06:43:25.000000000 +0200 +++ /var/tmp/diff_new_pack.TVtTqa/_new 2014-04-14 06:43:25.000000000 +0200 @@ -30,6 +30,9 @@ Source: btrfs-progs-%{tar_version}.tar.bz2 Source1: boot-btrfs.sh Source4: setup-btrfs.sh + +Patch1: 0001-btrfs-progs-move-arg_strtou64-to-a-separate-file-for.patch + Patch163: 0163-btrfs-progs-fsck-fix-segfault.patch Patch164: 0164-btrfs-progs-convert-set-label-or-copy-from-origin.patch Patch167: 0167-Btrfs-progs-make-find_and_setup_root-return-an-error.patch @@ -64,7 +67,8 @@ %package -n libbtrfs-devel Summary: Include Files and Libraries for developing with Btrfs Group: Development/Libraries/C and C++ -Requires: libbtrfs0 +Requires: %{name} = %{version}-%{release} +Requires: libbtrfs0 = %{version} %description -n libbtrfs-devel This package contains the libraries and headers files for developers to @@ -72,6 +76,7 @@ %prep %setup -q -n btrfs-progs-%{tar_version} +%patch1 -p1 %patch163 -p1 %patch164 -p1 %patch167 -p1 ++++++ 0001-btrfs-progs-move-arg_strtou64-to-a-separate-file-for.patch ++++++ >From f555e06e2d266f52cdeb12218f8175eba2a17020 Mon Sep 17 00:00:00 2001 From: David Sterba <dsterba(a)suse.cz> Date: Fri, 11 Apr 2014 13:22:50 +0200 Subject: [PATCH] btrfs-progs: move arg_strtou64 to a separate file for library Linking with libbtrfs fails because arg_strtou64 is not defined and we cannot just add utils.o to library objects because it's not library-clean. Reported-by: Arvin Schnell <aschnell(a)suse.com> Signed-off-by: David Sterba <dsterba(a)suse.cz> --- Makefile | 5 +++-- libutils.c | 43 +++++++++++++++++++++++++++++++++++++++++++ utils.c | 33 --------------------------------- 3 files changed, 46 insertions(+), 35 deletions(-) create mode 100644 libutils.c diff --git a/Makefile b/Makefile index da0519766443..9ae7115d23a3 100644 --- a/Makefile +++ b/Makefile @@ -9,14 +9,15 @@ CFLAGS = -g -O1 -fno-strict-aliasing objects = ctree.o disk-io.o radix-tree.o extent-tree.o print-tree.o \ root-tree.o dir-item.o file-item.o inode-item.o inode-map.o \ extent-cache.o extent_io.o volumes.o utils.o repair.o \ - qgroup.o raid6.o free-space-cache.o list_sort.o props.o + qgroup.o raid6.o free-space-cache.o list_sort.o props.o \ + libutils.o cmds_objects = cmds-subvolume.o cmds-filesystem.o cmds-device.o cmds-scrub.o \ cmds-inspect.o cmds-balance.o cmds-send.o cmds-receive.o \ cmds-quota.o cmds-qgroup.o cmds-replace.o cmds-check.o \ cmds-restore.o cmds-rescue.o chunk-recover.o super-recover.o \ cmds-property.o libbtrfs_objects = send-stream.o send-utils.o rbtree.o btrfs-list.o crc32c.o \ - uuid-tree.o + uuid-tree.o libutils.o libbtrfs_headers = send-stream.h send-utils.h send.h rbtree.h btrfs-list.h \ crc32c.h list.h kerncompat.h radix-tree.h extent-cache.h \ extent_io.h ioctl.h ctree.h btrfsck.h diff --git a/libutils.c b/libutils.c new file mode 100644 index 000000000000..074f771e0b6e --- /dev/null +++ b/libutils.c @@ -0,0 +1,43 @@ +#define _GNU_SOURCE + +#include "kerncompat.h" +#include <unistd.h> +#include <stdlib.h> +#include <limits.h> + +#if BTRFS_FLAT_INCLUDES +#else +#endif /* BTRFS_FLAT_INCLUDES */ + +/* + * This function should be only used when parsing + * command arg, it won't return error to it's + */ +u64 arg_strtou64(const char *str) +{ + u64 value; + char *ptr_parse_end = NULL; + + value = strtoull(str, &ptr_parse_end, 0); + if (ptr_parse_end && *ptr_parse_end != '\0') { + fprintf(stderr, "ERROR: %s is not a valid numeric value.\n", + str); + exit(1); + } + /* + * if we pass a negative number to strtoull, + * it will return an unexpected number to us, + * so let's do the check ourselves. + */ + if (str[0] == '-') { + fprintf(stderr, "ERROR: %s: negative value is invalid.\n", + str); + exit(1); + } + if (value == ULLONG_MAX) { + fprintf(stderr, "ERROR: %s is too large.\n", str); + exit(1); + } + return value; +} + diff --git a/utils.c b/utils.c index 3e9c527a492c..134f43a76fe9 100644 --- a/utils.c +++ b/utils.c @@ -1539,39 +1539,6 @@ scan_again: return 0; } -/* - * This function should be only used when parsing - * command arg, it won't return error to it's - * caller and rather exit directly just like usage(). - */ -u64 arg_strtou64(const char *str) -{ - u64 value; - char *ptr_parse_end = NULL; - - value = strtoull(str, &ptr_parse_end, 0); - if (ptr_parse_end && *ptr_parse_end != '\0') { - fprintf(stderr, "ERROR: %s is not a valid numeric value.\n", - str); - exit(1); - } - /* - * if we pass a negative number to strtoull, - * it will return an unexpected number to us, - * so let's do the check ourselves. - */ - if (str[0] == '-') { - fprintf(stderr, "ERROR: %s: negative value is invalid.\n", - str); - exit(1); - } - if (value == ULLONG_MAX) { - fprintf(stderr, "ERROR: %s is too large.\n", str); - exit(1); - } - return value; -} - u64 parse_size(char *s) { int i; -- 1.9.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 systemd-presets-branding-openSUSE for openSUSE:Factory
by root＠hilbert.suse.de 14 Apr '14

14 Apr '14

Hello community, here is the log from the commit of package systemd-presets-branding-openSUSE for openSUSE:Factory checked in at 2014-04-14 06:43:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/systemd-presets-branding-openSUSE (Old) and /work/SRC/openSUSE:Factory/.systemd-presets-branding-openSUSE.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "systemd-presets-branding-openSUSE" Changes: -------- --- /work/SRC/openSUSE:Factory/systemd-presets-branding-openSUSE/systemd-presets-branding-openSUSE.changes 2014-04-04 16:32:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.systemd-presets-branding-openSUSE.new/systemd-presets-branding-openSUSE.changes 2014-04-14 06:43:23.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Apr 11 08:58:36 UTC 2014 - meissner(a)suse.com + +- enable auditd, haveged and irqbalance services by default. bnc#872066 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ default-openSUSE.preset ++++++ --- /var/tmp/diff_new_pack.7eT43r/_old 2014-04-14 06:43:24.000000000 +0200 +++ /var/tmp/diff_new_pack.7eT43r/_new 2014-04-14 06:43:24.000000000 +0200 @@ -18,3 +18,6 @@ enable iscsi.service enable epmd.socket enable logrotate.timer +enable haveged.service +enable irqbalance.service +enable auditd.service -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit cups for openSUSE:Factory
by root＠hilbert.suse.de 14 Apr '14

14 Apr '14

Hello community, here is the log from the commit of package cups for openSUSE:Factory checked in at 2014-04-14 06:43:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cups (Old) and /work/SRC/openSUSE:Factory/.cups.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cups" Changes: -------- --- /work/SRC/openSUSE:Factory/cups/cups.changes 2014-02-22 20:44:30.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cups.new/cups.changes 2014-04-14 06:43:22.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Apr 11 09:42:30 CEST 2014 - jsmeix(a)suse.de + +- cups-1.5.4-strftime.patch fixes CUPS upstream STR #4388: + no or malformed output from lpstat in charset other than utf-8 + (bnc#873030). + +------------------------------------------------------------------- New: ---- cups-1.5.4-strftime.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cups.spec ++++++ --- /var/tmp/diff_new_pack.fIml8f/_old 2014-04-14 06:43:23.000000000 +0200 +++ /var/tmp/diff_new_pack.fIml8f/_new 2014-04-14 06:43:23.000000000 +0200 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: cups BuildRequires: dbus-1-devel BuildRequires: fdupes @@ -218,6 +219,8 @@ Patch113: cups-1.5.4-CVE-2012-5519.patch # Patch114 fixes STR #4351: cups-lpd hugh jobs (>2G) fail Patch114: str4351.patch +# Patch115 fixes STR #4388: no or malformed output from lpstat in charset other than utf-8 +Patch115: cups-1.5.4-strftime.patch # Install into this non-root directory (required when norootforbuild is used): BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -380,6 +383,8 @@ %patch113 # Patch114 fixes STR #4351: cups-lpd hugh jobs (>2G) fail %patch114 +# Patch115 fixes STR #4388: no or malformed output from lpstat in charset other than utf-8 +%patch115 -p1 %build # Disable SILENT run of make so that make runs verbose as usual: ++++++ cups-1.5.4-strftime.patch ++++++ diff -Nur cups-1.5.4.dist/cgi-bin/ipp-var.c cups-1.5.4/cgi-bin/ipp-var.c --- cups-1.5.4.dist/cgi-bin/ipp-var.c 2011-05-20 05:49:49.000000000 +0200 +++ cups-1.5.4/cgi-bin/ipp-var.c 2014-03-09 13:21:20.065678625 +0100 @@ -1192,7 +1192,7 @@ t = (time_t)attr->values[i].integer; date = localtime(&t); - strftime(valptr, sizeof(value) - (valptr - value), "%c", date); + _cupsstrftime(valptr, sizeof(value) - (valptr - value), "%c", date); } else snprintf(valptr, sizeof(value) - (valptr - value), diff -Nur cups-1.5.4.dist/cups/language-private.h cups-1.5.4/cups/language-private.h --- cups-1.5.4.dist/cups/language-private.h 2010-11-20 02:03:46.000000000 +0100 +++ cups-1.5.4/cups/language-private.h 2014-03-09 13:21:20.073680045 +0100 @@ -79,6 +79,7 @@ extern const char *_cupsMessageLookup(cups_array_t *a, const char *m); extern void _cupsSetLocale(char *argv[]); +extern size_t _cupsstrftime(char *s, size_t max, const char *format, const struct tm *tm); # ifdef __cplusplus } diff -Nur cups-1.5.4.dist/cups/libcups2.def cups-1.5.4/cups/libcups2.def --- cups-1.5.4.dist/cups/libcups2.def 2011-09-09 23:55:11.000000000 +0200 +++ cups-1.5.4/cups/libcups2.def 2014-03-09 13:21:20.077680723 +0100 @@ -9,6 +9,7 @@ _cupsLangPrintf _cupsLangPuts _cupsLangString +_cupsstrftime _cupsMD5Append _cupsMD5Finish _cupsMD5Init diff -Nur cups-1.5.4.dist/cups/libcups_s.exp cups-1.5.4/cups/libcups_s.exp --- cups-1.5.4.dist/cups/libcups_s.exp 2011-04-16 01:38:13.000000000 +0200 +++ cups-1.5.4/cups/libcups_s.exp 2014-03-09 13:21:20.085681923 +0100 @@ -7,6 +7,7 @@ _cupsLangPrintf _cupsLangPuts _cupsLangString +_cupsstrftime _cupsMD5Append _cupsMD5Finish _cupsMD5Init diff -Nur cups-1.5.4.dist/cups/Makefile cups-1.5.4/cups/Makefile --- cups-1.5.4.dist/cups/Makefile 2011-09-09 18:34:29.000000000 +0200 +++ cups-1.5.4/cups/Makefile 2014-03-09 13:21:20.089682442 +0100 @@ -63,6 +63,7 @@ snmp.o \ snprintf.o \ string.o \ + strftime.o \ tempfile.o \ thread.o \ transcode.o \ diff -Nur cups-1.5.4.dist/cups/strftime.c cups-1.5.4/cups/strftime.c --- cups-1.5.4.dist/cups/strftime.c 1970-01-01 01:00:00.000000000 +0100 +++ cups-1.5.4/cups/strftime.c 2014-03-09 13:21:20.093682921 +0100 @@ -0,0 +1,56 @@ +/* + * "$Id$" + * + * Localized strftime function for CUPS. + * + * + * Contents: + * + * _cupsstrftime() - format date and time + */ + +/* + * Include necessary headers... + */ + +#include "cups-private.h" + + +/* + * '_cupsstrftime()' - format date and time in current locale and convert to UTF8 + */ + +size_t +_cupsstrftime(char *s, size_t max, const char *format, const struct tm *tm) +{ + size_t size=0; + char date[256]; /* Date buffer */ + cups_utf8_t utf8[256]; /* Date in utf8 */ + _cups_globals_t *cg; /* Global data */ + + cg = _cupsGlobals(); + + if (!cg->lang_default) + cg->lang_default = cupsLangDefault(); + + if ((size=strftime(date, max, format, tm))!=0) + { + + if (cg->lang_default->encoding != CUPS_UTF8) + { + cupsCharsetToUTF8(utf8, date, (int)sizeof(utf8), cg->lang_default->encoding); + strncpy(s, utf8, 256); + } + else { + strncpy(s, date, 256); + } + } + return ((size_t)size); +} + + + + +/* + * End of "$Id$". + */ diff -Nur cups-1.5.4.dist/cups/testipp.c cups-1.5.4/cups/testipp.c --- cups-1.5.4.dist/cups/testipp.c 2011-09-14 02:31:10.000000000 +0200 +++ cups-1.5.4/cups/testipp.c 2014-03-09 13:21:20.101683760 +0100 @@ -891,7 +891,7 @@ { vtime = ippDateToTime(val->date); vdate = localtime(&vtime); - strftime(vstring, sizeof(vstring), "%c", vdate); + _cupsstrftime(vstring, sizeof(vstring), "%c", vdate); printf(" (%s)", vstring); } } diff -Nur cups-1.5.4.dist/filter/bannertops.c cups-1.5.4/filter/bannertops.c --- cups-1.5.4.dist/filter/bannertops.c 2011-05-20 05:49:49.000000000 +0200 +++ cups-1.5.4/filter/bannertops.c 2014-03-09 13:21:20.105684120 +0100 @@ -843,7 +843,7 @@ curtime = (time_t)atoi(option); curdate = localtime(&curtime); - strftime(text, sizeof(text), "%c", curdate); + _cupsstrftime(text, sizeof(text), "%c", curdate); } else strlcpy(text, "?", sizeof(text)); @@ -865,7 +865,7 @@ curtime = (time_t)atoi(option); curdate = localtime(&curtime); - strftime(text, sizeof(text), "%c", curdate); + _cupsstrftime(text, sizeof(text), "%c", curdate); } else strlcpy(text, "?", sizeof(text)); @@ -1066,7 +1066,7 @@ curtime = time(NULL); curtm = localtime(&curtime); - strftime(curdate, sizeof(curdate), "%c", curtm); + _cupsstrftime(curdate, sizeof(curdate), "%c", curtm); puts("%!PS-Adobe-3.0"); printf("%%%%BoundingBox: %.0f %.0f %.0f %.0f\n", PageLeft, PageBottom, diff -Nur cups-1.5.4.dist/filter/imagetops.c cups-1.5.4/filter/imagetops.c --- cups-1.5.4.dist/filter/imagetops.c 2011-08-17 23:01:53.000000000 +0200 +++ cups-1.5.4/filter/imagetops.c 2014-03-09 13:21:20.113684721 +0100 @@ -618,7 +618,7 @@ puts("%%DocumentData: Clean7Bit"); puts("%%DocumentNeededResources: font Helvetica-Bold"); puts("%%Creator: imagetops/" CUPS_SVERSION); - strftime(curdate, sizeof(curdate), "%c", curtm); + _cupsstrftime(curdate, sizeof(curdate), "%c", curtm); printf("%%%%CreationDate: %s\n", curdate); WriteTextComment("Title", argv[3]); WriteTextComment("For", argv[2]); diff -Nur cups-1.5.4.dist/filter/texttops.c cups-1.5.4/filter/texttops.c --- cups-1.5.4.dist/filter/texttops.c 2010-12-03 07:29:20.000000000 +0100 +++ cups-1.5.4/filter/texttops.c 2014-03-09 13:21:20.117684961 +0100 @@ -223,7 +223,7 @@ curtime = time(NULL); curtm = localtime(&curtime); - strftime(curdate, sizeof(curdate), "%c", curtm); + _cupsstrftime(curdate, sizeof(curdate), "%c", curtm); puts("%!PS-Adobe-3.0"); printf("%%%%BoundingBox: 0 0 %.0f %.0f\n", PageWidth, PageLength); diff -Nur cups-1.5.4.dist/scheduler/testsub.c cups-1.5.4/scheduler/testsub.c --- cups-1.5.4.dist/scheduler/testsub.c 2010-03-24 01:45:34.000000000 +0100 +++ cups-1.5.4/scheduler/testsub.c 2014-03-09 13:21:20.125685362 +0100 @@ -442,7 +442,7 @@ { vtime = ippDateToTime(val->date); vdate = localtime(&vtime); - strftime(vstring, sizeof(vstring), "%c", vdate); + _cupsstrftime(vstring, sizeof(vstring), "%c", vdate); printf(" (%s)", vstring); } } diff -Nur cups-1.5.4.dist/systemv/lpstat.c cups-1.5.4/systemv/lpstat.c --- cups-1.5.4.dist/systemv/lpstat.c 2011-10-07 23:41:07.000000000 +0200 +++ cups-1.5.4/systemv/lpstat.c 2014-03-09 13:21:20.133685662 +0100 @@ -744,7 +744,7 @@ if (match_list(printers, printer)) { pdate = localtime(&ptime); - strftime(printer_state_time, sizeof(printer_state_time), "%c", pdate); + _cupsstrftime(printer_state_time, sizeof(printer_state_time), "%c", pdate); if (accepting) _cupsLangPrintf(stdout, _("%s accepting requests since %s"), @@ -1436,7 +1436,7 @@ * Show the consolidated output format for the SGI tools... */ - if (!strftime(date, sizeof(date), "%b %d %H:%M", jobdate)) + if (!_cupsstrftime(date, sizeof(date), "%b %d %H:%M", jobdate)) strcpy(date, "Unknown"); _cupsLangPrintf(stdout, "%s;%s;%d;%s;%s", @@ -1445,7 +1445,7 @@ } else { - if (!strftime(date, sizeof(date), "%c", jobdate)) + if (!_cupsstrftime(date, sizeof(date), "%c", jobdate)) strcpy(date, "Unknown"); if (ranking) @@ -1764,7 +1764,7 @@ */ pdate = localtime(&ptime); - strftime(printer_state_time, sizeof(printer_state_time), "%c", pdate); + _cupsstrftime(printer_state_time, sizeof(printer_state_time), "%c", pdate); switch (pstate) { --- cups-1.5.4.dist/test/run-stp-tests.sh 2014-03-12 08:35:30.805162912 +0100 +++ cups-1.5.4/test/run-stp-tests.sh 2014-03-12 09:45:53.668548631 +0100 @@ -411,6 +411,19 @@ i=`expr $i + 1` done +cat >>/tmp/cups-$user/printers.conf <<EOF +<Printer test5.4> +Accepting Yes +DeviceURI file:/dev/null +Info Test raw printer $i +JobSheets none none +Location CUPS test suite +State Idle +StateTime 1394607600 +StateMessage Printer $1 is idle. +</Printer> +EOF + if test -f /tmp/cups-$user/printers.conf; then cp /tmp/cups-$user/printers.conf /tmp/cups-$user/printers.conf.orig else --- cups-1.5.4.dist/test/5.4-lpstat.sh 2014-03-12 08:26:22.738824487 +0100 +++ cups-1.5.4/test/5.4-lpstat.sh 2014-03-12 09:44:43.838713821 +0100 @@ -38,6 +38,30 @@ fi echo "" +echo "LPSTAT Test" +echo "" +echo " lpstat -p" +state="`../systemv/lpstat -p test5.4 | head -1 2>&1`" +if test $? != 0 -o "x$state" != "xprinter test5.4 is idle. enabled since Wed Mar 12 08:00:00 2014"; then + echo " FAILED" + exit 1 +else + echo " PASSED" +fi +echo "" + +echo "LPSTAT Test2" +echo "" +echo " LC_ALL=de_DE@euro lpstat -p" +state="`LC_ALL=de_DE@euro ../systemv/lpstat -p test5.4 | head -1 2>&1`" +if test $? != 0 -o "x$state" != "xprinter test5.4 is idle. enabled since Mi 12 M�r 2014 08:00:00 CET"; then + echo " FAILED" + exit 1 +else + echo " PASSED" +fi +echo "" + # # End of "$Id: 5.4-lpstat.sh 8498 2009-04-13 17:03:15Z mike $". # -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit hyper-v for openSUSE:Factory
by root＠hilbert.suse.de 14 Apr '14

14 Apr '14

Hello community, here is the log from the commit of package hyper-v for openSUSE:Factory checked in at 2014-04-14 06:43:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hyper-v (Old) and /work/SRC/openSUSE:Factory/.hyper-v.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "hyper-v" Changes: -------- --- /work/SRC/openSUSE:Factory/hyper-v/hyper-v.changes 2014-03-18 13:46:32.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.hyper-v.new/hyper-v.changes 2014-04-14 06:43:21.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Apr 10 19:19:04 CEST 2014 - ohering(a)suse.de + +- Handle the case when the target file exists correctly in hv_fcopy_daemon +- vssdaemon: Ignore VFAT mounts during the Freeze operation + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hyper-v.include.linux.hyperv.h ++++++ --- /var/tmp/diff_new_pack.TVBSV9/_old 2014-04-14 06:43:22.000000000 +0200 +++ /var/tmp/diff_new_pack.TVBSV9/_new 2014-04-14 06:43:22.000000000 +0200 @@ -300,6 +300,7 @@ #define HV_ERROR_DEVICE_NOT_CONNECTED 0x8007048F #define HV_INVALIDARG 0x80070057 #define HV_GUID_NOTFOUND 0x80041002 +#define HV_ERROR_ALREADY_EXISTS 0x80070050 #define ADDR_FAMILY_NONE 0x00 #define ADDR_FAMILY_IPV4 0x01 ++++++ hyper-v.tools.hv.hv_fcopy_daemon.c ++++++ --- /var/tmp/diff_new_pack.TVBSV9/_old 2014-04-14 06:43:22.000000000 +0200 +++ /var/tmp/diff_new_pack.TVBSV9/_new 2014-04-14 06:43:22.000000000 +0200 @@ -82,8 +82,10 @@ if (!access(target_fname, F_OK)) { syslog(LOG_INFO, "File: %s exists", target_fname); - if (!smsg->copy_flags & OVER_WRITE) + if (!(smsg->copy_flags & OVER_WRITE)) { + error = HV_ERROR_ALREADY_EXISTS; goto done; + } } target_fd = open(target_fname, O_RDWR | O_CREAT | O_CLOEXEC, 0744); ++++++ hyper-v.tools.hv.hv_vss_daemon.c ++++++ --- /var/tmp/diff_new_pack.TVBSV9/_old 2014-04-14 06:43:22.000000000 +0200 +++ /var/tmp/diff_new_pack.TVBSV9/_new 2014-04-14 06:43:22.000000000 +0200 @@ -88,6 +88,8 @@ continue; if (strcmp(ent->mnt_type, "iso9660") == 0) continue; + if (strcmp(ent->mnt_type, "vfat") == 0) + continue; if (strcmp(ent->mnt_dir, "/") == 0) { root_seen = 1; continue; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0