March 2013 - openSUSE Commits - openSUSE Mailing Lists

commit vobject for openSUSE:Factory
by root＠hilbert.suse.de 25 Mar '13

25 Mar '13

Hello community, here is the log from the commit of package vobject for openSUSE:Factory checked in at 2013-03-25 20:45:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vobject (Old) and /work/SRC/openSUSE:Factory/.vobject.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "vobject", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/vobject/vobject.changes 2011-09-23 12:50:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.vobject.new/vobject.changes 2013-03-25 20:45:49.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Mar 1 12:32:47 UTC 2013 - dimstar(a)opensuse.org + +- Spec-cleanup using format_spec_file service. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vobject.spec ++++++ --- /var/tmp/diff_new_pack.9AJxbw/_old 2013-03-25 20:45:58.000000000 +0100 +++ /var/tmp/diff_new_pack.9AJxbw/_new 2013-03-25 20:45:58.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package vobject (Version 0.8.1c) +# spec file for package vobject # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,18 +15,16 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: vobject BuildRequires: python-setuptools Version: 0.8.1c -Release: 1 -License: Apache-2.0 +Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Group: Development/Languages/Python Source0: %{name}-%{version}.tar.bz2 Summary: A python library to create and parse iCalendar and vCard objects +License: Apache-2.0 +Group: Development/Languages/Python Requires: python-dateutil %description -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit squid for openSUSE:Factory
by root＠hilbert.suse.de 25 Mar '13

25 Mar '13

Hello community, here is the log from the commit of package squid for openSUSE:Factory checked in at 2013-03-25 20:45:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/squid (Old) and /work/SRC/openSUSE:Factory/.squid.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "squid", Maintainer is "draht(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/squid/squid.changes 2013-02-22 17:02:46.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.squid.new/squid.changes 2013-03-25 20:45:39.000000000 +0100 @@ -1,0 +2,48 @@ +Sun Mar 24 18:57:26 UTC 2013 - bruno(a)ioda-net.ch + +- Fixed squid.service +- Removed commented patch lines + +------------------------------------------------------------------- +Fri Mar 15 10:31:02 UTC 2013 - bruno(a)ioda-net.ch + +- New revision for squid.service (using only sed) + handle multiple cache_dir line + Added sed as require + +Thu Mar 14 13:08:54 UTC 2013 - bruno(a)ioda-net.ch + +- Packaging : fixed systemd squid.service + - Rework on squid.service ExecStartPre line + remove dependency on unfunctionnal wrapper + - Fix bnc#802635 (creating cache struture fail on first call) + - Fixed Type=forking and remove the use off -N (non daemon flag) + - Fixed missing pid file + - Structural : add all -k to end of Exec/Stop line + - Ulimit : Added LimitNOFile=4096 ( same value as in /etc/sysconfig) + but there's no way to decode dynamically /etc/sysconfig + - Remove syslog.target ( no need anymore : advise from fcrozat ) + - Clean up squid_cache_build.sh +- Changes to squid-3.2.9 (12 Mar 2013): + - Regression fix: Accept-Language header parse + - Bug 3673: Silence 'Failed to select source' messages + - Fix authentication headers sent on peer digest requests + - Fix build error on Solaris, OpenIndiana, Omnios + +- Changes to squid-3.2.8 (02 Mar 2013): + + - Bug 3767: tcp_outgoing_tos/mark ACLs do not obey acl_uses_indirect_client + - Bug 3763: diskd Error: no filename in shm buffer + - Bug 3752: objects that cannot be cached in memory are not cached on disk + - Bug 3753: Removes the domain from the cache_peer server pconn key + - Bug 3749: IDENT lookup using wrong ports to identify the user + - Bug 3723: tcp_outgoing_tos/mark broken for CONNECT requests + - Bug 3686: cache_dir max-size default fails + - Bug 3515: crash in FtpStateData::ftpTimeout + - Bug 3329: Quieten orphan Comm::Connection messages + - Make squid -z for cache_dir rock preserve the rock DB + - Fixed several server connect problems + - ... and some build issues on Solaris, OpenIndiana, MacOS X + - ... and some documentation and debugs polishing + +------------------------------------------------------------------- Old: ---- squid-3.2.7.tar.bz2 squid-3.2.7.tar.bz2.asc squid_cache_swap.sh New: ---- squid-3.2.9.tar.bz2 squid-3.2.9.tar.bz2.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ squid.spec ++++++ --- /var/tmp/diff_new_pack.tA20UX/_old 2013-03-25 20:45:41.000000000 +0100 +++ /var/tmp/diff_new_pack.tA20UX/_new 2013-03-25 20:45:41.000000000 +0100 @@ -23,7 +23,7 @@ Summary: Squid Version 3.2 WWW Proxy Server License: GPL-2.0+ Group: Productivity/Networking/Web/Proxy -Version: 3.2.7 +Version: 3.2.9 Release: 0 Url: http://www.squid-cache.org/Versions/v3/3.2 Source0: http://www.squid-cache.org/Versions/v3/3.2/%{name}-%{version}.tar.bz2 @@ -37,7 +37,6 @@ Source9: %{name}.permissions Source10: README.kerberos Source11: %{name}.service -Source12: squid_cache_swap.sh Source13: %{name}.keyring # # the following patches are downloaded directly from the webserver @@ -46,12 +45,7 @@ # please read every file if there is interest about what the patch changes # or just visit: http://www.squid-cache.org/Versions/v3/3.0/changesets/ # -# [request|reply]_header_* manglers fixes to handle custom headers -#Patch0: http://www.squid-cache.org/Versions/v3/3.2/changesets/squid-3.2-11611.patch -# cache.log analysis: Add a pattern to report alive (opened and not closed) FDs. -#Patch1: http://www.squid-cache.org/Versions/v3/3.2/changesets/squid-3.2-11612.patch # -## # do not show some rpmlint warnings Source99: rpmlintrc # some useful defaults for squid @@ -107,6 +101,7 @@ %endif Requires: logrotate +Requires: sed Provides: http_proxy # due to package rename @@ -135,8 +130,8 @@ * Cache Manager access changes First STABLE release Date: 02 Aug 2010 - Latest Release: 3.2.7 - Latest Release Date: 01 Feb 2013 + Latest Release: 3.2.9 + Latest Release Date: 12 Mar 2013 %prep %gpg_verify %{S:1} @@ -257,7 +252,6 @@ %if 0%{?has_systemd} install -D -m 644 %{SOURCE11} %{buildroot}%{_unitdir}/%{name}.service -install -D -m 755 %{SOURCE12} %{buildroot}%{_sbindir}/squid_cache_swap.sh %endif %pre @@ -332,7 +326,6 @@ %doc %{_mandir}/man?/* %if 0%{?has_systemd} %{_unitdir}/%{name}.service -%{_sbindir}/squid_cache_swap.sh %endif %attr(750,%{name},root) %dir %{_localstatedir}/cache/%{name}/ %attr(750,%{name},root) %dir %{_localstatedir}/log/%{name}/ ++++++ squid-3.2.7.tar.bz2 -> squid-3.2.9.tar.bz2 ++++++ ++++ 2141 lines of diff (skipped) ++++++ squid-3.2.7.tar.bz2.asc -> squid-3.2.9.tar.bz2.asc ++++++ --- /work/SRC/openSUSE:Factory/squid/squid-3.2.7.tar.bz2.asc 2013-02-22 17:02:46.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.squid.new/squid-3.2.9.tar.bz2.asc 2013-03-25 20:45:39.000000000 +0100 @@ -1,8 +1,8 @@ -File: squid-3.2.7.tar.bz2 -Date: Fri Feb 1 11:24:08 UTC 2013 -Size: 2893325 -MD5 : 3e4d21b24c39d5066791017919866a64 -SHA1: 3e22bd64258a4232c51d7bfd0344a6c54522cab5 +File: squid-3.2.9.tar.bz2 +Date: Tue Mar 12 10:47:39 UTC 2013 +Size: 2897511 +MD5 : de02be3c1f72e0d818374438044261a6 +SHA1: a2cec791e333a492a1d243c2e6228cb93a9de39d Key : 0xFF5CF463 <squid3(a)treenet.co.nz> fingerprint = EA31 CC5E 9488 E516 8D2D CC5E B268 E706 FF5C F463 keyring = http://www.squid-cache.org/pgp.asc @@ -10,11 +10,11 @@ -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) -iQEcBAABAgAGBQJRC6h9AAoJELJo5wb/XPRjuWsH/iX7FNcwSuMihU1Lf4tMjpzF -XnvpVsfidTTdYXW8YBT6+sSD3ocBfCv+/fnUlYzUCovTxapZmratuLRCcSed9/UM -7yZIpI05R+WDMBDQMv807JF/MKIIo83aRGcfkY+8n5k0mLIFdyx2KWZLg2q7Ngou -/5n9vxqr2afak3DODKBHG28BG3McdjJ+oiFaYb7jHuiLkBafRdvhoGm4yVJCP2gY -Znf0VXqGD0DdlTFWh3uUX8hDSZbTdiyTTl93KJdrnujUbx6zhTNMRZcaSclK8pIO -veqb4jFMawNgZDn2mXXea5lStYB2h5u4KcnZRIOW0DpCd0Ylud6EbAQMSbRdhF4= -=j8x/ +iQEcBAABAgAGBQJRP76eAAoJELJo5wb/XPRjVeMH+wYmoYLcIwLMjnhCoQRLDEjP +YAbgpaspWisUNKwUsAeb4c58wIA/OXYalD+4B6evNKMz5EhLNAPCP+VdQj8FERU8 +7ibeOgXmNPizuDpwMVJAeAIcVVp8+QjswBGBoMDXgr/5wmJrF2238N3VuqwYwZ5R +vFcpIDK/2yUh09os6ncR3j7BTe9A7qUU4AVcYiBL670U/ASHhGhh8rihRVlbhCJY +BrwBb+nGQUwnjwCptzC4dONv/hZYJ55WZ/j29xQS5OfDeJM91l4VGdoGOCwMgjLi +ygx4dbMfKv86e+WxfHmuyXajgMe+IwarUmlDQxHQpaVS+kksM6avj3YbieIo8/0= +=jsS7 -----END PGP SIGNATURE----- ++++++ squid.service ++++++ --- /var/tmp/diff_new_pack.tA20UX/_old 2013-03-25 20:45:43.000000000 +0100 +++ /var/tmp/diff_new_pack.tA20UX/_new 2013-03-25 20:45:43.000000000 +0100 @@ -1,13 +1,17 @@ [Unit] Description=Squid caching proxy -After=syslog.target network.target named.service +After=network.target named.service nss-lookup.service [Service] -EnvironmentFile=/etc/sysconfig/squid -ExecStartPre=/usr/sbin/squid_cache_swap.sh -ExecStart=/usr/sbin/squid -F -N $SQUID_START_OPTIONS -f /etc/squid/squid.conf -ExecReload=/usr/sbin/squid -F -N $SQUID_START_OPTIONS -k reconfigure -f /etc/squid/squid.conf -ExecStop=/usr/sbin/squid -F -N -k shutdown -f /etc/squid/squid.conf +Type=forking +EnvironmentFile=-/etc/sysconfig/squid +ExecStartPre=/bin/sh -c "test -d \"`sed -n 's/^cache_dir\s\+[[:alnum:]]\+\s\+$[[:graph:]\/]\+$\s.*/\1/p' /etc/squid/squid.conf | sed '1 q'`/00\" || /usr/sbin/squid -z -F -N -S -f /etc/squid/squid.conf" +ExecStart=/usr/sbin/squid -F $SQUID_START_OPTIONS -f /etc/squid/squid.conf +ExecReload=/usr/sbin/squid -F $SQUID_START_OPTIONS -f /etc/squid/squid.conf -k reconfigure +ExecStop=/usr/sbin/squid -F -f /etc/squid/squid.conf -k shutdown +LimitNOFILE=4096 +PIDFile=/var/run/squid.pid [Install] WantedBy=multi-user.target + -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit simple-scan for openSUSE:Factory
by root＠hilbert.suse.de 25 Mar '13

25 Mar '13

Hello community, here is the log from the commit of package simple-scan for openSUSE:Factory checked in at 2013-03-25 20:45:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/simple-scan (Old) and /work/SRC/openSUSE:Factory/.simple-scan.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "simple-scan", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/simple-scan/simple-scan.changes 2013-01-08 09:13:25.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.simple-scan.new/simple-scan.changes 2013-03-25 20:45:28.000000000 +0100 @@ -1,0 +2,8 @@ +Sun Mar 24 20:51:46 UTC 2013 - zaitor(a)opensuse.org + +- Update to version 3.6.1: + + Fix scan no longer working after an ADF scan completes + (lp#1097096). + + Fix erroneous warning about failing to set ADF source. + +------------------------------------------------------------------- Old: ---- simple-scan-3.6.0.tar.gz New: ---- simple-scan-3.6.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ simple-scan.spec ++++++ --- /var/tmp/diff_new_pack.X6TRHF/_old 2013-03-25 20:45:29.000000000 +0100 +++ /var/tmp/diff_new_pack.X6TRHF/_new 2013-03-25 20:45:29.000000000 +0100 @@ -17,14 +17,14 @@ Name: simple-scan -Version: 3.6.0 +Version: 3.6.1 Release: 0 # FIXME: the %%{_datadir}/help/$locale/ files be found by %%find_lang Summary: Simple Scanning Utility License: GPL-3.0+ Group: System/GUI/GNOME Url: https://launchpad.net/simple-scan -Source0: https://launchpad.net/simple-scan/3.6/3.6.0/+download/%{name}-%{version}.ta… +Source0: https://launchpad.net/simple-scan/3.6/3.6.1/+download/%{name}-%{version}.ta… BuildRequires: fdupes BuildRequires: gnome-icon-theme BuildRequires: intltool ++++++ simple-scan-3.6.0.tar.gz -> simple-scan-3.6.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/simple-scan-3.6.0/NEWS new/simple-scan-3.6.1/NEWS --- old/simple-scan-3.6.0/NEWS 2012-09-25 05:11:37.000000000 +0200 +++ new/simple-scan-3.6.1/NEWS 2013-03-21 21:16:08.000000000 +0100 @@ -1,3 +1,8 @@ +Overview of changes in simple-scan 3.6.1 + + * Fix scan no longer working after an ADF scan completes + * Fix erroneous warning about failing to set ADF source + Overview of changes in simple-scan 3.6.0 * No change version bump diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/simple-scan-3.6.0/configure new/simple-scan-3.6.1/configure --- old/simple-scan-3.6.0/configure 2012-09-25 05:11:50.000000000 +0200 +++ new/simple-scan-3.6.1/configure 2013-03-21 21:16:32.000000000 +0100 @@ -2753,7 +2753,7 @@ # Define the identity of the package. PACKAGE=simple-scan - VERSION=3.6.0 + VERSION=3.6.1 cat >>confdefs.h <<_ACEOF diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/simple-scan-3.6.0/configure.ac new/simple-scan-3.6.1/configure.ac --- old/simple-scan-3.6.0/configure.ac 2012-09-25 05:11:42.000000000 +0200 +++ new/simple-scan-3.6.1/configure.ac 2013-03-21 21:16:18.000000000 +0100 @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(configure.ac) -AM_INIT_AUTOMAKE(simple-scan, 3.6.0) +AM_INIT_AUTOMAKE(simple-scan, 3.6.1) AM_CONFIG_HEADER(config.h) AM_MAINTAINER_MODE GNOME_MAINTAINER_MODE_DEFINES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/simple-scan-3.6.0/src/book-view.c new/simple-scan-3.6.1/src/book-view.c --- old/simple-scan-3.6.0/src/book-view.c 2012-09-25 05:11:56.000000000 +0200 +++ new/simple-scan-3.6.1/src/book-view.c 2013-03-21 21:16:41.000000000 +0100 @@ -1,4 +1,4 @@ -/* book-view.c generated by valac 0.17.7, the Vala compiler +/* book-view.c generated by valac 0.18.1, the Vala compiler * generated from book-view.vala, do not modify */ /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/simple-scan-3.6.0/src/book.c new/simple-scan-3.6.1/src/book.c --- old/simple-scan-3.6.0/src/book.c 2012-09-25 05:11:55.000000000 +0200 +++ new/simple-scan-3.6.1/src/book.c 2013-03-21 21:16:41.000000000 +0100 @@ -1,4 +1,4 @@ -/* book.c generated by valac 0.17.7, the Vala compiler +/* book.c generated by valac 0.18.1, the Vala compiler * generated from book.vala, do not modify */ /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/simple-scan-3.6.0/src/page-view.c new/simple-scan-3.6.1/src/page-view.c --- old/simple-scan-3.6.0/src/page-view.c 2012-09-25 05:11:56.000000000 +0200 +++ new/simple-scan-3.6.1/src/page-view.c 2013-03-21 21:16:41.000000000 +0100 @@ -1,4 +1,4 @@ -/* page-view.c generated by valac 0.17.7, the Vala compiler +/* page-view.c generated by valac 0.18.1, the Vala compiler * generated from page-view.vala, do not modify */ /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/simple-scan-3.6.0/src/page.c new/simple-scan-3.6.1/src/page.c --- old/simple-scan-3.6.0/src/page.c 2012-09-25 05:11:56.000000000 +0200 +++ new/simple-scan-3.6.1/src/page.c 2013-03-21 21:16:41.000000000 +0100 @@ -1,4 +1,4 @@ -/* page.c generated by valac 0.17.7, the Vala compiler +/* page.c generated by valac 0.18.1, the Vala compiler * generated from page.vala, do not modify */ /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/simple-scan-3.6.0/src/scanner.c new/simple-scan-3.6.1/src/scanner.c --- old/simple-scan-3.6.0/src/scanner.c 2012-09-25 05:11:56.000000000 +0200 +++ new/simple-scan-3.6.1/src/scanner.c 2013-03-21 21:16:41.000000000 +0100 @@ -1,4 +1,4 @@ -/* scanner.c generated by valac 0.17.7, the Vala compiler +/* scanner.c generated by valac 0.18.1, the Vala compiler * generated from scanner.vala, do not modify */ /* @@ -914,6 +914,9 @@ static void _g_list_free__scan_job_unref0_ (GList* self); static Scanner* scanner_new (void); static Scanner* scanner_construct (GType object_type); +static void _request_unref0_ (gpointer var); +static void _notify_unref0_ (gpointer var); +static void _credentials_unref0_ (gpointer var); Scanner* scanner_get_instance (void); static gboolean scanner_notify_idle_cb (Scanner* self); static void scanner_notify (Scanner* self, Notify* notification); @@ -3144,19 +3147,34 @@ } +static void _request_unref0_ (gpointer var) { + (var == NULL) ? NULL : (var = (request_unref (var), NULL)); +} + + +static void _notify_unref0_ (gpointer var) { + (var == NULL) ? NULL : (var = (notify_unref (var), NULL)); +} + + +static void _credentials_unref0_ (gpointer var) { + (var == NULL) ? NULL : (var = (credentials_unref (var), NULL)); +} + + static Scanner* scanner_construct (GType object_type) { Scanner* self = NULL; GAsyncQueue* _tmp0_; GAsyncQueue* _tmp1_; GAsyncQueue* _tmp2_; self = (Scanner*) g_type_create_instance (object_type); - _tmp0_ = g_async_queue_new (); + _tmp0_ = g_async_queue_new_full (_request_unref0_); _g_async_queue_unref0 (self->priv->request_queue); self->priv->request_queue = _tmp0_; - _tmp1_ = g_async_queue_new (); + _tmp1_ = g_async_queue_new_full (_notify_unref0_); _g_async_queue_unref0 (self->priv->notify_queue); self->priv->notify_queue = _tmp1_; - _tmp2_ = g_async_queue_new (); + _tmp2_ = g_async_queue_new_full (_credentials_unref0_); _g_async_queue_unref0 (self->priv->authorize_queue); self->priv->authorize_queue = _tmp2_; return self; @@ -6001,7 +6019,7 @@ _tmp64_ = adf_sources; _tmp64__length1 = adf_sources_length1; _tmp65_ = scanner_set_constrained_string_option (self, _tmp61_, _tmp62_, _tmp63_, _tmp64_, _tmp64__length1, NULL); - if (!(!_tmp65_)) { + if (!_tmp65_) { g_warning ("scanner.vala:894: Unable to set front ADF source, please file a bug"); } } @@ -6790,23 +6808,27 @@ static void scanner_do_complete_document (Scanner* self) { - GList* _tmp0_; + SANE_Handle _tmp0_; GList* _tmp1_; - NotifyDocumentDone* _tmp2_; + GList* _tmp2_; NotifyDocumentDone* _tmp3_; + NotifyDocumentDone* _tmp4_; g_return_if_fail (self != NULL); - _tmp0_ = self->priv->job_queue; - self->priv->job_queue = g_list_remove_link (self->priv->job_queue, _tmp0_); - self->priv->state = SCAN_STATE_IDLE; + _tmp0_ = self->priv->handle; + sane_cancel (_tmp0_); + g_debug ("scanner.vala:1117: sane_cancel ()"); _tmp1_ = self->priv->job_queue; - if (_tmp1_ != NULL) { + self->priv->job_queue = g_list_remove_link (self->priv->job_queue, _tmp1_); + self->priv->state = SCAN_STATE_IDLE; + _tmp2_ = self->priv->job_queue; + if (_tmp2_ != NULL) { self->priv->state = SCAN_STATE_OPEN; return; } - _tmp2_ = notify_document_done_new (); - _tmp3_ = _tmp2_; - scanner_notify (self, (Notify*) _tmp3_); - _notify_unref0 (_tmp3_); + _tmp3_ = notify_document_done_new (); + _tmp4_ = _tmp3_; + scanner_notify (self, (Notify*) _tmp4_); + _notify_unref0 (_tmp4_); scanner_set_scanning (self, FALSE); } @@ -6836,7 +6858,7 @@ _tmp6_ = status; _tmp7_ = sane_status_to_string (_tmp6_); _tmp8_ = _tmp7_; - g_debug ("scanner.vala:1141: sane_start (page=%d, pass=%d) -> %s", _tmp4_, _tmp5_, _tmp8_); + g_debug ("scanner.vala:1144: sane_start (page=%d, pass=%d) -> %s", _tmp4_, _tmp5_, _tmp8_); _g_free0 (_tmp8_); _tmp9_ = status; if (_tmp9_ == SANE_STATUS_GOOD) { @@ -6853,7 +6875,7 @@ const gchar* _tmp14_ = NULL; _tmp11_ = status; _tmp12_ = sane_strstatus (_tmp11_); - g_warning ("scanner.vala:1148: Unable to start device: %s", _tmp12_); + g_warning ("scanner.vala:1151: Unable to start device: %s", _tmp12_); _tmp13_ = status; _tmp14_ = _ ("Unable to start scan"); scanner_fail_scan (self, (gint) _tmp13_, _tmp14_); @@ -6989,7 +7011,7 @@ _tmp3_ = status; _tmp4_ = sane_status_to_string (_tmp3_); _tmp5_ = _tmp4_; - g_debug ("scanner.vala:1158: sane_get_parameters () -> %s", _tmp5_); + g_debug ("scanner.vala:1161: sane_get_parameters () -> %s", _tmp5_); _g_free0 (_tmp5_); _tmp6_ = status; if (_tmp6_ != SANE_STATUS_GOOD) { @@ -6999,7 +7021,7 @@ const gchar* _tmp10_ = NULL; _tmp7_ = status; _tmp8_ = sane_strstatus (_tmp7_); - g_warning ("scanner.vala:1161: Unable to get device parameters: %s", _tmp8_); + g_warning ("scanner.vala:1164: Unable to get device parameters: %s", _tmp8_); _tmp9_ = status; _tmp10_ = _ ("Error communicating with scanner"); scanner_fail_scan (self, (gint) _tmp9_, _tmp10_); @@ -7029,7 +7051,7 @@ _tmp27_ = _tmp26_.lines; _tmp28_ = self->priv->parameters; _tmp29_ = _tmp28_.depth; - g_debug ("scanner.vala:1170: Parameters: format=%s last_frame=%s bytes_per_line=" \ + g_debug ("scanner.vala:1173: Parameters: format=%s last_frame=%s bytes_per_line=" \ "%d pixels_per_line=%d lines=%d depth=%d", _tmp20_, _tmp21_, _tmp23_, _tmp25_, _tmp27_, _tmp29_); _g_free0 (_tmp20_); _tmp30_ = scan_page_info_new (); @@ -7156,7 +7178,6 @@ gboolean _tmp8_; ScanJob* _tmp10_; ScanType _tmp11_; - SANE_Handle _tmp17_; g_return_if_fail (self != NULL); _tmp0_ = self->priv->job_queue; _tmp1_ = _tmp0_->data; @@ -7199,9 +7220,6 @@ _scan_job_unref0 (job); return; } - _tmp17_ = self->priv->handle; - sane_cancel (_tmp17_); - g_debug ("scanner.vala:1230: sane_cancel ()"); scanner_do_complete_document (self); _scan_job_unref0 (job); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/simple-scan-3.6.0/src/scanner.vala new/simple-scan-3.6.1/src/scanner.vala --- old/simple-scan-3.6.0/src/scanner.vala 2012-08-16 04:09:20.000000000 +0200 +++ new/simple-scan-3.6.1/src/scanner.vala 2013-03-21 21:15:23.000000000 +0100 @@ -890,7 +890,7 @@ break; case ScanType.ADF_FRONT: if (!set_constrained_string_option (handle, option, index, adf_front_sources, null)) - if (!!set_constrained_string_option (handle, option, index, adf_sources, null)) + if (!set_constrained_string_option (handle, option, index, adf_sources, null)) warning ("Unable to set front ADF source, please file a bug"); break; case ScanType.ADF_BACK: @@ -1113,6 +1113,9 @@ private void do_complete_document () { + Sane.cancel (handle); + debug ("sane_cancel ()"); + job_queue.remove_link (job_queue); state = ScanState.IDLE; @@ -1226,9 +1229,6 @@ return; } - Sane.cancel (handle); - debug ("sane_cancel ()"); - do_complete_document (); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/simple-scan-3.6.0/src/simple-scan.c new/simple-scan-3.6.1/src/simple-scan.c --- old/simple-scan-3.6.0/src/simple-scan.c 2012-09-25 05:11:56.000000000 +0200 +++ new/simple-scan-3.6.1/src/simple-scan.c 2013-03-21 21:16:41.000000000 +0100 @@ -1,4 +1,4 @@ -/* simple-scan.c generated by valac 0.17.7, the Vala compiler +/* simple-scan.c generated by valac 0.18.1, the Vala compiler * generated from simple-scan.vala, do not modify */ /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/simple-scan-3.6.0/src/ui.c new/simple-scan-3.6.1/src/ui.c --- old/simple-scan-3.6.0/src/ui.c 2012-09-25 05:11:56.000000000 +0200 +++ new/simple-scan-3.6.1/src/ui.c 2013-03-21 21:16:41.000000000 +0100 @@ -1,4 +1,4 @@ -/* ui.c generated by valac 0.17.7, the Vala compiler +/* ui.c generated by valac 0.18.1, the Vala compiler * generated from ui.vala, do not modify */ /* @@ -3852,7 +3852,7 @@ GtkBox* _tmp107_; GtkBox* hbox; GtkInfoBar* _tmp108_; - GtkWidget* _tmp109_ = NULL; + GtkContainer* _tmp109_ = NULL; GtkContainer* _tmp110_; GtkContainer* content_area; GtkContainer* _tmp111_; @@ -3868,11 +3868,11 @@ GtkLabel* _tmp121_; GtkLabel* _tmp122_; GtkInfoBar* _tmp123_; - GtkWidget* _tmp124_ = NULL; + GtkButton* _tmp124_ = NULL; GtkButton* _tmp125_; GtkInfoBar* _tmp126_; const gchar* _tmp127_ = NULL; - GtkWidget* _tmp128_ = NULL; + GtkButton* _tmp128_ = NULL; GtkButton* _tmp129_; GtkTreeIter iter = {0}; GtkListStore* _tmp130_; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit remmina for openSUSE:Factory
by root＠hilbert.suse.de 25 Mar '13

25 Mar '13

Hello community, here is the log from the commit of package remmina for openSUSE:Factory checked in at 2013-03-25 20:42:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/remmina (Old) and /work/SRC/openSUSE:Factory/.remmina.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "remmina", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/remmina/remmina.changes 2012-08-24 13:52:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.remmina.new/remmina.changes 2013-03-25 20:42:11.000000000 +0100 @@ -1,0 +2,15 @@ +Sat Mar 23 23:04:36 UTC 2013 - gber(a)opensuse.org + +- enable TLS-support in VNC plugin (bnc#804320) +- add remmina-fix-scrolling-in-vnc-plugin.patch which fixes + scrolling in the VNC plugin (backport from upstream git) +- add remmina-close-ssh-tunnel-on-disconnect.patch in order to + close SSH tunnels on disconnect and avoid freezing (backport from + upstream git) +- remmina-fix-window-resize.patch which fixes resizing the window + (backport from upstream git) +- add remmina-fix-fullscreen-with-multiple-monitors.patch which + fixes fullscreen mode with multiple monitors (backport from + upstream git) + +------------------------------------------------------------------- New: ---- remmina-close-ssh-tunnel-on-disconnect.patch remmina-fix-fullscreen-with-multiple-monitors.patch remmina-fix-scrolling-in-vnc-plugin.patch remmina-fix-window-resize.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ remmina.spec ++++++ --- /var/tmp/diff_new_pack.8X4FDm/_old 2013-03-25 20:42:13.000000000 +0100 +++ /var/tmp/diff_new_pack.8X4FDm/_new 2013-03-25 20:42:13.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package remmina # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -37,6 +37,14 @@ Patch3: remmina-gtk-2-22-support.patch # PATCH-FIX-UPSTREAM remmina-remove-inline-libvncserver.patch gber(a)opensuse.org -- Remove inline copy of libvncserver (backport from upstream git) Patch4: remmina-remove-inline-libvncserver.patch +# PATCH-FIX-UPSTREAM remmina-fix-scrolling-in-vnc-plugin.patch gber(a)opensuse.org -- Fix scrolling in the VNC plugin (backport from upstream git) +Patch5: remmina-fix-scrolling-in-vnc-plugin.patch +# PATCH-FIX-UPSTREAM remmina-close-ssh-tunnel-on-disconnect.patch gber(a)opensuse.org -- Close SSH tunnel on disconnect and avoid freezing (backport from upstream git) +Patch6: remmina-close-ssh-tunnel-on-disconnect.patch +# PATCH-FIX-UPSTREAM remmina-fix-window-resize.patch gber(a)opensuse.org -- Fix resizing the window (backport from upstream git) +Patch7: remmina-fix-window-resize.patch +# PATCH-FIX-UPSTREAM remmina-fix-fullscreen-with-multiple-monitors.patch gber(a)opensuse.org -- Fix fullscreen mode with multiple monitors (backport from upstream git) +Patch8: remmina-fix-fullscreen-with-multiple-monitors.patch BuildRequires: cmake BuildRequires: ed BuildRequires: intltool @@ -150,12 +158,16 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 cp -r %{SOURCE1} README.SuSE %build mkdir build cd build -export CFLAGS="%{optflags}" +export CFLAGS="%{optflags} -DLIBVNCSERVER_WITH_CLIENT_TLS=1" cmake \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DCMAKE_INSTALL_LIBDIR=%{_lib} \ ++++++ remmina-close-ssh-tunnel-on-disconnect.patch ++++++ commit bed49ad62d78718c0876c000a97c68cc87f12c7c Author: Jean-Louis Dupond <jean-louis(a)dupond.be> Date: Sat Sep 1 20:56:09 2012 +0200 Closes #77: Close the SSH tunnel after the connection has been closed Index: FreeRDP-Remmina-356c033/remmina/src/remmina_protocol_widget.c =================================================================== --- FreeRDP-Remmina-356c033.orig/remmina/src/remmina_protocol_widget.c +++ FreeRDP-Remmina-356c033/remmina/src/remmina_protocol_widget.c @@ -267,13 +267,7 @@ gboolean remmina_protocol_widget_close_c gp->priv->chat_window = NULL; } -#ifdef HAVE_LIBSSH - if (gp->priv->ssh_tunnel) - { - remmina_ssh_tunnel_free(gp->priv->ssh_tunnel); - gp->priv->ssh_tunnel = NULL; - } -#endif + gboolean retval; if (!gp->priv->plugin || !gp->priv->plugin->close_connection) { @@ -281,7 +275,17 @@ gboolean remmina_protocol_widget_close_c return FALSE; } - return gp->priv->plugin->close_connection(gp); + retval = gp->priv->plugin->close_connection(gp); + + #ifdef HAVE_LIBSSH + if (gp->priv->ssh_tunnel) + { + remmina_ssh_tunnel_free(gp->priv->ssh_tunnel); + gp->priv->ssh_tunnel = NULL; + } + #endif + + return retval; } static gboolean remmina_protocol_widget_emit_signal_timeout(gpointer user_data) ++++++ remmina-fix-fullscreen-with-multiple-monitors.patch ++++++ commit 348e01d27869a577ad5df9bf6286f876b34a40c0 Author: Jean-Louis Dupond <jean-louis(a)dupond.be> Date: Mon Sep 10 20:08:00 2012 +0200 Fix fullscreen mode with multiple monitors diff --git a/remmina/src/remmina_connection_window.c b/remmina/src/remmina_connection_window.c index 761b2f4..7a5b214 100644 --- a/remmina/src/remmina_connection_window.c +++ b/remmina/src/remmina_connection_window.c @@ -496,13 +496,21 @@ static void remmina_connection_holder_check_resize(RemminaConnectionHolder* cnnh DECLARE_CNNOBJ gboolean scroll_required = FALSE; GdkScreen* screen; + gint monitor; + GdkRectangle screen_size; gint screen_width, screen_height; gint server_width, server_height; remmina_connection_holder_get_desktop_size(cnnhld, &server_width, &server_height, FALSE); - screen = gdk_screen_get_default(); - screen_width = gdk_screen_get_width(screen); - screen_height = gdk_screen_get_height(screen); + screen = gtk_window_get_screen(GTK_WINDOW(cnnhld->cnnwin)); + monitor = gdk_screen_get_monitor_at_window(screen, gtk_widget_get_window(GTK_WIDGET(cnnhld->cnnwin))); +#ifdef gdk_screen_get_monitor_workarea + gdk_screen_get_monitor_workarea(screen, monitor, &screen_size); +#else + gdk_screen_get_monitor_geometry(screen, monitor, &screen_size); +#endif + screen_width = screen_size.width; + screen_height = screen_size.height; if (!remmina_protocol_widget_get_expand(REMMINA_PROTOCOL_WIDGET(cnnobj->proto)) && (server_width <= 0 || server_height <= 0 || screen_width < server_width ++++++ remmina-fix-scrolling-in-vnc-plugin.patch ++++++ commit c422e9c0396e405ef5a3d2a6b24dbc83c20afe2f Author: Jean-Louis Dupond <jean-louis(a)dupond.be> Date: Wed Apr 25 11:57:39 2012 +0200 Also fix scrolling on VNC plugin Index: FreeRDP-Remmina-356c033/remmina-plugins/rdp/rdp_event.c =================================================================== --- FreeRDP-Remmina-356c033.orig/remmina-plugins/rdp/rdp_event.c +++ FreeRDP-Remmina-356c033/remmina-plugins/rdp/rdp_event.c @@ -468,7 +468,7 @@ void remmina_rdp_event_init(RemminaProto gtk_container_add(GTK_CONTAINER(gp), rfi->drawing_area); gtk_widget_add_events(rfi->drawing_area, GDK_POINTER_MOTION_MASK | GDK_BUTTON_PRESS_MASK - | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK); + | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_SCROLL_MASK); gtk_widget_set_can_focus(rfi->drawing_area, TRUE); remmina_plugin_service->protocol_plugin_register_hostkey(gp, rfi->drawing_area); Index: FreeRDP-Remmina-356c033/remmina-plugins/vnc/vnc_plugin.c =================================================================== --- FreeRDP-Remmina-356c033.orig/remmina-plugins/vnc/vnc_plugin.c +++ FreeRDP-Remmina-356c033/remmina-plugins/vnc/vnc_plugin.c @@ -1847,7 +1847,7 @@ static void remmina_plugin_vnc_init(Remm gtk_widget_add_events( gpdata->drawing_area, GDK_POINTER_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK - | GDK_KEY_RELEASE_MASK); + | GDK_KEY_RELEASE_MASK | GDK_SCROLL_MASK); gtk_widget_set_can_focus(gpdata->drawing_area, TRUE); #if GTK_VERSION == 3 ++++++ remmina-fix-window-resize.patch ++++++ commit 1901a1e9e5282c1deca2f5f98476e2c7e9243d35 Author: Jean-Louis Dupond <jean-louis(a)dupond.be> Date: Mon Sep 10 14:12:11 2012 +0200 Closes #63: fix typo when fitting window diff --git a/remmina/src/remmina_connection_window.c b/remmina/src/remmina_connection_window.c index 7ff1246..2ba8193 100644 --- a/remmina/src/remmina_connection_window.c +++ b/remmina/src/remmina_connection_window.c @@ -436,7 +436,7 @@ static gboolean remmina_connection_holder_toolbar_autofit_restore(RemminaConnect remmina_connection_holder_get_desktop_size(cnnhld, &width, &height, TRUE); gtk_widget_get_allocation(priv->notebook, &na); gtk_widget_get_allocation(cnnobj->scrolled_container, &ca); - gtk_widget_get_allocation(priv->toolbar, &ca); + gtk_widget_get_allocation(priv->toolbar, &ta); gtk_window_resize(GTK_WINDOW(cnnhld->cnnwin), MAX(1, width + na.width - ca.width), MAX(1, height + ta.height + na.height - ca.height)); gtk_container_check_resize(GTK_CONTAINER(cnnhld->cnnwin)); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rednotebook for openSUSE:Factory
by root＠hilbert.suse.de 25 Mar '13

25 Mar '13

Hello community, here is the log from the commit of package rednotebook for openSUSE:Factory checked in at 2013-03-25 20:41:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rednotebook (Old) and /work/SRC/openSUSE:Factory/.rednotebook.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rednotebook", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/rednotebook/rednotebook.changes 2013-03-12 17:18:49.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rednotebook.new/rednotebook.changes 2013-03-25 20:41:58.000000000 +0100 @@ -1,0 +2,25 @@ +Tue Mar 19 22:43:44 UTC 2013 - dimstar(a)opensuse.org + +- Update to version 1.7.1: + + Fix: Insert spellchecking correction in the correct position + (lp#1137925). +- Changes from version 1.7.0: + + Allow filtering exported days by tags. + + Add option to export only the currently selected text. + + Move spellcheck option from preferences to edit menu and add F7 + shortcut. + + Enable spellchecking on Windows. See help for adding custom + dictionaries. + + Better error message for invalid markup. + + Show warning if no directory is selected before clicking the + "Open" button when choosing a journal directory. + + Gracefully handle BadStatusLines when checking for new + versions. + + Do not try to set file permissions on Windows where they are + unavailable. + + Fix hide-from-cloud for words containing backslashes + (lp#1131412). + + Fix relative file links on Windows. + + Code: Switch from optparse to argparse. + +------------------------------------------------------------------- Old: ---- rednotebook-1.6.6.tar.gz New: ---- rednotebook-1.7.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rednotebook.spec ++++++ --- /var/tmp/diff_new_pack.NtAbqY/_old 2013-03-25 20:41:59.000000000 +0100 +++ /var/tmp/diff_new_pack.NtAbqY/_new 2013-03-25 20:41:59.000000000 +0100 @@ -17,7 +17,7 @@ Name: rednotebook -Version: 1.6.6 +Version: 1.7.1 Release: 0 # See note at the end of README: code is using some LGPL-3.0+ module, so the resulting work is GPL-3.0+. Summary: Graphical diary and journal ++++++ rednotebook-1.6.6.tar.gz -> rednotebook-1.7.1.tar.gz ++++++ ++++ 61898 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 pkg-config for openSUSE:Factory
by root＠hilbert.suse.de 25 Mar '13

25 Mar '13

Hello community, here is the log from the commit of package pkg-config for openSUSE:Factory checked in at 2013-03-25 20:40:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pkg-config (Old) and /work/SRC/openSUSE:Factory/.pkg-config.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pkg-config", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/pkg-config/pkg-config.changes 2012-09-17 14:02:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.pkg-config.new/pkg-config.changes 2013-03-25 20:41:52.000000000 +0100 @@ -1,0 +2,39 @@ +Tue Feb 5 17:07:00 UTC 2013 - p.drouand(a)gmail.com + +- Update to version 0.28: + + Fixed a pair of long-standing and intertwined bugs involving + unwanted removal of flags: + - Other Libs flags like -Wl are now kept in context order + with -l flags. + - Aggressive removal of all duplicate arguments has been scaled + back so that just consecutive duplicate arguments are + removed. One result of this change is that some flags could + be repeated in the final output, especially flags from + non-pkg-config packages like -lm. Since pkg-config rarely has + enough knowledge here about the right thing to do, we throw + the duplicate arguments at the compiler/linker and trust it + will do the right thing. + + Fixed an old bug to allow circular Requires. This fix brings + along a small behavior change in that pkg-config resolves + requires depth first, causing some lower level flags to show up + earlier in the output than previously. + + Cleaned up many corner-case bugs and ambiguous behavior in + pkg-config's interface. + + New autoconf macro PKG_CHECK_VAR for reading variables from .pc + files. + + Default to suppressing -L/lib and/or -L/lib64 like their /usr + counterparts. + + To help support multiarch scenarios out of the box, + $host-pkg-config is now installed unless --disable-host-tool + is passed to configure. + + Added optional gcov usage through the --with-gcov configure + option. As a result, many more tests were added to greatly + increase the coverage of the code to 86% of executed lines on a + Fedora 18 machine. + + Bugs fixed: fdo#130, fdo#7331, fdo#16101, fdo#17053, fdo#19950, + fdo#34504, fdo#48098, fdo#54231, fdo#54271, fdo#54379, + fdo#54384, fdo#54386, fdo#54388, fdo#54389, fdo#54390, + fdo#54391, fdo#54427, fdo#54463, fdo#54716, fdo#57078, + fdo#58363, fdo#59435. + +------------------------------------------------------------------- Old: ---- pkg-config-0.27.1.tar.gz New: ---- pkg-config-0.28.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pkg-config.spec ++++++ --- /var/tmp/diff_new_pack.bvJWpx/_old 2013-03-25 20:41:57.000000000 +0100 +++ /var/tmp/diff_new_pack.bvJWpx/_new 2013-03-25 20:41:57.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package pkg-config # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,8 +16,13 @@ # +%ifarch %{ix86} +# On ix86, _arch is defined to be i386... re-define +%define _arch i586 +%endif + Name: pkg-config -Version: 0.27.1 +Version: 0.28 Release: 0 Summary: A library management system License: GPL-2.0+ @@ -59,6 +64,7 @@ %defattr(-,root,root) %doc AUTHORS COPYING NEWS README ChangeLog pkg-config-guide.html %{_bindir}/pkg-config +%{_bindir}/%{_arch}-suse-linux-gnu-pkg-config %dir %{_datadir}/aclocal %{_datadir}/aclocal/pkg.m4 %doc %{_mandir}/man1/pkg-config.* ++++++ pkg-config-0.27.1.tar.gz -> pkg-config-0.28.tar.gz ++++++ ++++ 18107 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 pidgin for openSUSE:Factory
by root＠hilbert.suse.de 25 Mar '13

25 Mar '13

Hello community, here is the log from the commit of package pidgin for openSUSE:Factory checked in at 2013-03-25 20:40:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pidgin (Old) and /work/SRC/openSUSE:Factory/.pidgin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pidgin", Maintainer is "XLi(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/pidgin/pidgin.changes 2013-03-12 17:17:38.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.pidgin.new/pidgin.changes 2013-03-25 20:41:48.000000000 +0100 @@ -1,0 +2,8 @@ +Sun Mar 24 17:07:27 UTC 2013 - dimstar(a)opensuse.org + +- Add pidgin-gstreamer1.patch: Port to GStreamer 1.0. Only enabled + on openSUSE 13.1 and newer. +- On openSUSE 13.1 and newer, use gstreamer-devel and + gstreamer-plugins-base-devel BuildRequires. + +------------------------------------------------------------------- New: ---- pidgin-gstreamer1.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pidgin.spec ++++++ --- /var/tmp/diff_new_pack.arcRf4/_old 2013-03-25 20:41:52.000000000 +0100 +++ /var/tmp/diff_new_pack.arcRf4/_new 2013-03-25 20:41:52.000000000 +0100 @@ -40,13 +40,14 @@ Patch3: pidgin-nonblock-common.patch Patch4: pidgin-nonblock-gwim.patch Patch5: pidgin-nonblock-common2.patch - # PATCH-FIX-UPSTREAM pidgin-mono-buildfix.patch http://developer.pidgin.im/ticket/12506 dimstar(a)opensuse.org -- Fix build with mono plugin loader; missing include statements. Patch14: pidgin-mono-buildfix.patch # PATCH-FIX-OPENSUSE pidgin-fix-perl-build.patch vuntz(a)opensuse.org -- Revert http://developer.pidgin.im/viewmtn/revision/info/f32151852a00fb5abd3fdccdd8… as it breaks the build Patch15: pidgin-fix-perl-build.patch # PATCH-FIX-UPSTREAM pidgin-irc-sasl.patch https://developer.pidgin.im/ticket/15517 bnc#806975 dimstar(a)opensuse.org -- Link IRC module to sasl Patch16: pidgin-irc-sasl.patch +# PATCH-FEATURE-UPSTREAM pidgin-gstreamer1.patch https://developer.pidgin.im/ticket/15386 dimstar(a)opensuse.org -- Port to GStreamer 1.0 +Patch17: pidgin-gstreamer1.patch # Can use external libzephyr BuildRequires: cyrus-sasl-devel BuildRequires: dbus-1-devel @@ -125,6 +126,10 @@ %endif BuildRequires: NetworkManager-devel BuildRequires: update-desktop-files +%if %suse_version > 1230 +BuildRequires: gstreamer-devel +BuildRequires: gstreamer-plugins-base-devel +%else %if %suse_version > 1030 BuildRequires: gstreamer-0_10-devel BuildRequires: gstreamer-0_10-plugins-base-devel @@ -132,6 +137,7 @@ BuildRequires: gstreamer010-devel BuildRequires: gstreamer010-plugins-base-devel %endif +%endif %if %suse_version > 1020 BuildRequires: dbus-1-glib-devel BuildRequires: silc-toolkit-devel @@ -392,6 +398,9 @@ %patch14 -p1 %patch15 -p1 %patch16 -p1 +%if 0%{?suse_version} >= 1310 +%patch17 -p1 +%endif # Change Myanmar/Myanmar to Myanmar: rename my_MM my po/my_MM.* ++++++ pidgin-gstreamer1.patch ++++++ Index: pidgin-2.10.7/libpurple/media/backend-fs2.c =================================================================== --- pidgin-2.10.7.orig/libpurple/media/backend-fs2.c +++ pidgin-2.10.7/libpurple/media/backend-fs2.c @@ -189,8 +189,13 @@ event_probe_cb(GstPad *srcpad, GstEvent gst_pad_unlink(srcpad, gst_pad_get_peer(srcpad)); +#if GST_CHECK_VERSION(1,0,0) + gst_pad_remove_probe(srcpad, + g_value_get_ulong(gst_structure_get_value(s, "handler-id"))); +#else gst_pad_remove_event_probe(srcpad, g_value_get_uint(gst_structure_get_value(s, "handler-id"))); +#endif if (g_value_get_boolean(gst_structure_get_value(s, "release-pad"))) gst_element_release_request_pad(GST_ELEMENT_PARENT(srcpad), srcpad); @@ -204,7 +209,12 @@ event_probe_cb(GstPad *srcpad, GstEvent static void unlink_teepad_dynamic(GstPad *srcpad, gboolean release_pad) { +#if GST_CHECK_VERSION(1,0,0) + gulong id = gst_pad_add_probe(srcpad, GST_PAD_PROBE_TYPE_EVENT_BOTH, + G_CALLBACK(event_probe_cb), NULL, NULL); +#else guint id = gst_pad_add_event_probe(srcpad, G_CALLBACK(event_probe_cb), NULL); +#endif if (GST_IS_GHOST_PAD(srcpad)) srcpad = gst_ghost_pad_get_target(GST_GHOST_PAD(srcpad)); @@ -213,7 +223,11 @@ unlink_teepad_dynamic(GstPad *srcpad, gb gst_event_new_custom(GST_EVENT_CUSTOM_DOWNSTREAM, gst_structure_new("purple-unlink-tee", "release-pad", G_TYPE_BOOLEAN, release_pad, +#if GST_CHECK_VERSION(1,0,0) + "handler-id", G_TYPE_ULONG, id, +#else "handler-id", G_TYPE_UINT, id, +#endif NULL))); } @@ -808,12 +822,15 @@ gst_handle_message_element(GstBus *bus, PurpleMediaBackendFs2Private *priv = PURPLE_MEDIA_BACKEND_FS2_GET_PRIVATE(self); GstElement *src = GST_ELEMENT(GST_MESSAGE_SRC(msg)); + GstStructure *gst_struct; static guint level_id = 0; if (level_id == 0) level_id = g_signal_lookup("level", PURPLE_TYPE_MEDIA); - if (gst_structure_has_name(msg->structure, "level")) { + gst_struct = gst_message_get_structure(msg); + + if (gst_structure_has_name(gst_struct, "level")) { GstElement *src = GST_ELEMENT(GST_MESSAGE_SRC(msg)); gchar *name; gchar *participant = NULL; @@ -868,12 +885,12 @@ gst_handle_message_element(GstBus *bus, return; #ifdef HAVE_FARSIGHT - if (gst_structure_has_name(msg->structure, "farsight-error")) { + if (gst_structure_has_name(gst_struct, "farsight-error")) { #else - if (gst_structure_has_name(msg->structure, "farstream-error")) { + if (gst_structure_has_name(gst_struct, "farstream-error")) { #endif FsError error_no; - gst_structure_get_enum(msg->structure, "error-no", + gst_structure_get_enum(gst_struct, "error-no", FS_TYPE_ERROR, (gint*)&error_no); switch (error_no) { case FS_ERROR_NO_CODECS: @@ -910,7 +927,7 @@ gst_handle_message_element(GstBus *bus, #endif error_no, gst_structure_get_string( - msg->structure, "error-msg")); + gst_struct, "error-msg")); break; } @@ -924,7 +941,7 @@ gst_handle_message_element(GstBus *bus, #endif purple_media_end(priv->media, NULL, NULL); } - } else if (gst_structure_has_name(msg->structure, + } else if (gst_structure_has_name(gst_struct, #ifdef HAVE_FARSIGHT "farsight-new-local-candidate")) { #else @@ -939,9 +956,9 @@ gst_handle_message_element(GstBus *bus, PurpleMediaBackendFs2Stream *media_stream; gchar *name; - value = gst_structure_get_value(msg->structure, "stream"); + value = gst_structure_get_value(gst_struct, "stream"); stream = g_value_get_object(value); - value = gst_structure_get_value(msg->structure, "candidate"); + value = gst_structure_get_value(gst_struct, "candidate"); local_candidate = g_value_get_boxed(value); session = get_session_from_fs_stream(self, stream); @@ -963,7 +980,7 @@ gst_handle_message_element(GstBus *bus, g_signal_emit_by_name(self, "new-candidate", session->id, name, candidate); g_object_unref(candidate); - } else if (gst_structure_has_name(msg->structure, + } else if (gst_structure_has_name(gst_struct, #ifdef HAVE_FARSIGHT "farsight-local-candidates-prepared")) { #else @@ -975,7 +992,7 @@ gst_handle_message_element(GstBus *bus, PurpleMediaBackendFs2Session *session; gchar *name; - value = gst_structure_get_value(msg->structure, "stream"); + value = gst_structure_get_value(gst_struct, "stream"); stream = g_value_get_object(value); session = get_session_from_fs_stream(self, stream); @@ -985,7 +1002,7 @@ gst_handle_message_element(GstBus *bus, g_signal_emit_by_name(self, "candidates-prepared", session->id, name); - } else if (gst_structure_has_name(msg->structure, + } else if (gst_structure_has_name(gst_struct, #ifdef HAVE_FARSIGHT "farsight-new-active-candidate-pair")) { #else @@ -1000,12 +1017,12 @@ gst_handle_message_element(GstBus *bus, PurpleMediaCandidate *lcandidate, *rcandidate; gchar *name; - value = gst_structure_get_value(msg->structure, "stream"); + value = gst_structure_get_value(gst_struct, "stream"); stream = g_value_get_object(value); - value = gst_structure_get_value(msg->structure, + value = gst_structure_get_value(gst_struct, "local-candidate"); local_candidate = g_value_get_boxed(value); - value = gst_structure_get_value(msg->structure, + value = gst_structure_get_value(gst_struct, "remote-candidate"); remote_candidate = g_value_get_boxed(value); @@ -1023,7 +1040,7 @@ gst_handle_message_element(GstBus *bus, g_object_unref(lcandidate); g_object_unref(rcandidate); - } else if (gst_structure_has_name(msg->structure, + } else if (gst_structure_has_name(gst_struct, #ifdef HAVE_FARSIGHT "farsight-recv-codecs-changed")) { #else @@ -1033,7 +1050,7 @@ gst_handle_message_element(GstBus *bus, GList *codecs; FsCodec *codec; - value = gst_structure_get_value(msg->structure, "codecs"); + value = gst_structure_get_value(gst_struct, "codecs"); codecs = g_value_get_boxed(value); codec = codecs->data; @@ -1044,7 +1061,7 @@ gst_handle_message_element(GstBus *bus, "farstream-recv-codecs-changed: %s\n", #endif codec->encoding_name); - } else if (gst_structure_has_name(msg->structure, + } else if (gst_structure_has_name(gst_struct, #ifdef HAVE_FARSIGHT "farsight-component-state-changed")) { #else @@ -1055,9 +1072,9 @@ gst_handle_message_element(GstBus *bus, guint component; const gchar *state; - value = gst_structure_get_value(msg->structure, "state"); + value = gst_structure_get_value(gst_struct, "state"); fsstate = g_value_get_enum(value); - value = gst_structure_get_value(msg->structure, "component"); + value = gst_structure_get_value(gst_struct, "component"); component = g_value_get_uint(value); switch (fsstate) { @@ -1092,7 +1109,7 @@ gst_handle_message_element(GstBus *bus, #endif "component: %u state: %s\n", component, state); - } else if (gst_structure_has_name(msg->structure, + } else if (gst_structure_has_name(gst_struct, #ifdef HAVE_FARSIGHT "farsight-send-codec-changed")) { #else @@ -1102,7 +1119,7 @@ gst_handle_message_element(GstBus *bus, FsCodec *codec; gchar *codec_str; - value = gst_structure_get_value(msg->structure, "codec"); + value = gst_structure_get_value(gst_struct, "codec"); codec = g_value_get_boxed(value); codec_str = fs_codec_to_string(codec); @@ -1115,7 +1132,7 @@ gst_handle_message_element(GstBus *bus, codec_str); g_free(codec_str); - } else if (gst_structure_has_name(msg->structure, + } else if (gst_structure_has_name(gst_struct, #ifdef HAVE_FARSIGHT "farsight-codecs-changed")) { #else @@ -1125,7 +1142,7 @@ gst_handle_message_element(GstBus *bus, FsSession *fssession; GList *sessions; - value = gst_structure_get_value(msg->structure, "session"); + value = gst_structure_get_value(gst_struct, "session"); fssession = g_value_get_object(value); sessions = g_hash_table_get_values(priv->sessions); Index: pidgin-2.10.7/libpurple/mediamanager.c =================================================================== --- pidgin-2.10.7.orig/libpurple/mediamanager.c +++ pidgin-2.10.7/libpurple/mediamanager.c @@ -44,7 +44,12 @@ #else #include <farstream/fs-element-added-notifier.h> #endif + +#if GST_CHECK_VERSION(1,0,0) +#include <gst/video/videooverlay.h> +#else #include <gst/interfaces/xoverlay.h> +#endif /** @copydoc _PurpleMediaManagerPrivate */ typedef struct _PurpleMediaManagerPrivate PurpleMediaManagerPrivate; @@ -270,8 +275,13 @@ purple_media_manager_get_pipeline(Purple gst_bus_add_signal_watch(GST_BUS(bus)); g_signal_connect(G_OBJECT(bus), "message", G_CALLBACK(pipeline_bus_call), manager); +#if GST_CHECK_VERSION(1,0,0) + gst_bus_set_sync_handler(bus, + gst_bus_sync_signal_handler, NULL, NULL); +#else gst_bus_set_sync_handler(bus, gst_bus_sync_signal_handler, NULL); +#endif gst_object_unref(bus); filename = g_build_filename(purple_user_dir(), @@ -727,7 +737,7 @@ window_id_cb(GstBus *bus, GstMessage *ms GstElement *sink; if (GST_MESSAGE_TYPE(msg) != GST_MESSAGE_ELEMENT || - !gst_structure_has_name(msg->structure, + !gst_structure_has_name(gst_message_get_structure(msg), "prepare-xwindow-id")) return; @@ -742,8 +752,13 @@ window_id_cb(GstBus *bus, GstMessage *ms | G_SIGNAL_MATCH_DATA, 0, 0, NULL, window_id_cb, ow); +#if GST_CHECK_VERSION(1,0,0) + gst_video_overlay_set_window_handle(GST_VIDEO_OVERLAY(GST_MESSAGE_SRC(msg)), + ow->window_id); +#else gst_x_overlay_set_xwindow_id(GST_X_OVERLAY( GST_MESSAGE_SRC(msg)), ow->window_id); +#endif } #endif Index: pidgin-2.10.7/configure.ac =================================================================== --- pidgin-2.10.7.orig/configure.ac +++ pidgin-2.10.7/configure.ac @@ -740,17 +740,17 @@ dnl #################################### dnl # Check for GStreamer dnl ####################################################################### dnl -dnl TODO: Depend on gstreamer >= 0.10.10, and remove the conditional use of +dnl TODO: Depend on gstreamer >= 1.0.0, and remove the conditional use of dnl gst_registry_fork_set_enabled. AC_ARG_ENABLE(gstreamer, [AC_HELP_STRING([--disable-gstreamer], [compile without GStreamer audio support])], enable_gst="$enableval", enable_gst="yes") if test "x$enable_gst" != "xno"; then - PKG_CHECK_MODULES(GSTREAMER, [gstreamer-0.10], [ + PKG_CHECK_MODULES(GSTREAMER, [gstreamer-1.0], [ AC_DEFINE(USE_GSTREAMER, 1, [Use GStreamer for playing sounds]) AC_SUBST(GSTREAMER_CFLAGS) AC_SUBST(GSTREAMER_LIBS) - AC_CHECK_LIB(gstreamer-0.10, gst_registry_fork_set_enabled, + AC_CHECK_LIB(gstreamer-1.0, gst_registry_fork_set_enabled, [ AC_DEFINE(GST_CAN_DISABLE_FORKING, [], [Define if gst_registry_fork_set_enabled exists])], [], [$GSTREAMER_LIBS]) @@ -766,26 +766,6 @@ Use --disable-gstreamer if you do not ne fi dnl ####################################################################### -dnl # Check for GStreamer Interfaces -dnl ####################################################################### -if test "x$enable_gst" != "xno"; then - AC_ARG_ENABLE(gstreamer-interfaces, - [AC_HELP_STRING([--disable-gstreamer-interfaces], [compile without GStreamer interface support])], - enable_gstinterfaces="$enableval", enable_gstinterfaces="yes") - if test "x$enable_gstinterfaces" != "xno"; then - PKG_CHECK_MODULES(GSTINTERFACES, [gstreamer-interfaces-0.10], [ - AC_DEFINE(USE_GSTINTERFACES, 1, [Use GStreamer interfaces for X overlay support]) - AC_SUBST(GSTINTERFACES_CFLAGS) - AC_SUBST(GSTINTERFACES_LIBS) - ], [ - enable_gstinterfaces="no" - ]) - fi -else - enable_gstinterfaces="no" -fi - -dnl ####################################################################### dnl # Check for Farstream dnl ####################################################################### AC_ARG_ENABLE(farstream, -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit os-prober for openSUSE:Factory
by root＠hilbert.suse.de 25 Mar '13

25 Mar '13

Hello community, here is the log from the commit of package os-prober for openSUSE:Factory checked in at 2013-03-25 20:40:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/os-prober (Old) and /work/SRC/openSUSE:Factory/.os-prober.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "os-prober", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/os-prober/os-prober.changes 2013-03-04 17:29:33.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.os-prober.new/os-prober.changes 2013-03-25 20:41:46.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 22 17:29:32 UTC 2013 - arvidjaar(a)gmail.com + +- add os-prober-probe-MD-devices.patch (bnc#811006) + * probe also Linux MD devices + +------------------------------------------------------------------- New: ---- os-prober-probe-MD-devices.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ os-prober.spec ++++++ --- /var/tmp/diff_new_pack.TMVd3G/_old 2013-03-25 20:41:47.000000000 +0100 +++ /var/tmp/diff_new_pack.TMVd3G/_new 2013-03-25 20:41:47.000000000 +0100 @@ -44,6 +44,8 @@ Patch5: os-prober-1.49-grub2-mount.patch # PATCH-FIX-OPENSUSE: Detect distributions which moved /lib to /usr/lib Patch6: os-prober-usr_lib-detection.patch +# PATCH-FIX-OPENSUSE: Probe also unpartitioned Linux MD devices (bnc#811006) +Patch7: os-prober-probe-MD-devices.patch Requires: /bin/grep Requires: /bin/sed @@ -69,6 +71,7 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 %build make %{?_smp_mflags} CC="%__cc" CFLAGS="%{optflags}" ++++++ os-prober-probe-MD-devices.patch ++++++ Index: os-prober/os-prober =================================================================== --- os-prober.orig/os-prober +++ os-prober/os-prober @@ -39,6 +39,11 @@ partitions () { fi done + # Add Linux MD unpartioned devices. Linux MD partitions are already covered above + [ -f /proc/mdstat ] && grep '^md' /proc/mdstat | while read md line; do + [ -e "/dev/$md" ] && echo "/dev/$md" + done + # Add Serial ATA RAID devices if type dmraid >/dev/null 2>&1 && \ dmraid -s -c >/dev/null 2>&1; then @@ -79,7 +84,8 @@ parse_proc_mdstat () { udevadm info "$@" } fi - while read line; do + # Only add MD slaves to the list + while read md line; do for word in $line; do dev="${word%%[*}" # TODO: factor this out to something in di-utils if -- 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 25 Mar '13

25 Mar '13

Hello community, here is the log from the commit of package openstack-quickstart for openSUSE:Factory checked in at 2013-03-25 20:40:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openstack-quickstart (Old) and /work/SRC/openSUSE:Factory/.openstack-quickstart.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openstack-quickstart", Maintainer is "radmanic(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/openstack-quickstart/openstack-quickstart.changes 2013-02-22 16:56:59.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.openstack-quickstart.new/openstack-quickstart.changes 2013-03-25 20:41:44.000000000 +0100 @@ -1,0 +2,12 @@ +Fri Mar 15 11:09:05 UTC 2013 - cloud-devel(a)suse.de + +- Update to latest git (96c1d32): + + configure tgt for cinder + +------------------------------------------------------------------- +Mon Mar 11 12:58:48 UTC 2013 - cloud-devel(a)suse.de + +- Update to latest git (657d782): + + Do not run mysql in cleanup if the binary is not there + +------------------------------------------------------------------- Old: ---- openstack-quickstart-2012.2+git.1360262230.cb0fbe8.tar.gz New: ---- openstack-quickstart-2012.2+git.1363345658.96c1d32.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openstack-quickstart.spec ++++++ --- /var/tmp/diff_new_pack.ck4xET/_old 2013-03-25 20:41:45.000000000 +0100 +++ /var/tmp/diff_new_pack.ck4xET/_new 2013-03-25 20:41:45.000000000 +0100 @@ -18,7 +18,7 @@ Name: openstack-quickstart -Version: 2012.2+git.1360262230.cb0fbe8 +Version: 2012.2+git.1363345658.96c1d32 Release: 0 License: MIT Summary: OpenStack Quickstart ++++++ openstack-quickstart-2012.2+git.1360262230.cb0fbe8.tar.gz -> openstack-quickstart-2012.2+git.1363345658.96c1d32.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openstack-quickstart-2012.2+git.1360262230.cb0fbe8/scripts/openstack-quickstart-democleanup new/openstack-quickstart-2012.2+git.1363345658.96c1d32/scripts/openstack-quickstart-democleanup --- old/openstack-quickstart-2012.2+git.1360262230.cb0fbe8/scripts/openstack-quickstart-democleanup 2013-02-07 18:53:07.000000000 +0100 +++ new/openstack-quickstart-2012.2+git.1363345658.96c1d32/scripts/openstack-quickstart-democleanup 2013-03-11 14:05:29.000000000 +0100 @@ -17,7 +17,7 @@ for n in nova keystone glance horizon ; do sudo -u postgres dropdb $n sudo -u postgres dropuser $n - echo "drop database $n;" | mysql + which mysql &> /dev/null && echo "drop database $n;" | mysql done for m in /var/lib/nova/instances/*/rootfs ; do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openstack-quickstart-2012.2+git.1360262230.cb0fbe8/scripts/openstack-quickstart-demosetup new/openstack-quickstart-2012.2+git.1363345658.96c1d32/scripts/openstack-quickstart-demosetup --- old/openstack-quickstart-2012.2+git.1360262230.cb0fbe8/scripts/openstack-quickstart-demosetup 2013-02-07 19:38:06.000000000 +0100 +++ new/openstack-quickstart-2012.2+git.1363345658.96c1d32/scripts/openstack-quickstart-demosetup 2013-03-15 12:09:05.000000000 +0100 @@ -167,6 +167,10 @@ grep -q nova-rootwrap /etc/sudoers || echo "openstack-nova ALL=(ALL) NOPASSWD:/usr/bin/nova-rootwrap" >> /etc/sudoers grep -q cinder-rootwrap /etc/sudoers || echo "openstack-cinder ALL=(ALL) NOPASSWD:/usr/bin/cinder-rootwrap" >> /etc/sudoers +# configure tgt for cinder +grep -q "include /var/lib/cinder/volumes" /etc/tgt/targets.conf || echo "include /var/lib/cinder/volumes/*" >> /etc/tgt/targets.conf +rctgtd restart + perl -i -pe "s/%SERVICE_TOKEN%/$SERVICE_TOKEN/;" /etc/nova/api-paste.ini # obsolete 2012-03-19? for m in cinder nova glance ; do sed -i -e 's/%SERVICE_TENANT_NAME%/service/' -e "s/%SERVICE_USER%/$m/" -e "s/%SERVICE_PASSWORD%/$SERVICE_TOKEN\nadmin_token = $SERVICE_TOKEN/" /etc/$m/*.ini /etc/$m/*.conf -- 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 25 Mar '13

25 Mar '13

Hello community, here is the log from the commit of package openstack-nova for openSUSE:Factory checked in at 2013-03-25 20:40:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openstack-nova (Old) and /work/SRC/openSUSE:Factory/.openstack-nova.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openstack-nova", Maintainer is "radmanic(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/openstack-nova/openstack-nova.changes 2013-03-08 09:29:15.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.openstack-nova.new/openstack-nova.changes 2013-03-25 20:41:40.000000000 +0100 @@ -0,0 +1,14 @@ +-------------------------------------------------------------------- +Thu Mar 14 21:53:59 UTC 2013 - vuntz(a)suse.com + +- Update to version 2012.2.4+git.1363298039.9561484: + + Fix an error in affinity filters + + Add quotas for fixed ips. (CVE-2013-1838) +- This fixes bnc#808622. + +-------------------------------------------------------------------- +Mon Mar 11 13:05:55 UTC 2013 - cloud-devel(a)suse.de + +- Update to version 2012.2.4+git.1363007155.c06b205: + + Avoid vm instance shutdown when power state is NOSTATE + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openstack-nova-doc.spec ++++++ --- /var/tmp/diff_new_pack.hTVBn3/_old 2013-03-25 20:41:43.000000000 +0100 +++ /var/tmp/diff_new_pack.hTVBn3/_new 2013-03-25 20:41:43.000000000 +0100 @@ -20,7 +20,7 @@ %define majorversion 2012.2.3 Name: openstack-%{component}-doc -Version: 2012.2.4+git.1362583574.da38af5 +Version: 2012.2.4+git.1363298039.9561484 Release: 1 License: Apache-2.0 Summary: OpenStack Compute (Nova) - Documentation ++++++ openstack-nova.spec ++++++ --- /var/tmp/diff_new_pack.hTVBn3/_old 2013-03-25 20:41:43.000000000 +0100 +++ /var/tmp/diff_new_pack.hTVBn3/_new 2013-03-25 20:41:43.000000000 +0100 @@ -22,7 +22,7 @@ %define username openstack-%{component} Name: openstack-%{component} -Version: 2012.2.4+git.1362583574.da38af5 +Version: 2012.2.4+git.1363298039.9561484 Release: 1 License: Apache-2.0 Summary: OpenStack Compute (Nova) ++++++ nova-stable-folsom.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nova-2012.2.4/ChangeLog new/nova-2012.2.4/ChangeLog --- old/nova-2012.2.4/ChangeLog 2013-03-06 02:08:02.000000000 +0100 +++ new/nova-2012.2.4/ChangeLog 2013-03-14 20:19:55.000000000 +0100 @@ -1,3 +1,42 @@ +commit 9561484166f245d0e4602a36351d6cac72dd9426 +Author: Michael Still <mikal(a)stillhq.com> +Date: Wed Mar 13 04:44:14 2013 +1100 + + Add quotas for fixed ips. + + DocImpact: there is now a default quota of 10 fixed ips per tenant. + This will need to be adjusted by deployers if that number does not + meet their needs. + + Resolves bug 1125468 for folsom. + + Change-Id: I970d540cfa6a61b7e903703f845a6453ff55f225 + + nova/db/api.py | 6 ++ + nova/db/sqlalchemy/api.py | 21 +++++ + nova/exception.py | 4 + + nova/network/manager.py | 89 +++++++++++++------- + nova/quota.py | 10 +++ + .../compute/contrib/test_quota_classes.py | 14 +-- + .../api/openstack/compute/contrib/test_quotas.py | 16 ++-- + nova/tests/network/test_manager.py | 15 ++++ + nova/tests/test_quota.py | 24 ++++++ + 9 files changed, 157 insertions(+), 42 deletions(-) + +commit f0143a3e97cae23f8b290b7f84da372dede073aa +Merge: c06b205 d6b9d33 +Author: Jenkins <jenkins(a)review.openstack.org> +Date: Thu Mar 14 08:33:48 2013 +0000 + + Merge "Fix an error in affinity filters" into stable/folsom + +commit c06b2056668757fe5441093df898984a925b67f2 +Merge: da38af5 cb843f7 +Author: Jenkins <jenkins(a)review.openstack.org> +Date: Fri Mar 8 13:57:46 2013 +0000 + + Merge "Avoid vm instance shutdown when power state is NOSTATE" into stable/folsom + commit da38af5b79e7e3f9584cb79154aa0740badd6efb Merge: 8c4df00 05a3374 Author: Jenkins <jenkins(a)review.openstack.org> @@ -141,6 +180,25 @@ nova/virt/libvirt/vif.py | 3 ++- 2 files changed, 28 insertions(+), 3 deletions(-) +commit cb843f7a948122c55fbe244458bb44b2f68eedb9 +Author: Pádraig Brady <pbrady(a)redhat.com> +Date: Thu Feb 21 16:17:13 2013 +0000 + + Avoid vm instance shutdown when power state is NOSTATE + + * nova/compute/manager.py (_sync_power_states): Log the condition + where we can retrieve the state from the hyperviser, rather than + stopping the VM. + + Related grizzly commits are 95e77703 and ad101ce5 + + Fixes bug: 1085771 + Change-Id: I5fb9fdc6bcde729c00c4931960ed0de3b8fa189d + + nova/compute/manager.py | 11 ++++++++--- + nova/tests/compute/test_compute.py | 2 +- + 2 files changed, 9 insertions(+), 4 deletions(-) + commit 7ac3fe143ca35493b7a0247dafe0693cf1d6a376 Merge: 15b2734 7ace55f Author: Jenkins <jenkins(a)review.openstack.org> @@ -287,6 +345,27 @@ nova/tests/compute/test_compute.py | 40 ++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 11 deletions(-) +commit d6b9d33b231b987d9e826d25ad34c97097dc2af4 +Author: Hans Lindgren <hanlind(a)kth.se> +Date: Sun Jan 27 21:19:16 2013 +0100 + + Fix an error in affinity filters + + Fix a call to compute_api.get_all to properly exclude deleted instances. + Add tests to prohibit this error in the future. + + After some thought, this can be further optimized to let the instance + query do all the filtering/matching. + + Resolves bug 1107156. + + Change-Id: I6d6a6ba44d38d363489853d0407ad4cc94046656 + (cherry picked from commit 8bc80cab3c134d64953b4f6493cab80b5bdc1b69) + + nova/scheduler/filters/affinity_filter.py | 22 +++++++--------------- + nova/tests/scheduler/test_host_filters.py | 28 ++++++++++++++++++++++++++++ + 2 files changed, 35 insertions(+), 15 deletions(-) + commit f6081d01878f0021a499f304c511b6e1e9c8f138 Merge: 1709c8e 5a66812 Author: Jenkins <jenkins(a)review.openstack.org> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nova-2012.2.4/nova/compute/manager.py new/nova-2012.2.4/nova/compute/manager.py --- old/nova-2012.2.4/nova/compute/manager.py 2013-03-06 02:03:10.000000000 +0100 +++ new/nova-2012.2.4/nova/compute/manager.py 2013-03-14 20:14:22.000000000 +0100 @@ -2749,9 +2749,8 @@ pass elif vm_state == vm_states.ACTIVE: # The only rational power state should be RUNNING - if vm_power_state in (power_state.NOSTATE, - power_state.SHUTDOWN, - power_state.CRASHED): + if vm_power_state in (power_state.SHUTDOWN, + power_state.CRASHED): LOG.warn(_("Instance shutdown by itself. Calling " "the stop API."), instance=db_instance) try: @@ -2786,6 +2785,12 @@ # instrumentation is done. See bug 1097806 for details. LOG.warn(_("Instance is paused unexpectedly. Ignore."), instance=db_instance) + elif vm_power_state == power_state.NOSTATE: + # Occasionally, depending on the status of the hypervisor, + # which could be restarting for example, an instance may + # not be found. Therefore just log the condidtion. + LOG.warn(_("Instance is unexpectedly not found. Ignore."), + instance=db_instance) elif vm_state == vm_states.STOPPED: if vm_power_state not in (power_state.NOSTATE, power_state.SHUTDOWN, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nova-2012.2.4/nova/db/api.py new/nova-2012.2.4/nova/db/api.py --- old/nova-2012.2.4/nova/db/api.py 2013-03-06 02:03:10.000000000 +0100 +++ new/nova-2012.2.4/nova/db/api.py 2013-03-14 20:14:22.000000000 +0100 @@ -507,6 +507,12 @@ """Create a fixed ip from the values dictionary.""" return IMPL.fixed_ip_update(context, address, values) + +def fixed_ip_count_by_project(context, project_id, session=None): + """Count fixed ips used by project.""" + return IMPL.fixed_ip_count_by_project(context, project_id, + session=session) + #################### diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nova-2012.2.4/nova/db/sqlalchemy/api.py new/nova-2012.2.4/nova/db/sqlalchemy/api.py --- old/nova-2012.2.4/nova/db/sqlalchemy/api.py 2013-03-06 02:03:10.000000000 +0100 +++ new/nova-2012.2.4/nova/db/sqlalchemy/api.py 2013-03-14 20:14:22.000000000 +0100 @@ -1273,6 +1273,27 @@ fixed_ip_ref.save(session=session) +@require_context +def fixed_ip_count_by_project(context, project_id, session=None): + authorize_project_context(context, project_id) + + # NOTE(mikal): Yes I know this is horrible, but I couldn't + # get a query using a join working, mainly because of a failure + # to be able to express the where clause sensibly. Patches + # welcome. + session = get_session() + with session.begin(): + instance_uuid_query = model_query(context, models.Instance.uuid, + read_deleted="no", session=session).\ + filter(models.Instance.project_id == \ + project_id) + uuid_filter = models.FixedIp.instance_uuid.in_(instance_uuid_query) + return model_query(context, models.FixedIp, read_deleted="no", + session=session).\ + filter(uuid_filter).\ + count() + + ################### diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nova-2012.2.4/nova/exception.py new/nova-2012.2.4/nova/exception.py --- old/nova-2012.2.4/nova/exception.py 2013-03-06 02:03:10.000000000 +0100 +++ new/nova-2012.2.4/nova/exception.py 2013-03-14 20:14:22.000000000 +0100 @@ -998,6 +998,10 @@ message = _("Maximum number of floating ips exceeded") +class FixedIpLimitExceeded(QuotaError): + message = _("Maximum number of fixed ips exceeded") + + class MetadataLimitExceeded(QuotaError): message = _("Maximum number of metadata items exceeds %(allowed)d") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nova-2012.2.4/nova/network/manager.py new/nova-2012.2.4/nova/network/manager.py --- old/nova-2012.2.4/nova/network/manager.py 2013-03-06 02:03:10.000000000 +0100 +++ new/nova-2012.2.4/nova/network/manager.py 2013-03-14 20:14:22.000000000 +0100 @@ -1294,37 +1294,53 @@ address = None instance_ref = self.db.instance_get(context, instance_id) - if network['cidr']: - address = kwargs.get('address', None) - if address: - address = self.db.fixed_ip_associate(context, - address, - instance_ref['uuid'], - network['id']) - else: - address = self.db.fixed_ip_associate_pool(context.elevated(), - network['id'], - instance_ref['uuid']) - self._do_trigger_security_group_members_refresh_for_instance( - instance_id) - get_vif = self.db.virtual_interface_get_by_instance_and_network - vif = get_vif(context, instance_ref['uuid'], network['id']) - values = {'allocated': True, - 'virtual_interface_id': vif['id']} - self.db.fixed_ip_update(context, address, values) - - name = instance_ref['display_name'] - - if self._validate_instance_zone_for_dns_domain(context, instance_ref): - uuid = instance_ref['uuid'] - self.instance_dns_manager.create_entry(name, address, - "A", - self.instance_dns_domain) - self.instance_dns_manager.create_entry(uuid, address, - "A", - self.instance_dns_domain) - self._setup_network_on_host(context, network) - return address + # Check the quota; can't put this in the API because we get + # called into from other places + try: + reservations = QUOTAS.reserve(context, fixed_ips=1) + except exception.OverQuota: + pid = context.project_id + LOG.warn(_("Quota exceeded for %(pid)s, tried to allocate " + "fixed IP") % locals()) + raise exception.FixedIpLimitExceeded() + + try: + if network['cidr']: + address = kwargs.get('address', None) + if address: + address = self.db.fixed_ip_associate(context, + address, + instance_ref['uuid'], + network['id']) + else: + address = self.db.fixed_ip_associate_pool( + context.elevated(), network['id'], + instance_ref['uuid']) + self._do_trigger_security_group_members_refresh_for_instance( + instance_id) + get_vif = self.db.virtual_interface_get_by_instance_and_network + vif = get_vif(context, instance_ref['uuid'], network['id']) + values = {'allocated': True, + 'virtual_interface_id': vif['id']} + self.db.fixed_ip_update(context, address, values) + + name = instance_ref['display_name'] + + if self._validate_instance_zone_for_dns_domain(context, + instance_ref): + uuid = instance_ref['uuid'] + self.instance_dns_manager.create_entry( + name, address, "A", self.instance_dns_domain) + self.instance_dns_manager.create_entry( + uuid, address, "A", self.instance_dns_domain) + self._setup_network_on_host(context, network) + + QUOTAS.commit(context, reservations) + return address + + except Exception: + with excutils.save_and_reraise_exception(): + QUOTAS.rollback(context, reservations) def deallocate_fixed_ip(self, context, address, host=None, teardown=True): """Returns a fixed ip to the pool.""" @@ -1334,6 +1350,13 @@ context.elevated(read_deleted='yes'), fixed_ip_ref['instance_uuid']) + try: + reservations = QUOTAS.reserve(context, fixed_ips=-1) + except Exception: + reservations = None + LOG.exception(_("Failed to update usages deallocating " + "fixed IP")) + self._do_trigger_security_group_members_refresh_for_instance( instance['uuid']) @@ -1373,6 +1396,10 @@ # callback will get called by nova-dhcpbridge. self.driver.release_dhcp(dev, address, vif['address']) + # Commit the reservations + if reservations: + QUOTAS.commit(context, reservations) + def lease_fixed_ip(self, context, address): """Called by dhcp-bridge when ip is leased.""" LOG.debug(_('Leased IP |%(address)s|'), locals(), context=context) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nova-2012.2.4/nova/quota.py new/nova-2012.2.4/nova/quota.py --- old/nova-2012.2.4/nova/quota.py 2013-03-06 02:03:10.000000000 +0100 +++ new/nova-2012.2.4/nova/quota.py 2013-03-14 20:14:22.000000000 +0100 @@ -50,6 +50,10 @@ cfg.IntOpt('quota_floating_ips', default=10, help='number of floating ips allowed per project'), + cfg.IntOpt('quota_fixed_ips', + default=10, + help=('number of fixed ips allowed per project (this should be ' + 'at least the number of instances allowed)')), cfg.IntOpt('quota_metadata_items', default=128, help='number of metadata items allowed per instance'), @@ -778,6 +782,11 @@ context, project_id, session=session)) +def _sync_fixed_ips(context, project_id, session): + return dict(fixed_ips=db.fixed_ip_count_by_project( + context, project_id, session=session)) + + def _sync_security_groups(context, project_id, session): return dict(security_groups=db.security_group_count_by_project( context, project_id, session=session)) @@ -794,6 +803,7 @@ ReservableResource('gigabytes', _sync_volumes, 'quota_gigabytes'), ReservableResource('floating_ips', _sync_floating_ips, 'quota_floating_ips'), + ReservableResource('fixed_ips', _sync_fixed_ips, 'quota_fixed_ips'), AbsoluteResource('metadata_items', 'quota_metadata_items'), AbsoluteResource('injected_files', 'quota_injected_files'), AbsoluteResource('injected_file_content_bytes', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nova-2012.2.4/nova/scheduler/filters/affinity_filter.py new/nova-2012.2.4/nova/scheduler/filters/affinity_filter.py --- old/nova-2012.2.4/nova/scheduler/filters/affinity_filter.py 2013-03-06 02:03:10.000000000 +0100 +++ new/nova-2012.2.4/nova/scheduler/filters/affinity_filter.py 2013-03-14 20:14:22.000000000 +0100 @@ -25,12 +25,6 @@ def __init__(self): self.compute_api = compute.API() - def _all_hosts(self, context): - all_hosts = {} - for instance in self.compute_api.get_all(context): - all_hosts[instance['uuid']] = instance['host'] - return all_hosts - class DifferentHostFilter(AffinityFilter): '''Schedule the instance on a different host from a set of instances.''' @@ -38,15 +32,15 @@ def host_passes(self, host_state, filter_properties): context = filter_properties['context'] scheduler_hints = filter_properties.get('scheduler_hints') or {} - me = host_state.host affinity_uuids = scheduler_hints.get('different_host', []) if isinstance(affinity_uuids, basestring): affinity_uuids = [affinity_uuids] if affinity_uuids: - all_hosts = self._all_hosts(context) - return not any([i for i in affinity_uuids - if all_hosts.get(i) == me]) + return not self.compute_api.get_all(context, + {'host': host_state.host, + 'uuid': affinity_uuids, + 'deleted': False}) # With no different_host key return True @@ -59,16 +53,14 @@ def host_passes(self, host_state, filter_properties): context = filter_properties['context'] scheduler_hints = filter_properties.get('scheduler_hints') or {} - me = host_state.host affinity_uuids = scheduler_hints.get('same_host', []) if isinstance(affinity_uuids, basestring): affinity_uuids = [affinity_uuids] if affinity_uuids: - all_hosts = self._all_hosts(context) - return any([i for i - in affinity_uuids - if all_hosts.get(i) == me]) + return self.compute_api.get_all(context, {'host': host_state.host, + 'uuid': affinity_uuids, + 'deleted': False}) # With no same_host key return True diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nova-2012.2.4/nova/tests/api/openstack/compute/contrib/test_quota_classes.py new/nova-2012.2.4/nova/tests/api/openstack/compute/contrib/test_quota_classes.py --- old/nova-2012.2.4/nova/tests/api/openstack/compute/contrib/test_quota_classes.py 2013-03-06 02:03:10.000000000 +0100 +++ new/nova-2012.2.4/nova/tests/api/openstack/compute/contrib/test_quota_classes.py 2013-03-14 20:14:22.000000000 +0100 @@ -25,10 +25,11 @@ def quota_set(class_name): return {'quota_class_set': {'id': class_name, 'metadata_items': 128, 'volumes': 10, 'gigabytes': 1000, 'ram': 51200, - 'floating_ips': 10, 'instances': 10, 'injected_files': 5, - 'cores': 20, 'injected_file_content_bytes': 10240, - 'security_groups': 10, 'security_group_rules': 20, - 'key_pairs': 100, 'injected_file_path_bytes': 255}} + 'floating_ips': 10, 'fixed_ips': 10, 'instances': 10, + 'injected_files': 5, 'cores': 20, + 'injected_file_content_bytes': 10240, 'security_groups': 10, + 'security_group_rules': 20, 'key_pairs': 100, + 'injected_file_path_bytes': 255}} class QuotaClassSetsTest(test.TestCase): @@ -44,6 +45,7 @@ 'ram': 51200, 'volumes': 10, 'floating_ips': 10, + 'fixed_ips': 10, 'metadata_items': 128, 'gigabytes': 1000, 'injected_files': 5, @@ -91,7 +93,8 @@ body = {'quota_class_set': {'instances': 50, 'cores': 50, 'ram': 51200, 'volumes': 10, 'gigabytes': 1000, 'floating_ips': 10, - 'metadata_items': 128, 'injected_files': 5, + 'fixed_ips': 10, 'metadata_items': 128, + 'injected_files': 5, 'injected_file_content_bytes': 10240, 'injected_file_path_bytes': 255, 'security_groups': 10, @@ -139,6 +142,7 @@ gigabytes=40, ram=50, floating_ips=60, + fixed_ips=10, instances=70, injected_files=80, security_groups=10, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nova-2012.2.4/nova/tests/api/openstack/compute/contrib/test_quotas.py new/nova-2012.2.4/nova/tests/api/openstack/compute/contrib/test_quotas.py --- old/nova-2012.2.4/nova/tests/api/openstack/compute/contrib/test_quotas.py 2013-03-06 02:03:10.000000000 +0100 +++ new/nova-2012.2.4/nova/tests/api/openstack/compute/contrib/test_quotas.py 2013-03-14 20:14:22.000000000 +0100 @@ -26,11 +26,12 @@ def quota_set(id): return {'quota_set': {'id': id, 'metadata_items': 128, 'volumes': 10, - 'gigabytes': 1000, 'ram': 51200, 'floating_ips': 10, - 'instances': 10, 'injected_files': 5, 'cores': 20, - 'injected_file_content_bytes': 10240, - 'security_groups': 10, 'security_group_rules': 20, - 'key_pairs': 100, 'injected_file_path_bytes': 255}} + 'gigabytes': 1000, 'ram': 51200, 'floating_ips': 10, + 'fixed_ips': 10, 'instances': 10, + 'injected_files': 5, 'cores': 20, + 'injected_file_content_bytes': 10240, + 'security_groups': 10, 'security_group_rules': 20, + 'key_pairs': 100, 'injected_file_path_bytes': 255}} class QuotaSetsTest(test.TestCase): @@ -46,6 +47,7 @@ 'ram': 51200, 'volumes': 10, 'floating_ips': 10, + 'fixed_ips': 10, 'metadata_items': 128, 'gigabytes': 1000, 'injected_files': 5, @@ -88,6 +90,7 @@ 'volumes': 10, 'gigabytes': 1000, 'floating_ips': 10, + 'fixed_ips': 10, 'metadata_items': 128, 'injected_files': 5, 'injected_file_path_bytes': 255, @@ -120,7 +123,7 @@ 'injected_file_path_bytes': 255, 'security_groups': 10, 'security_group_rules': 20, - 'key_pairs': 100}} + 'key_pairs': 100, 'fixed_ips': 10}} req = fakes.HTTPRequest.blank('/v2/fake4/os-quota-sets/update_me', use_admin_context=True) @@ -171,6 +174,7 @@ gigabytes=40, ram=50, floating_ips=60, + fixed_ips=10, instances=70, injected_files=80, security_groups=10, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nova-2012.2.4/nova/tests/compute/test_compute.py new/nova-2012.2.4/nova/tests/compute/test_compute.py --- old/nova-2012.2.4/nova/tests/compute/test_compute.py 2013-03-06 02:03:10.000000000 +0100 +++ new/nova-2012.2.4/nova/tests/compute/test_compute.py 2013-03-14 20:14:22.000000000 +0100 @@ -2331,7 +2331,7 @@ instances = db.instance_get_all(ctxt) LOG.info(_("After force-killing instances: %s"), instances) self.assertEqual(len(instances), 1) - self.assertEqual(task_states.STOPPING, instances[0]['task_state']) + self.assertEqual(instances[0]['task_state'], None) def test_add_instance_fault(self): exc_info = None diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nova-2012.2.4/nova/tests/network/test_manager.py new/nova-2012.2.4/nova/tests/network/test_manager.py --- old/nova-2012.2.4/nova/tests/network/test_manager.py 2013-03-06 02:03:11.000000000 +0100 +++ new/nova-2012.2.4/nova/tests/network/test_manager.py 2013-03-14 20:14:22.000000000 +0100 @@ -30,6 +30,7 @@ from nova.openstack.common import log as logging from nova.openstack.common import rpc import nova.policy +from nova import quota from nova import test from nova.tests import fake_network from nova import utils @@ -278,6 +279,7 @@ self.mox.StubOutWithMock(db, 'virtual_interface_get_by_instance_and_network') self.mox.StubOutWithMock(db, 'fixed_ip_update') + self.mox.StubOutWithMock(quota.QUOTAS, 'reserve') db.fixed_ip_update(mox.IgnoreArg(), mox.IgnoreArg(), @@ -291,6 +293,10 @@ db.instance_get(mox.IgnoreArg(), mox.IgnoreArg()).AndReturn({'security_groups': [{'id': 0}]}) + + quota.QUOTAS.reserve(mox.IgnoreArg(), + fixed_ips=mox.IgnoreArg()).AndReturn(None) + db.fixed_ip_associate_pool(mox.IgnoreArg(), mox.IgnoreArg(), mox.IgnoreArg()).AndReturn('192.168.0.101') @@ -310,6 +316,7 @@ self.mox.StubOutWithMock(db, 'virtual_interface_get_by_instance_and_network') self.mox.StubOutWithMock(db, 'fixed_ip_update') + self.mox.StubOutWithMock(quota.QUOTAS, 'reserve') db.fixed_ip_update(mox.IgnoreArg(), mox.IgnoreArg(), @@ -323,6 +330,10 @@ db.instance_get(mox.IgnoreArg(), mox.IgnoreArg()).AndReturn({'security_groups': [{'id': 0}]}) + + quota.QUOTAS.reserve(mox.IgnoreArg(), + fixed_ips=mox.IgnoreArg()).AndReturn(None) + db.fixed_ip_associate_pool(mox.IgnoreArg(), mox.IgnoreArg(), mox.IgnoreArg()).AndReturn('192.168.0.101') @@ -376,6 +387,7 @@ self.mox.StubOutWithMock(db, 'virtual_interface_get_by_instance_and_network') self.mox.StubOutWithMock(db, 'fixed_ip_update') + self.mox.StubOutWithMock(quota.QUOTAS, 'reserve') db.fixed_ip_update(mox.IgnoreArg(), mox.IgnoreArg(), @@ -390,6 +402,9 @@ mox.IgnoreArg()).AndReturn({'security_groups': [{'id': 0}]}) + quota.QUOTAS.reserve(mox.IgnoreArg(), + fixed_ips=mox.IgnoreArg()).AndReturn(None) + db.fixed_ip_associate_pool(mox.IgnoreArg(), mox.IgnoreArg(), mox.IgnoreArg()).AndReturn(fixedip) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nova-2012.2.4/nova/tests/scheduler/test_host_filters.py new/nova-2012.2.4/nova/tests/scheduler/test_host_filters.py --- old/nova-2012.2.4/nova/tests/scheduler/test_host_filters.py 2013-03-06 02:03:11.000000000 +0100 +++ new/nova-2012.2.4/nova/tests/scheduler/test_host_filters.py 2013-03-14 20:14:22.000000000 +0100 @@ -350,6 +350,20 @@ self.assertTrue(filt_cls.host_passes(host, filter_properties)) + def test_affinity_different_filter_handles_deleted_instance(self): + filt_cls = self.class_map['DifferentHostFilter']() + host = fakes.FakeHostState('host1', 'node1', {}) + instance = fakes.FakeInstance(context=self.context, + params={'host': 'host1'}) + instance_uuid = instance.uuid + db.instance_destroy(self.context, instance_uuid) + + filter_properties = {'context': self.context.elevated(), + 'scheduler_hints': { + 'different_host': [instance_uuid], }} + + self.assertTrue(filt_cls.host_passes(host, filter_properties)) + def test_affinity_same_filter_no_list_passes(self): filt_cls = self.class_map['SameHostFilter']() host = fakes.FakeHostState('host1', 'compute', {}) @@ -401,6 +415,20 @@ self.assertTrue(filt_cls.host_passes(host, filter_properties)) + def test_affinity_same_filter_handles_deleted_instance(self): + filt_cls = self.class_map['SameHostFilter']() + host = fakes.FakeHostState('host1', 'node1', {}) + instance = fakes.FakeInstance(context=self.context, + params={'host': 'host1'}) + instance_uuid = instance.uuid + db.instance_destroy(self.context, instance_uuid) + + filter_properties = {'context': self.context.elevated(), + 'scheduler_hints': { + 'same_host': [instance_uuid], }} + + self.assertFalse(filt_cls.host_passes(host, filter_properties)) + def test_affinity_simple_cidr_filter_passes(self): filt_cls = self.class_map['SimpleCIDRAffinityFilter']() host = fakes.FakeHostState('host1', 'compute', {}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nova-2012.2.4/nova/tests/test_quota.py new/nova-2012.2.4/nova/tests/test_quota.py --- old/nova-2012.2.4/nova/tests/test_quota.py 2013-03-06 02:03:11.000000000 +0100 +++ new/nova-2012.2.4/nova/tests/test_quota.py 2013-03-14 20:14:22.000000000 +0100 @@ -723,6 +723,7 @@ quota_volumes=10, quota_gigabytes=1000, quota_floating_ips=10, + quota_fixed_ips=10, quota_metadata_items=128, quota_injected_files=5, quota_injected_file_content_bytes=10 * 1024, @@ -755,6 +756,7 @@ volumes=10, gigabytes=1000, floating_ips=10, + fixed_ips=10, metadata_items=128, injected_files=5, injected_file_content_bytes=10 * 1024, @@ -791,6 +793,7 @@ volumes=10, gigabytes=500, floating_ips=10, + fixed_ips=10, metadata_items=64, injected_files=5, injected_file_content_bytes=5 * 1024, @@ -847,6 +850,7 @@ self._stub_quota_class_get_all_by_name() def test_get_project_quotas(self): + self.maxDiff = None self._stub_get_by_project() result = self.driver.get_project_quotas( FakeContext('test_project', 'test_class'), @@ -888,6 +892,11 @@ in_use=2, reserved=0, ), + fixed_ips=dict( + limit=10, + in_use=0, + reserved=0, + ), metadata_items=dict( limit=64, in_use=0, @@ -926,6 +935,7 @@ )) def test_get_project_quotas_alt_context_no_class(self): + self.maxDiff = None self._stub_get_by_project() result = self.driver.get_project_quotas( FakeContext('other_project', 'other_class'), @@ -966,6 +976,11 @@ in_use=2, reserved=0, ), + fixed_ips=dict( + limit=10, + in_use=0, + reserved=0, + ), metadata_items=dict( limit=128, in_use=0, @@ -1004,6 +1019,7 @@ )) def test_get_project_quotas_alt_context_with_class(self): + self.maxDiff = None self._stub_get_by_project() result = self.driver.get_project_quotas( FakeContext('other_project', 'other_class'), @@ -1045,6 +1061,11 @@ in_use=2, reserved=0, ), + fixed_ips=dict( + limit=10, + in_use=0, + reserved=0, + ), metadata_items=dict( limit=64, in_use=0, @@ -1145,6 +1166,9 @@ floating_ips=dict( limit=10, ), + fixed_ips=dict( + limit=10, + ), metadata_items=dict( limit=64, ), -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0