December 2013 - openSUSE Commits - openSUSE Mailing Lists

commit gtkmm-documentation for openSUSE:Factory
by root＠hilbert.suse.de 30 Dec '13

30 Dec '13

Hello community, here is the log from the commit of package gtkmm-documentation for openSUSE:Factory checked in at 2013-12-30 09:55:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gtkmm-documentation (Old) and /work/SRC/openSUSE:Factory/.gtkmm-documentation.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gtkmm-documentation" Changes: -------- --- /work/SRC/openSUSE:Factory/gtkmm-documentation/gtkmm-documentation.changes 2013-06-25 14:40:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gtkmm-documentation.new/gtkmm-documentation.changes 2013-12-30 09:55:43.000000000 +0100 @@ -1,0 +2,24 @@ +Tue Oct 22 16:07:21 UTC 2013 - zaitor(a)opensuse.org + +- Update to version 3.9.1: + + Port examples from GtkUIManager, GtkAction and GtkMenu to + GtkBuilder, GAction and GMenu. We have not yet updated the book + text about these. + + Remove use of (deprecated) stock items. + + Added HeaderBar example, though we do not yet have a book + chapter about it. + + Added ListBox example, though we do not yet have a book chapter + about it. + + Added PlacesSidebar example, though we do not yet have a book + chapter about it. + + Added Revealer example, though we do not yet have a book + chapter about it. + + Added SearchBar example, though we do not yet have a book + chapter about it. + + Multi-Threaded Programs chapter: Added a multi-threaded example + program. + + treemodelcustom: Use the new base class order. + + gmmproc appendix: Document new features. + + Build: Move to a generated ChangeLog. + +------------------------------------------------------------------- Old: ---- gtkmm-documentation-3.8.0.tar.xz New: ---- gtkmm-documentation-3.9.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gtkmm-documentation.spec ++++++ --- /var/tmp/diff_new_pack.zzMuoK/_old 2013-12-30 09:55:44.000000000 +0100 +++ /var/tmp/diff_new_pack.zzMuoK/_new 2013-12-30 09:55:44.000000000 +0100 @@ -17,17 +17,17 @@ Name: gtkmm-documentation -Version: 3.8.0 +Version: 3.9.1 Release: 0 Summary: C++ Bindings for GTK+ -- Documentation License: GFDL-1.2 and GPL-2.0+ Group: Documentation/Other Url: http://www.gnome.org -Source: http://download.gnome.org/sources/gtkmm-documentation/3.8/%{name}-%{version… +Source: http://download.gnome.org/sources/gtkmm-documentation/3.9/%{name}-%{version… BuildRequires: gcc-c++ BuildRequires: gnome-doc-utils-devel -BuildRequires: pkgconfig(giomm-2.4) >= 2.32.0 -BuildRequires: pkgconfig(gtkmm-3.0) >= 3.4.0 +BuildRequires: pkgconfig(giomm-2.4) >= 2.36.0 +BuildRequires: pkgconfig(gtkmm-3.0) >= 3.10.0 Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch ++++++ gtkmm-documentation-3.8.0.tar.xz -> gtkmm-documentation-3.9.1.tar.xz ++++++ ++++ 113818 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 gnote for openSUSE:Factory
by root＠hilbert.suse.de 30 Dec '13

30 Dec '13

Hello community, here is the log from the commit of package gnote for openSUSE:Factory checked in at 2013-12-30 09:54:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnote (Old) and /work/SRC/openSUSE:Factory/.gnote.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnote" Changes: -------- --- /work/SRC/openSUSE:Factory/gnote/gnote.changes 2013-09-29 19:24:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gnote.new/gnote.changes 2013-12-30 09:54:38.000000000 +0100 @@ -1,0 +2,27 @@ +Mon Nov 4 09:34:52 UTC 2013 - dimstar(a)opensuse.org + +- Update to version 3.11.0: + + Updated boost.m4. + + Rename add-ins -> plugins (bgo#700422). + + Change title Notes -> Gnote (bgo#701854). + + Add TODO plug-in. + + Remember spell-check language per note (bgo#586350). + + Add ability to disable spell check per note (bgo#703258). + + Add options to disable url and note autolinking (bgo#633855). + + Add links tab to preferences dialog. + + Add plug-in to export to Getting Things GNOME (bgo#697934). + +------------------------------------------------------------------- +Tue Oct 29 18:46:01 UTC 2013 - dimstar(a)opensuse.org + +- Update to version 3.10.1: + + Add missing space in user visible string (bgo#709494). + + Fix spell-check breaking note links (bgo#703664). + + Fix note rename dialog freeze. + + Fix formatting breaking links (bgo#702160, bgo#702239). + + Fix internal links merging with other links. + + Fix crash when disabling note add-in. + + Fix build without C++11 (bgo#710949). + + Updated translations. + +------------------------------------------------------------------- Old: ---- gnote-3.10.0.tar.xz New: ---- gnote-3.11.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnote.spec ++++++ --- /var/tmp/diff_new_pack.Bbfvc2/_old 2013-12-30 09:54:39.000000000 +0100 +++ /var/tmp/diff_new_pack.Bbfvc2/_new 2013-12-30 09:54:39.000000000 +0100 @@ -17,13 +17,13 @@ Name: gnote -Version: 3.10.0 +Version: 3.11.0 Release: 0 Summary: A Port of Tomboy to C++ License: GPL-3.0+ Group: Productivity/Text/Editors Url: http://live.gnome.org/Gnote -Source: http://download.gnome.org/sources/gnote/3.10/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/gnote/3.11/%{name}-%{version}.tar.xz BuildRequires: boost-devel >= 1.34 BuildRequires: fdupes BuildRequires: gcc-c++ @@ -96,7 +96,7 @@ %{_bindir}/gnote %{_libdir}/gnote/ # Splitting does not make sense as it's just a lib for gnote itself (and it's plugins) -%{_libdir}/libgnote-3.10.so* +%{_libdir}/libgnote-3.11.so* %{_libdir}/libgnote.so %{_datadir}/applications/gnote.desktop %{_datadir}/glib-2.0/schemas/org.gnome.gnote.gschema.xml ++++++ gnote-3.10.0.tar.xz -> gnote-3.11.0.tar.xz ++++++ ++++ 20715 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 gnome-music for openSUSE:Factory
by root＠hilbert.suse.de 30 Dec '13

30 Dec '13

Hello community, here is the log from the commit of package gnome-music for openSUSE:Factory checked in at 2013-12-30 09:53:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-music (Old) and /work/SRC/openSUSE:Factory/.gnome-music.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnome-music" Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-music/gnome-music.changes 2013-10-15 10:40:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gnome-music.new/gnome-music.changes 2013-12-30 09:53:59.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Nov 28 18:16:07 UTC 2013 - dimstar(a)opensuse.org + +- Add gnome-music-without-gsd.patch: allow to launch gnome-music + without gnome-settings-daemon, so outside of a gnome session + (bnc#852362, bgo#709234). + +------------------------------------------------------------------- New: ---- gnome-music-without-gsd.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-music.spec ++++++ --- /var/tmp/diff_new_pack.YzAvTS/_old 2013-12-30 09:54:00.000000000 +0100 +++ /var/tmp/diff_new_pack.YzAvTS/_new 2013-12-30 09:54:00.000000000 +0100 @@ -24,6 +24,8 @@ Group: Productivity/Multimedia/Sound/Players Url: http://www.gnome.org Source: http://download.gnome.org/sources/gnome-music/3.10/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM gnome-music-without-gsd.patch bnc#852362 bgo#709234 dimstar(a)opensuse.org -- Allow launching gnome-music outside of a gnome-session +Patch0: gnome-music-without-gsd.patch BuildRequires: fdupes BuildRequires: intltool >= 0.26 BuildRequires: itstool @@ -53,6 +55,7 @@ %lang_package %prep %setup -q +%patch0 -p1 %build %configure ++++++ gnome-music-without-gsd.patch ++++++ >From 0cac582edb437b1473a2451b0003f54c302907f7 Mon Sep 17 00:00:00 2001 From: Vadim Rutkovsky <vrutkovs(a)redhat.com> Date: Thu, 28 Nov 2013 10:51:28 +0000 Subject: Bug 709234 - don't crash if we can't connect to settings daemon --- diff --git a/gnomemusic/window.py b/gnomemusic/window.py index 79e69a8..daa27f0 100644 --- a/gnomemusic/window.py +++ b/gnomemusic/window.py @@ -82,7 +82,11 @@ class Window(Gtk.ApplicationWindow): 'org.gnome.SettingsDaemon.MediaKeys', None) self._grab_media_player_keys() - self.proxy.connect('g-signal', self._handle_media_keys) + try: + self.proxy.connect('g-signal', self._handle_media_keys) + except GLib.GError: + # We cannot grab media keys if no settings daemon is running + pass def on_configure_event(self, widget, event): size = widget.get_size() @@ -95,11 +99,15 @@ class Window(Gtk.ApplicationWindow): self.settings.set_boolean('window-maximized', 'GDK_WINDOW_STATE_MAXIMIZED' in event.new_window_state.value_names) def _grab_media_player_keys(self): - self.proxy.call_sync('GrabMediaPlayerKeys', - GLib.Variant('(su)', ('Music', 0)), - Gio.DBusCallFlags.NONE, - -1, - None) + try: + self.proxy.call_sync('GrabMediaPlayerKeys', + GLib.Variant('(su)', ('Music', 0)), + Gio.DBusCallFlags.NONE, + -1, + None) + except GLib.GError: + # We cannot grab media keys if no settings daemon is running + pass def _windows_focus_cb(self, window, event): self._grab_media_player_keys() -- cgit v0.9.2 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gdk-pixbuf for openSUSE:Factory
by root＠hilbert.suse.de 30 Dec '13

30 Dec '13

Hello community, here is the log from the commit of package gdk-pixbuf for openSUSE:Factory checked in at 2013-12-30 09:53:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gdk-pixbuf (Old) and /work/SRC/openSUSE:Factory/.gdk-pixbuf.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gdk-pixbuf" Changes: -------- --- /work/SRC/openSUSE:Factory/gdk-pixbuf/gdk-pixbuf.changes 2013-11-13 10:16:50.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gdk-pixbuf.new/gdk-pixbuf.changes 2013-12-30 09:53:33.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Dec 17 11:38:54 UTC 2013 - dimstar(a)opensuse.org + +- Update to version 2.30.2: + + jpeg: fix icc profile loading and improve error handling. + + Make --update-cache work better. + + Updated translations. + +------------------------------------------------------------------- Old: ---- gdk-pixbuf-2.30.1.tar.xz New: ---- gdk-pixbuf-2.30.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gdk-pixbuf.spec ++++++ --- /var/tmp/diff_new_pack.Y1WbxV/_old 2013-12-30 09:53:33.000000000 +0100 +++ /var/tmp/diff_new_pack.Y1WbxV/_new 2013-12-30 09:53:33.000000000 +0100 @@ -20,7 +20,7 @@ %define gdk_pixbuf_binary_version 2.10.0 Name: gdk-pixbuf -Version: 2.30.1 +Version: 2.30.2 Release: 0 Summary: An image loading library License: LGPL-2.1+ ++++++ gdk-pixbuf-2.30.1.tar.xz -> gdk-pixbuf-2.30.2.tar.xz ++++++ ++++ 10753 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 gd for openSUSE:Factory
by root＠hilbert.suse.de 30 Dec '13

30 Dec '13

Hello community, here is the log from the commit of package gd for openSUSE:Factory checked in at 2013-12-30 09:52:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gd (Old) and /work/SRC/openSUSE:Factory/.gd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gd" Changes: -------- --- /work/SRC/openSUSE:Factory/gd/gd.changes 2013-12-26 17:36:50.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gd.new/gd.changes 2013-12-30 09:52:09.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Dec 27 07:42:11 UTC 2013 - tchvatal(a)suse.com + +- Cleanup here&there to parallelize everything +- Remove bogus cmake dependency + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gd.spec ++++++ --- /var/tmp/diff_new_pack.u4ORS3/_old 2013-12-30 09:52:10.000000000 +0100 +++ /var/tmp/diff_new_pack.u4ORS3/_new 2013-12-30 09:52:10.000000000 +0100 @@ -17,27 +17,13 @@ %define prjname libgd - Name: gd -BuildRequires: cmake -BuildRequires: fontconfig-devel -BuildRequires: freetype2-devel -BuildRequires: libjpeg-devel -BuildRequires: libpng-devel -BuildRequires: libtool -BuildRequires: pkg-config -BuildRequires: xorg-x11-libX11-devel -BuildRequires: xorg-x11-libXau-devel -BuildRequires: xorg-x11-libXdmcp-devel -BuildRequires: xorg-x11-libXpm-devel -Provides: gdlib -Obsoletes: gdlib Version: 2.1.0 Release: 0 -Url: http://libgd.bitbucket.org/ Summary: A Drawing Library for Programs That Use PNG and JPEG Output License: MIT Group: System/Libraries +Url: http://libgd.bitbucket.org/ Source: https://bitbucket.org/libgd/gd-libgd/downloads/libgd-%{version}.tar.xz Source1: baselibs.conf # to be upstreamed, gdlib-config --libs to return the same as pkg-config --libs gdlib @@ -50,6 +36,18 @@ Patch3: gd-aliasing.patch # could be upstreamed? Patch4: gd-autoconf.patch +BuildRequires: fontconfig-devel +BuildRequires: freetype2-devel +BuildRequires: libjpeg-devel +BuildRequires: libpng-devel +BuildRequires: libtool +BuildRequires: pkg-config +BuildRequires: xorg-x11-libX11-devel +BuildRequires: xorg-x11-libXau-devel +BuildRequires: xorg-x11-libXdmcp-devel +BuildRequires: xorg-x11-libXpm-devel +Provides: gdlib = %{version} +Obsoletes: gdlib < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -59,10 +57,10 @@ and is supported by PHP. %package devel -Requires: %{name} = %{version} -Requires: glibc-devel Summary: Drawing Library for Programs with PNG and JPEG Output Group: Development/Libraries/C and C++ +Requires: %{name} = %{version} +Requires: glibc-devel Requires: libpng-devel Requires: zlib-devel @@ -73,8 +71,6 @@ useful in World Wide Web applications, where PNG and JPEG are two of the formats accepted for inline images by most browsers. - - %prep %setup -q -n %{prjname}-%{version} %patch0 @@ -82,22 +78,27 @@ %patch2 %patch3 %patch4 + %build autoreconf -fiv +# without-x -- useless switch which just mangles cflags %configure \ + --without-x \ + --with-fontconfig \ --with-freetype \ --with-jpeg \ - --with-png=%{?_sysroot}/%_prefix \ + --with-png \ --with-xpm \ --disable-static \ --with-pic make %{?_smp_mflags} %check -make check +make check %{?_smp_mflags} %install -make install DESTDIR=$RPM_BUILD_ROOT +make DESTDIR=%{buildroot} install %{?_smp_mflags} +find %{buildroot} -type f -name "*.la" -delete -print %post -p /sbin/ldconfig @@ -106,18 +107,18 @@ %files %defattr(-,root,root) %doc COPYING NEWS examples -/usr/bin/annotate -/usr/bin/bdftogd -/usr/bin/gd2copypal -/usr/bin/gd2togif -/usr/bin/gd2topng -/usr/bin/gdcmpgif -/usr/bin/gdparttopng -/usr/bin/gdtopng -/usr/bin/giftogd2 -/usr/bin/pngtogd -/usr/bin/pngtogd2 -/usr/bin/webpng +%{_bindir}/annotate +%{_bindir}/bdftogd +%{_bindir}/gd2copypal +%{_bindir}/gd2togif +%{_bindir}/gd2topng +%{_bindir}/gdcmpgif +%{_bindir}/gdparttopng +%{_bindir}/gdtopng +%{_bindir}/giftogd2 +%{_bindir}/pngtogd +%{_bindir}/pngtogd2 +%{_bindir}/webpng %{_libdir}/*.so.* %files devel @@ -126,6 +127,5 @@ %{_includedir}/* %{_libdir}/*.so %{_libdir}/pkgconfig/gdlib.pc -%exclude %{_libdir}/*.la %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 erlang for openSUSE:Factory
by root＠hilbert.suse.de 30 Dec '13

30 Dec '13

Hello community, here is the log from the commit of package erlang for openSUSE:Factory checked in at 2013-12-30 09:51:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/erlang (Old) and /work/SRC/openSUSE:Factory/.erlang.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "erlang" Changes: -------- --- /work/SRC/openSUSE:Factory/erlang/erlang.changes 2013-09-25 17:12:17.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.erlang.new/erlang.changes 2013-12-30 09:51:54.000000000 +0100 @@ -1,0 +2,34 @@ +Sat Dec 21 11:05:07 UTC 2013 - matwey.kornilov(a)gmail.com + +- Add crypto.patch: fix compilation with openssl having EC disabled + +------------------------------------------------------------------- +Fri Dec 20 19:51:06 UTC 2013 - matwey.kornilov(a)gmail.com + +- Fixing systemd. +- Warning: variables in /etc/sysconfig/erlang must be set and filled. + +------------------------------------------------------------------- +Fri Dec 20 14:51:25 UTC 2013 - kruber(a)zib.de + +- update to R16B03 release: + + A new memory allocation feature called "super carrier" has + been introduced. It can for example be used for pre-allocation + of all memory that the runtime system should be able to use. + It is enabled by passing the +MMscs (size in MB) command line + argument. For more information see the documentation of the + +MMsco, +MMscrfsd, +MMscrpm, +MMscs, +MMusac, and, +Mlpm + command line arguments in the erts_alloc(3) documentation. + + The ldap client eldap now supports the start_tls operation. + This upgrades an existing tcp connection to encryption using + tls, see eldap:start_tls/2 and /3. + + The ftp client (inets application) now supports ftp over tls + (ftps). +- adapt patch erlang-not-install-misc.patch + +------------------------------------------------------------------- +Sun Oct 27 17:07:46 UTC 2013 - p.drouand(a)gmail.com + +- Add systemd support for openSUSE >= 12.3 + +------------------------------------------------------------------- Old: ---- otp_doc_html_R16B02.tar.gz otp_doc_man_R16B02.tar.gz otp_src_R16B02.tar.gz New: ---- crypto.patch epmd.service epmd.socket otp_doc_html_R16B03.tar.gz otp_doc_man_R16B03.tar.gz otp_src_R16B03.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ erlang.spec ++++++ --- /var/tmp/diff_new_pack.w9SaQ5/_old 2013-12-30 09:51:59.000000000 +0100 +++ /var/tmp/diff_new_pack.w9SaQ5/_new 2013-12-30 09:51:59.000000000 +0100 @@ -17,7 +17,7 @@ Name: erlang -Version: R16B02 +Version: R16B03 Release: 0 Summary: General-purpose programming language and runtime environment License: ErlPL-1.1 @@ -33,6 +33,8 @@ Source4: epmd.init Source5: erlang.sysconfig Source6: macros.erlang +Source7: epmd.service +Source8: epmd.socket # PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch0: otp-R16B-rpath.patch # PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines @@ -41,6 +43,8 @@ Patch3: fix-armv7hl.patch # PATCH-FIX-OPENSUSE erlang-not-install-misc.patch - matwey.kornilov(a)gmail.com -- patch from Fedora, this removes unneeded magic Patch4: erlang-not-install-misc.patch +# PATCH-FIX-UPSTREAM crypto.patch - matwey.kornilov(a)gmail.com -- fix compilation with disabled EC in openssl +Patch5: crypto.patch # autoconf is required only by fix-armv7hl.patch BuildRequires: autoconf BuildRequires: gcc-c++ @@ -54,12 +58,8 @@ BuildRequires: Mesa-devel BuildRequires: java-devel >= 1.6.0 BuildRequires: krb5-devel -%if 0%{?sles_version} >= 10 BuildRequires: update-alternatives -%endif -%if 0%{?suse_version} > 1020 BuildRequires: fdupes -%endif %if 0%{?suse_version} >= 1140 BuildRequires: wxWidgets @@ -70,6 +70,12 @@ BuildRequires: wxGTK-devel >= 2.8 %endif +%if 0%{?suse_version} >=1230 +BuildRequires: pkgconfig(systemd) +%{?systemd_requires} +%define have_systemd 1 +%endif + %define epmd_home %{_var}/lib/epmd %description @@ -287,6 +293,7 @@ %patch1 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 chmod -R u+w . # enable dynamic linking for ssl @@ -383,11 +390,17 @@ %endif install -d -m 0750 %{buildroot}%{epmd_home} +install -d -m 0755 %{buildroot}%{_sbindir} +%if 0%{?have_systemd} +install -D -m 0644 %{S:7} %{buildroot}%{_unitdir}/%{name}.service +install -D -m 0644 %{S:8} %{buildroot}%{_unitdir}/%{name}.socket +ln -s /sbin/service %{buildroot}%{_sbindir}/rcepmd +%else +ln -s /etc/init.d/epmd %{buildroot}%{_sbindir}/rcepmd +%endif install -D -m 0755 %{S:4} %{buildroot}/etc/init.d/epmd install -D -m 0644 %{S:5} %{buildroot}/var/adm/fillup-templates/sysconfig.erlang install -D -m 0644 %{S:6} %{buildroot}%{_sysconfdir}/rpm/macros.erlang -install -d -m 0755 %{buildroot}%{_sbindir} -ln -s /etc/init.d/epmd %{buildroot}%{_sbindir}/rcepmd %pre /usr/sbin/groupadd -r epmd &>/dev/null || : @@ -398,9 +411,15 @@ %fillup_only erlang %preun +%if 0%{?have_systemd} +%service_del_preun %{name}.service %{name}.socket +%endif %stop_on_removal epmd %postun +%if 0%{?have_systemd} +%service_del_postun %{name}.service %{name}.socket +%endif %restart_on_update epmd %{insserv_cleanup} @@ -472,6 +491,10 @@ %{_libdir}/erlang/Install %{_datadir}/emacs/site-lisp/erlang.el %dir %attr(-,epmd,epmd) %{epmd_home} +%if 0%{?have_systemd} +%{_unitdir}/%{name}.service +%{_unitdir}/%{name}.socket +%endif /etc/init.d/epmd %{_sbindir}/rcepmd /var/adm/fillup-templates/sysconfig.erlang ++++++ crypto.patch ++++++ commit d485136c670954ea8d933b332f39f9265727c745 Author: Matwey V. Kornilov <matwey.kornilov(a)gmail.com> Date: Sat Dec 21 00:13:35 2013 +0400 In openssl 1.0.1e EC_GROUP_new_curve_GF2m function is wrapped by #ifndef OPENSSL_NO_EC2M. We have to check whether OPENSSL_NO_EC2M is set, and if it is, then we do not have EC_GROUP_new_curve_GF2m function and do not HAVE_EC. diff --git a/lib/crypto/c_src/crypto.c b/lib/crypto/c_src/crypto.c index 42fb172..421d643 100644 --- a/lib/crypto/c_src/crypto.c +++ b/lib/crypto/c_src/crypto.c @@ -77,7 +77,8 @@ #if OPENSSL_VERSION_NUMBER >= 0x009080ffL \ && !defined(OPENSSL_NO_EC) \ && !defined(OPENSSL_NO_ECDH) \ - && !defined(OPENSSL_NO_ECDSA) + && !defined(OPENSSL_NO_ECDSA) \ + && !defined(OPENSSL_NO_EC2M) # define HAVE_EC #endif ++++++ epmd.service ++++++ [Unit] Description=Erlang Port Mapper Daemon [Service] EnvironmentFile=/etc/sysconfig/erlang ExecStart=/usr/bin/epmd -daemon -address ${EPMD_ADDRESSES} -port ${EPMD_PORT} ExecStop=/usr/bin/epmd -kill Type=forking [Install] WantedBy=multi-user.target ++++++ epmd.socket ++++++ [Unit] Conflicts=epmd.service [Socket] ListenStream=4369 Accept=no [Install] WantedBy=sockets.target ++++++ erlang-not-install-misc.patch ++++++ --- /var/tmp/diff_new_pack.w9SaQ5/_old 2013-12-30 09:51:59.000000000 +0100 +++ /var/tmp/diff_new_pack.w9SaQ5/_new 2013-12-30 09:51:59.000000000 +0100 @@ -29,9 +29,9 @@ --- otp_src_R16B02.orig/erts/etc/unix/Install.src +++ otp_src_R16B02/erts/etc/unix/Install.src @@ -140,14 +140,4 @@ cp -p ../releases/%I_SYSTEM_VSN%/start_* + cp -p ../releases/%I_SYSTEM_VSN%/no_dot_erlang.boot . cp -p $Name.boot start.boot cp -p ../releases/%I_SYSTEM_VSN%/$Name.script start.script - -# -# Fixing the man pages -# ++++++ erlang.sysconfig ++++++ --- /var/tmp/diff_new_pack.w9SaQ5/_old 2013-12-30 09:51:59.000000000 +0100 +++ /var/tmp/diff_new_pack.w9SaQ5/_new 2013-12-30 09:51:59.000000000 +0100 @@ -15,6 +15,6 @@ ## Default: "4369" ## ServiceRestart: epmd # -# Options for sshd +# Port that EPMD should listen on. # -EPMD_PORT="" +EPMD_PORT="4369" ++++++ otp_doc_html_R16B02.tar.gz -> otp_doc_html_R16B03.tar.gz ++++++ /work/SRC/openSUSE:Factory/erlang/otp_doc_html_R16B02.tar.gz /work/SRC/openSUSE:Factory/.erlang.new/otp_doc_html_R16B03.tar.gz differ: char 5, line 1 ++++++ otp_doc_man_R16B02.tar.gz -> otp_doc_man_R16B03.tar.gz ++++++ ++++ 6747 lines of diff (skipped) ++++++ otp_src_R16B02.tar.gz -> otp_src_R16B03.tar.gz ++++++ /work/SRC/openSUSE:Factory/erlang/otp_src_R16B02.tar.gz /work/SRC/openSUSE:Factory/.erlang.new/otp_src_R16B03.tar.gz differ: char 5, 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 elemines for openSUSE:Factory
by root＠hilbert.suse.de 30 Dec '13

30 Dec '13

Hello community, here is the log from the commit of package elemines for openSUSE:Factory checked in at 2013-12-30 09:51:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/elemines (Old) and /work/SRC/openSUSE:Factory/.elemines.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "elemines" Changes: -------- --- /work/SRC/openSUSE:Factory/elemines/elemines.changes 2013-04-23 17:18:31.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.elemines.new/elemines.changes 2013-12-30 09:51:37.000000000 +0100 @@ -1,0 +2,10 @@ +Mon Dec 16 22:07:05 UTC 2013 - sleep_walker(a)suse.cz + +- change to use pkgconfig dependencies + +------------------------------------------------------------------- +Sun Dec 1 00:04:46 UTC 2013 - simon(a)simotek.net + +- build against efl 1.8.0 packages + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ elemines.spec ++++++ --- /var/tmp/diff_new_pack.aRZJYr/_old 2013-12-30 09:51:38.000000000 +0100 +++ /var/tmp/diff_new_pack.aRZJYr/_new 2013-12-30 09:51:38.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package econcentration +# spec file for package elemines # -# Copyright (c) 2010 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 @@ -19,21 +19,23 @@ Name: elemines Version: 0.2.3 Release: 0 -License: BSD-2-Clause and GPL-2.0 Summary: Simple game to train concentration and memory -Url: http://elemines.sourceforge.net/ +License: BSD-2-Clause and GPL-2.0 Group: Amusements/Games/Logic +Url: http://elemines.sourceforge.net/ Source: %{name}-%{version}.tar.bz2 BuildRequires: autoconf BuildRequires: automake BuildRequires: dos2unix BuildRequires: doxygen -BuildRequires: edje-devel -BuildRequires: eina-devel -BuildRequires: elementary-devel -BuildRequires: etrophy-devel BuildRequires: libtool BuildRequires: pkgconfig +BuildRequires: pkgconfig(ecore) +BuildRequires: pkgconfig(edje) +BuildRequires: pkgconfig(eina) +BuildRequires: pkgconfig(elementary) +BuildRequires: pkgconfig(etrophy) +BuildRequires: pkgconfig(evas) BuildRoot: %{_tmppath}/%{name}-%{version}-build %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 dante for openSUSE:Factory
by root＠hilbert.suse.de 30 Dec '13

30 Dec '13

Hello community, here is the log from the commit of package dante for openSUSE:Factory checked in at 2013-12-30 09:51:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dante (Old) and /work/SRC/openSUSE:Factory/.dante.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dante" Changes: -------- --- /work/SRC/openSUSE:Factory/dante/dante.changes 2013-11-12 09:49:57.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.dante.new/dante.changes 2013-12-30 09:51:08.000000000 +0100 @@ -1,0 +2,179 @@ +Thu Dec 19 18:06:30 UTC 2013 - tabraham(a)suse.com + +- dante.spec: instead of statically defining CFLAGS, parse out + -grecord-gcc-switches from %{optflags}, since it causes problems + for the configure script + +------------------------------------------------------------------- +Mon Dec 16 19:06:47 UTC 2013 - tabraham(a)suse.com + +- update to dante-1.4.0 + + o Older syntax for setting the socket buffer sizes via + socket.recvbuf.udp, socket.sendbuf.udp, socket.recvbuf.tcp and + socket.sendbuf.tcp options have been deprecated and replaced with + the more general API for setting socket options. + + "socket.recvbuf.udp" can now be set by "<interface-side>.udp.so_rcvbuf" + "socket.sendbuf.udp" can now be set by "<interface-side>.udp.so_sndbuf" + "socket.recvbuf.tcp" can now be set by "<interface-side>.tcp.so_rcvbuf" + "socket.sendbuf.tcp" can now be set by "<interface-side>.tcp.so_sndbuf" + + <interface-side> refers to either "internal", for Dante's internal + interface(s), or "external", for Dante's external interface(s). + + o socks-rules now require a "socks" prefix (like client-rules require a + "client" prefix), and the socks "method" keyword has been renamed to + "socksmethod". + + o The "socksmethod" keyword can now be set in client-rules too. It + is used to override the default preference for what socksmethod to + select for which clients addresses, making it possible to by + default e.g., have the preference "gssapi username none", but for + some client-ranges have a different preference, e.g., "none + username gssapi". + + Normally there is no need to use set this keyword in a client-rule. + + o Fallback to direct (non-proxy) routes now defaults to off in the client, + as well as in the server. + + To keep previous behaviour in the client, with direct route fallback + for destinations with no matching route, set SOCKS_DIRECTROUTE_FALLBACK + to "yes" in the environment, or ./configure with --enable-drt-fallback. + + Direct fallback is enabled if there are no routes configured (as is + usually the case in a server configuration), and disabled otherwise. + + o IPv6 is now supported in the server. + + Standard IPv6 address syntax is used for addresses, with the addition + of the special address "0/0" used for matching both all IPv4 and + all IPv6 addresses. + + o New "monitor" object added. Syntax is similar to rules and routes, + but instead of applying to individual sessions, it applies to all + sessions currently matching the addresses to monitor. + + This can be used for monitoring network anomalies related to too + little data being transferred or too many disconnects occurring, + triggering alarms if detected. + + o Possibility to configure system errors and DNS-errors for + special logging in certain cases (when connecting and performing + hostname resolving). + + o More aggressive regarding how many processes to fork when starting + and how many processes to reserve for future clients. + + o Added new log keyword: "tcpinfo". Used to report more extensive + statistics about sessions, including TCP_INFO on supported platforms. + + o SIGINFO/SIGUSR1 output is now logged at level "info" instead of level + "debug". + + o SIGHUP code rewritten. Should function considerably better in + environments were SIGHUP is, for whatever reason, sent an excessive + amount of times every second. + + o Default for the maximum number of clients an i/o process can handle has + been increased from 8 to 32. + + o Improved UDP compatibility by sending appropriate ICMP unreachable + errors to clients and targets, if running with the appropriate + privileges (typically, root is required for this). + + Makes it possible for a client or target to be notified that a UDP + packet it wanted the Dante server to forward was not forwarded. + + o Reduction in memory consumption at the expense of allocating extra + memory dynamically in the very rare, perhaps non-existing, cases + where the extra memory is needed. + + o The default timeout for TCP i/o (timeout.io.tcp) has been changed from + 84000 to 0. 0 means use the kernels default, which in most cases will + mean no timeout. See UPGRADE for more information. + + o The session module has been merged with the mainstream Dante code, + and has also been extended to support the following new features: + - connection throttling (number of new sessions accepted per second). + - state-keys. + Two state keys are currently supported: + - per-IP address. + - per-hostid (hostid is supported on certain platforms, with + certain kernel patches, with certain clients). + + The syntax has also changed (see UPGRADE). + See the manual for more information about the new features. + + o Code used for finding the correct outgoing address to bind when + external.rotation is set to "route" replaced with much simpler, + but hopefully equally (or better) functioning code. + Idea taken from Quagga. + + o Use getpassphrase() rather then getpass() to obtain password for + username authentication when available. Avoids 9 character limit + on Solaris. Suggested by Albert Fluegel <af(a)muc.de.example.com> + + o Use sqrt() rather than sqrtl() in stddev calculation, as sqrtl() is not + available on some platforms (such as FreeBSD 7.2). Problem reported + by Rudolf Polzer <rpolzer(a)one-it.de.example.org>. + + o If the authentication method used was RFC931 (ident), the username + was not always logged when it should be. + Reported by Gregory Charot (EVENIUM) <gcharot(a)evenium.com.example.com>. + + o Syntax checking has been improved to better detect invalid or + likely incorrect server configurations. + + This can result in some configurations that have previously been + accepted or accepted with warnings by Dante, to now cause an error + on startup, preventing the Dante server from starting up until the + configuration error has been fixed. + + o Fixed compilation on OpenBSD with compilers not supporting -Wbounded. + Problem report and testing by + Mikael More <mikael.more(a)gmail.com.example.com>. + + o GSSAPI "clear" is no longer enabled by default, as it is not part + of the SOCKS GSSAPI standard per se. + + o external.rotation was not handling non-IPv4 target addresses correctly. + Reported and diagnosed by Rudolf Polzer <rpolzer(a)one-it.de.example.com>. + + o The "--disable-libwrap" option has been renamed "--without-libwrap". + + o Fixed bug that would cause the following warning to sometimes be + erroneously reported: + "warning: accept(2) failed: Resource temporarily unavailable" + + o SIGINFO log information extended to include information about i/o + buffer status and as well as UDP packet latency. + + o Real-time scheduling priority settings and CPU affinity settings made + available in sockd.conf. + + See https://www.inet.no/dante/files/dante_realtime_preview.pdf for + a performance analysis done in relation to these new features. + + o General API for setting socket options on sockets used by Dante + made available in sockd.conf. + + o Support for cross compilation of client library for Android + (system name 'arm-linux-androideabi'). + Testing and analysis by Yoav Weiss <weiss.yoav(a)gmail.com.example.com>. + + o Problem with sockd.init generation in dante.spec fixed. + Reported by Luiz Gustavo Nascimento <luizgn(a)gmail.com.example.com>. + +- refreshed patches: + dante-1.4.0-64bit_portability.patch + dante-1.4.0-glibc-2.17.patch + dante-1.4.0-sockd_conf_man_format.patch + dante-1.4.0-socksify_man_format.patch + +- %{optflags} contains -grecord-gcc-switches, which causes problems for + configure. removed optflags from CFLAGS and modified it to contain the + rest of the options. + +------------------------------------------------------------------- Old: ---- dante-1.3.2-64bit_portability.patch dante-1.3.2-sockd_conf_man_format.patch dante-1.3.2-socksify_man_format.patch dante-1.3.2.tar.gz dante-glibc-2.17.patch New: ---- dante-1.4.0-64bit_portability.patch dante-1.4.0-glibc-2.17.patch dante-1.4.0-sockd_conf_man_format.patch dante-1.4.0-socksify_man_format.patch dante-1.4.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dante.spec ++++++ --- /var/tmp/diff_new_pack.YzPYXs/_old 2013-12-30 09:51:09.000000000 +0100 +++ /var/tmp/diff_new_pack.YzPYXs/_new 2013-12-30 09:51:09.000000000 +0100 @@ -20,14 +20,14 @@ %define lname libsocks0 BuildRequires: autoconf >= 2.61 BuildRequires: cyrus-sasl-devel +BuildRequires: krb5-devel BuildRequires: libtool BuildRequires: pam-devel -BuildRequires: krb5-devel BuildRequires: pkgconfig(systemd) Summary: A Free Socks v4 and v5 Client Implementation License: BSD-3-Clause Group: Productivity/Networking/Security -Version: 1.3.2 +Version: 1.4.0 Release: 0 Url: http://www.inet.no/dante/ # http://www.inet.no/dante/files/dante-%%{version}.tar.gz @@ -35,10 +35,10 @@ Source1: sockd.service Source2: baselibs.conf Source3: %name-rpmlintrc -Patch: dante-1.3.2-64bit_portability.patch -Patch2: dante-1.3.2-sockd_conf_man_format.patch -Patch3: dante-1.3.2-socksify_man_format.patch -Patch4: dante-glibc-2.17.patch +Patch: dante-1.4.0-64bit_portability.patch +Patch2: dante-1.4.0-sockd_conf_man_format.patch +Patch3: dante-1.4.0-socksify_man_format.patch +Patch4: dante-1.4.0-glibc-2.17.patch # SuSE series: sec %description @@ -90,14 +90,17 @@ %patch2 %patch3 %if 0%{?suse_version} > 1220 -%patch4 -p1 +%patch4 %endif %build DANTELIBC=`find /%{_lib}/ -maxdepth 1 -iname "libc.so.*"` echo >> acinclude.m4 autoreconf --force --install --verbose -CFLAGS="%{optflags} -fno-strict-aliasing" \ + +# optflags contains -grecord-gcc-switches which is breaking configure +#CFLAGS="%{optflags} -fno-strict-aliasing" \ +CFLAGS=$(echo "%{optflags}" | sed "s|-grecord-gcc-switches||") %configure --disable-static --with-pic --enable-shared --with-libc=$DANTELIBC make %{?_smp_mflags} V=1 ++++++ dante-1.3.2-64bit_portability.patch -> dante-1.4.0-64bit_portability.patch ++++++ --- /work/SRC/openSUSE:Factory/dante/dante-1.3.2-64bit_portability.patch 2012-02-07 14:45:19.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.dante.new/dante-1.4.0-64bit_portability.patch 2013-12-30 09:51:07.000000000 +0100 @@ -1,6 +1,6 @@ ---- lib/log.c.orig 2012-01-11 11:51:00.816935242 -0500 -+++ lib/log.c 2012-01-12 09:33:14.205467014 -0500 -@@ -715,7 +715,7 @@ +--- lib/log.c.orig 2013-12-13 15:48:45.821365046 -0500 ++++ lib/log.c 2013-12-13 15:49:02.530363904 -0500 +@@ -1388,7 +1388,7 @@ char **strings; size = backtrace(array, (int)ELEMENTS(array)); ++++++ dante-1.4.0-glibc-2.17.patch ++++++ --- libscompat/issetugid.c.orig 2013-12-13 16:05:15.838297349 -0500 +++ libscompat/issetugid.c 2013-12-13 16:08:08.623285534 -0500 @@ -4,6 +4,7 @@ #include "autoconf.h" #endif /* HAVE_CONFIG_H */ +#include <sys/auxv.h> #include "osdep.h" /* @@ -49,20 +50,12 @@ * */ -#if HAVE_LIBC_ENABLE_SECURE -extern int __libc_enable_secure; -#endif /* HAVE_LIBC_ENABLE_SECURE */ int issetugid(void) { -#if HAVE_LIBC_ENABLE_SECURE - if (!__libc_enable_secure) - return 0; -#elif HAVE_LIBC_ENABLE_SECURE_DISABLED - if (getuid() == geteuid() && getgid() == getegid()) - return 0; -#endif /* HAVE_LIBC_ENABLE_SECURE_DISABLED */ - - return 1; /* don't know, better safe than sorry. */ + unsigned long secure = getauxval(AT_SECURE); + if (secure != 0) + return 1; + return 0; } --- libscompat.m4.orig 2013-12-13 16:11:45.601270697 -0500 +++ libscompat.m4 2013-12-13 16:10:49.916274505 -0500 @@ -263,35 +263,6 @@ AC_DEFINE(bzero(b, len), memset((b), 0, (len)), [bzero replacement]) fi -m4_ifdef([dantebuild], [ -#causes problems with packaging, allow test to be turned off -AC_ARG_WITH(glibc-secure, -[ --without-glibc-secure disable libc_enable_secure check @<:@default=detect@:>@], -[GLIBCSEC=$withval]) - -if test "${GLIBCSEC}" != no; then - AC_MSG_CHECKING([for __libc_enable_secure]) - AC_TRY_RUN([ -extern int __libc_enable_secure; - -int main() -{ - if (__libc_enable_secure == 0) - return 0; - - return 1; -}],[AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_LIBC_ENABLE_SECURE, 1, [Linux version of issetugid()])], - [AC_MSG_RESULT([no])], - [dnl assume no when cross-compiling - AC_MSG_RESULT([assuming no])]) -fi -], -[AC_DEFINE(HAVE_LIBC_ENABLE_SECURE, 0, [not used])]) -if test x"$GLIBCSEC" = xno; then - AC_DEFINE(HAVE_LIBC_ENABLE_SECURE_DISABLED, 1, [glibc variable disable]) -fi - L_PIPETYPE() AC_MSG_CHECKING([for FIONREAD socket support]) --- include/autoconf.h.in.orig 2013-12-13 16:13:44.171262589 -0500 +++ include/autoconf.h.in 2013-12-13 16:14:48.444258194 -0500 @@ -566,12 +566,6 @@ /* Define to 1 if you have the `crypt' library (-lcrypt). */ #undef HAVE_LIBCRYPT -/* Linux version of issetugid() */ -#undef HAVE_LIBC_ENABLE_SECURE - -/* glibc variable disable */ -#undef HAVE_LIBC_ENABLE_SECURE_DISABLED - /* Define to 1 if you have the `des' library (-ldes). */ #undef HAVE_LIBDES ++++++ dante-1.3.2-sockd_conf_man_format.patch -> dante-1.4.0-sockd_conf_man_format.patch ++++++ --- /work/SRC/openSUSE:Factory/dante/dante-1.3.2-sockd_conf_man_format.patch 2012-02-07 14:45:19.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.dante.new/dante-1.4.0-sockd_conf_man_format.patch 2013-12-30 09:51:08.000000000 +0100 @@ -1,6 +1,6 @@ ---- doc/sockd.conf.5.orig 2012-01-12 10:24:34.285960711 -0500 -+++ doc/sockd.conf.5 2012-01-12 11:26:56.328178747 -0500 -@@ -445,11 +445,9 @@ +--- doc/sockd.conf.5.orig 2013-12-13 15:56:15.078334326 -0500 ++++ doc/sockd.conf.5 2013-12-13 15:58:58.993323118 -0500 +@@ -678,11 +678,9 @@ The syntax of the redirect statement is as follows: @@ -13,7 +13,7 @@ See the redirect manual for detailed information. -@@ -523,10 +521,8 @@ +@@ -766,10 +764,8 @@ The syntax of the redirect statement is as follows: @@ -24,14 +24,12 @@ \fBredirect\fP to: \fBADDRESS\fP The semantics of \fBfrom\fP and \fBto\fP vary according to -@@ -578,8 +574,8 @@ - Karl-Andre' Skevik +@@ -874,7 +870,7 @@ .SH SEE ALSO sockd(8), socks.conf(5), hosts_access(5) --.Pp + +-.PP +.TP Information about new releases and other related issues can be found - on the --.Nm \fBDante\fP -+\fBDante\fP - WWW home page: http://www.inet.no/dante/ + on the \fBDante\fP WWW home page: http://www.inet.no/dante/ + ++++++ dante-1.3.2-socksify_man_format.patch -> dante-1.4.0-socksify_man_format.patch ++++++ --- /work/SRC/openSUSE:Factory/dante/dante-1.3.2-socksify_man_format.patch 2012-02-07 14:45:19.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.dante.new/dante-1.4.0-socksify_man_format.patch 2013-12-30 09:51:08.000000000 +0100 @@ -1,6 +1,6 @@ ---- doc/socksify.1.orig 2012-01-12 10:40:05.867314343 -0500 -+++ doc/socksify.1 2012-01-12 10:40:17.146173337 -0500 -@@ -131,7 +131,7 @@ +--- doc/socksify.1.orig 2013-12-13 16:01:14.284313866 -0500 ++++ doc/socksify.1 2013-12-13 16:01:55.033311080 -0500 +@@ -136,7 +136,7 @@ Karl-Andre' Skevik .SH SEE ALSO socks.conf(5), sockd(8), sockd.conf(5) ++++++ dante-1.3.2.tar.gz -> dante-1.4.0.tar.gz ++++++ ++++ 267241 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 crmsh for openSUSE:Factory
by root＠hilbert.suse.de 30 Dec '13

30 Dec '13

Hello community, here is the log from the commit of package crmsh for openSUSE:Factory checked in at 2013-12-30 09:49:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/crmsh (Old) and /work/SRC/openSUSE:Factory/.crmsh.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "crmsh" Changes: -------- --- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2013-12-10 17:42:09.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2013-12-30 09:50:00.000000000 +0100 @@ -1,0 +2,18 @@ +Fri Dec 20 10:11:42 UTC 2013 - kgronlund(a)suse.com + +- Medium: ui_report: Fix bug when calling hb_report in report sublevel +- Medium: ui_history: Fix bug when checking current sublevel in + history commands +- upstream cs: 809d4b774bd4 + +------------------------------------------------------------------- +Tue Dec 17 16:48:30 UTC 2013 - kgronlund(a)suse.com + +- Medium: parse: Resource sets in location constraints (fate#315158) +- Medium: parse: Regular expressions in location constraints +- Dev: unittests: Run unit tests with regression builds +- Low: parse: Stricter parsing of resource names +- Low: utils: Look for crmd in config.path.crm_daemon_dir +- upstream cs: 0d3abc34b627 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ crmsh.spec ++++++ --- /var/tmp/diff_new_pack.uGQQJ3/_old 2013-12-30 09:50:01.000000000 +0100 +++ /var/tmp/diff_new_pack.uGQQJ3/_new 2013-12-30 09:50:01.000000000 +0100 @@ -139,6 +139,13 @@ make %{_smp_mflags} docdir=%{crmsh_docdir} +%if 0%{?with_regression_tests} + if ! test/unittests/testrunner.py ; then + echo "Shell unit tests failed." + exit 1 + fi +%endif + %install make DESTDIR=%{buildroot} docdir=%{crmsh_docdir} install install -Dm0644 contrib/bash_completion.sh %{buildroot}%{_sysconfdir}/bash_completion.d/crm.sh @@ -149,20 +156,18 @@ %clean rm -rf %{buildroot} +# Run regression tests after installing the package +# NB: this is called twice by OBS, that's why we touch the file %if 0%{?with_regression_tests} - %post - -# NB: this is called twice by OBS, that's why we touch the file if [ ! -e /tmp/.crmsh_regression_tests_ran ]; then touch /tmp/.crmsh_regression_tests_ran - if ! /usr/share/crmsh/tests/regression.sh ; then + if ! %{_datadir}/%{name}/tests/regression.sh ; then echo "Shell tests failed." cat crmtestout/regression.out exit 1 fi fi - %endif %files ++++++ crmsh-cibadmin_can_patch.patch ++++++ --- /var/tmp/diff_new_pack.uGQQJ3/_old 2013-12-30 09:50:01.000000000 +0100 +++ /var/tmp/diff_new_pack.uGQQJ3/_new 2013-12-30 09:50:01.000000000 +0100 @@ -1,12 +1,23 @@ -diff -r 13a63558be20 modules/utils.py ---- a/modules/utils.py Fri Oct 25 16:57:25 2013 +0200 -+++ b/modules/utils.py Fri Oct 25 17:14:45 2013 +0200 -@@ -1008,7 +1008,7 @@ def is_pcmk_118(cib_f=None): +commit 043a73a179116619bff65c46e3f6ac693dd57d3f +Author: Kristoffer Grönlund <krig(a)koru.se> +Date: Thu Dec 12 15:06:21 2013 +0100 + + Medium: utils: Enable CIB patches for 1.1.10> + + Enable CIB patches on patched 1.1.10 systems. + +diff --git a/modules/utils.py b/modules/utils.py +index 624fcbf0d841..45277fb10003 100644 +--- a/modules/utils.py ++++ b/modules/utils.py +@@ -1097,8 +1097,8 @@ def cibadmin_features(): + def cibadmin_can_patch(): - # cibadmin -P doesn't handle comments, hopefully in v1.1.11 -- return False -+ return True - #return is_min_pcmk_ver("1.1.11") +- # cibadmin -P doesn't handle comments in <1.1.11 (unless patched) +- return is_min_pcmk_ver("1.1.11") ++ # cibadmin -P doesn't handle comments in <1.1.10 (unless patched) ++ return is_min_pcmk_ver("1.1.10") + # quote function from python module shlex.py in python 3.3 ++++++ crmsh.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/.hg_archival.txt new/crmsh/.hg_archival.txt --- old/crmsh/.hg_archival.txt 2013-12-09 21:14:30.000000000 +0100 +++ new/crmsh/.hg_archival.txt 2013-12-20 11:02:10.000000000 +0100 @@ -1,5 +1,5 @@ repo: 13c3bd69e935090cd25213c474cafc3f01b5910b -node: 1a0e32427c4270d7be8cdf7300fae13fe5d581c2 +node: 809d4b774bd4d6d41fdb0f2720286153fc5db977 branch: default latesttag: 1.2.6-rc1 -latesttagdistance: 261 +latesttagdistance: 272 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/TODO new/crmsh/TODO --- old/crmsh/TODO 2013-12-09 21:14:30.000000000 +0100 +++ new/crmsh/TODO 2013-12-20 11:02:10.000000000 +0100 @@ -18,10 +18,17 @@ - this feature needs very careful consideration -Misc +. CIB features -. Create a web page + - Rules in primitive attribute declarations - - there's already space at crmsh.nongnu.org + primitive dummy ocf:heartbeat:IPaddr2 \ + params 3: rule 0: #uname eq pcmk-1 nic=eth1 \ + params 2: rule 1: #uname eq pcmk-2 nic=eth2 \ + params 1: netmask=32 ip=127.0.0.1 nic=eth0 - - preferred to be based on asciidoc or similar + Adding parser support is easy. + + Difficulty is adding support for multiple sets of parameters + with different scores + (right now they are all aggregated) in cibconfig.py diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/crmsh-cibadmin_can_patch.patch new/crmsh/crmsh-cibadmin_can_patch.patch --- old/crmsh/crmsh-cibadmin_can_patch.patch 2013-12-09 21:14:30.000000000 +0100 +++ new/crmsh/crmsh-cibadmin_can_patch.patch 2013-12-20 11:02:10.000000000 +0100 @@ -1,12 +1,23 @@ -diff -r 13a63558be20 modules/utils.py ---- a/modules/utils.py Fri Oct 25 16:57:25 2013 +0200 -+++ b/modules/utils.py Fri Oct 25 17:14:45 2013 +0200 -@@ -1008,7 +1008,7 @@ def is_pcmk_118(cib_f=None): +commit 043a73a179116619bff65c46e3f6ac693dd57d3f +Author: Kristoffer Grönlund <krig(a)koru.se> +Date: Thu Dec 12 15:06:21 2013 +0100 + + Medium: utils: Enable CIB patches for 1.1.10> + + Enable CIB patches on patched 1.1.10 systems. + +diff --git a/modules/utils.py b/modules/utils.py +index 624fcbf0d841..45277fb10003 100644 +--- a/modules/utils.py ++++ b/modules/utils.py +@@ -1097,8 +1097,8 @@ def cibadmin_features(): + def cibadmin_can_patch(): - # cibadmin -P doesn't handle comments, hopefully in v1.1.11 -- return False -+ return True - #return is_min_pcmk_ver("1.1.11") +- # cibadmin -P doesn't handle comments in <1.1.11 (unless patched) +- return is_min_pcmk_ver("1.1.11") ++ # cibadmin -P doesn't handle comments in <1.1.10 (unless patched) ++ return is_min_pcmk_ver("1.1.10") + # quote function from python module shlex.py in python 3.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/crmsh.spec new/crmsh/crmsh.spec --- old/crmsh/crmsh.spec 2013-12-09 21:14:30.000000000 +0100 +++ new/crmsh/crmsh.spec 2013-12-20 11:02:10.000000000 +0100 @@ -141,6 +141,13 @@ make %{_smp_mflags} docdir=%{crmsh_docdir} +%if 0%{?with_regression_tests} + if ! test/unittests/testrunner.py ; then + echo "Shell unit tests failed." + exit 1 + fi +%endif + %install make DESTDIR=%{buildroot} docdir=%{crmsh_docdir} install install -Dm0644 contrib/bash_completion.sh %{buildroot}%{_sysconfdir}/bash_completion.d/crm.sh @@ -151,20 +158,18 @@ %clean rm -rf %{buildroot} +# Run regression tests after installing the package +# NB: this is called twice by OBS, that's why we touch the file %if 0%{?with_regression_tests} - %post - -# NB: this is called twice by OBS, that's why we touch the file if [ ! -e /tmp/.crmsh_regression_tests_ran ]; then touch /tmp/.crmsh_regression_tests_ran - if ! /usr/share/crmsh/tests/regression.sh ; then + if ! %{_datadir}/%{name}/tests/regression.sh ; then echo "Shell tests failed." cat crmtestout/regression.out exit 1 fi fi - %endif %files diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/modules/cibconfig.py new/crmsh/modules/cibconfig.py --- old/crmsh/modules/cibconfig.py 2013-12-09 21:14:30.000000000 +0100 +++ new/crmsh/modules/cibconfig.py 2013-12-20 11:02:10.000000000 +0100 @@ -1072,6 +1072,8 @@ xml2 = self.cli2node(cli_text) if xml2 is None: return False + common_debug("a: %s" % etree.tostring(self.node)) + common_debug("b: %s" % etree.tostring(xml2)) rc = xml_cmp(self.node, xml2, show=True) return rc @@ -1605,7 +1607,18 @@ ''' def _repr_cli_head(self, format): - rsc = cli_display.rscref(self.node.get("rsc")) + rsc = None + if "rsc" in self.node.keys(): + rsc = self.node.get("rsc") + elif "rsc-pattern" in self.node.keys(): + rsc = '/%s/' % (self.node.get("rsc-pattern")) + if rsc is not None: + rsc = cli_display.rscref(rsc) + elif self.node.find("resource_set") is not None: + rsc = '{ %s }' % (' '.join(rsc_set_constraint(self.node, self.obj_type))) + else: + common_err("%s: unknown rsc_location format" % self.obj_id) + return None s = cli_display.keyword(self.obj_type) id = cli_display.id(self.obj_id) s = "%s %s %s" % (s, id, rsc) @@ -1631,18 +1644,23 @@ headnode = mkxmlsimple(head, oldnode, 'location') id_hint = headnode.get("id") oldrule = None + rule = None for e in cli_list[1:]: if e[0] in ("expression", "date_expression"): n = mkxmlnode(e, oldrule, id_hint) else: n = mkxmlnode(e, oldnode, id_hint) - if keyword_cmp(e[0], "rule"): + if e[0] in ("resource_set"): + headnode.append(n) + elif keyword_cmp(e[0], "rule"): add_missing_attr(n) rule = n headnode.append(n) oldrule = lookup_node(rule, oldnode, location_only=True) - else: + elif rule is not None: rule.append(n) + else: + headnode.append(n) remove_id_used_attributes(oldnode) return headnode @@ -1653,11 +1671,23 @@ if self.node is None: # eh? common_err("%s: no xml (strange)" % self.obj_id) return utils.get_check_rc() + rc = 0 uname = self.node.get("node") if uname and uname not in cib_factory.node_id_list(): common_warn("%s: referenced node %s does not exist" % (self.obj_id, uname)) - return 1 - rc = 0 + rc = 1 + pattern = self.node.get("rsc-pattern") + if pattern: + try: + re.compile(pattern) + except IndexError, e: + common_warn("%s: '%s' may not be a valid regular expression (%s)" % + (self.obj_id, pattern, e)) + rc = 1 + except re.error, e: + common_warn("%s: '%s' may not be a valid regular expression (%s)" % + (self.obj_id, pattern, e)) + rc = 1 for enode in self.node.xpath("rule/expression"): if enode.get("attribute") == "#uname": uname = enode.get("value") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/modules/cibobjects.py new/crmsh/modules/cibobjects.py --- old/crmsh/modules/cibobjects.py 2013-12-09 21:14:30.000000000 +0100 +++ new/crmsh/modules/cibobjects.py 2013-12-20 11:02:10.000000000 +0100 @@ -211,6 +211,8 @@ def __init__(self): Constraint.__init__(self) self.resource = None + self.rsc_pattern = None + self.rsc_set = None self.score = None self.node = None self.role = None @@ -219,12 +221,16 @@ def _to_list(self): ret = None + rscpart = None if self.score and self.node: - ret = listfmt('[[location [[id %] [rsc %] % [node %] [role %]]]]', - self.id, self.resource, self.score, self.node, self.role) + ret = listfmt('[[location [[id %] [rsc %] [rsc-pattern %] % [node %] [role %]]]]', + self.id, self.resource, self.rsc_pattern, + self.score, self.node, self.role) else: - ret = listfmt('[[location [[id %] [rsc %]]]]', - self.id, self.resource) + self.rules + ret = listfmt('[[location [[id %] [rsc %] [rsc-pattern %]]]]', + self.id, self.resource, self.rsc_pattern) + self.rules + if self.rsc_set: + ret += self.rsc_set return ret diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/modules/cliformat.py new/crmsh/modules/cliformat.py --- old/crmsh/modules/cliformat.py 2013-12-09 21:14:30.000000000 +0100 +++ new/crmsh/modules/cliformat.py 2013-12-20 11:02:10.000000000 +0100 @@ -260,8 +260,10 @@ col.append("]") elif not sequential: col.append(")") - if (sequential and require_all and obj_type != "rsc_ticket" and cnt <= 2) or \ - (obj_type == "rsc_ticket" and cnt <= 1): # a degenerate thingie + is_ticket = obj_type == 'rsc_ticket' + is_location = obj_type == 'location' + if not is_location and ((sequential and require_all and not is_ticket and cnt <= 2) or + (is_ticket and cnt <= 1)): # a degenerate thingie col.insert(0, "_rsc_set_") return col diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/modules/config.py new/crmsh/modules/config.py --- old/crmsh/modules/config.py 2013-12-09 21:14:30.000000000 +0100 +++ new/crmsh/modules/config.py 2013-12-20 11:02:10.000000000 +0100 @@ -25,7 +25,7 @@ _SYSTEMWIDE = '/etc/crm/crmsh.conf' -_PERUSER = os.path.join(userdir.CONFIG_HOME, 'crm.conf') +_PERUSER = os.getenv("CRM_CONFIG_FILE") or os.path.join(userdir.CONFIG_HOME, 'crm.conf') # opt_ classes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/modules/parse.py new/crmsh/modules/parse.py --- old/crmsh/modules/parse.py 2013-12-09 21:14:30.000000000 +0100 +++ new/crmsh/modules/parse.py 2013-12-20 11:02:10.000000000 +0100 @@ -43,7 +43,7 @@ _IDENT_RE = re.compile(r'([a-z0-9_#$-].*)$', re.IGNORECASE) _DISPATCH_RE = re.compile(r'[a-z0-9_]+$', re.IGNORECASE) _DESC_RE = re.compile(r'description=(.+)$', re.IGNORECASE) - _RESOURCE_RE = re.compile(r'([^=]+)$') + _RESOURCE_RE = re.compile(r'([a-z_#$][^=]*)$', re.IGNORECASE) _IDSPEC_RE = re.compile(r'(\$id-ref|\$id)=(.*)$', re.IGNORECASE) def can_parse(self): @@ -588,14 +588,33 @@ else: return ('score-attribute', score) + def match_until(self, end_token): + tokens = [] + while self.current_token() is not None and self.current_token() != end_token: + tokens.append(self.match_any()) + return tokens + def parse_location(self): """ - location <id> <rsc> <score>: <node> [role=<role>] - location <id> <rsc> [rule ...] + location <id> rsc <score>: <node> [role=<role>] + location <id> rsc [rule ...] + rsc :: /<rsc-pattern>/ + | { <rsc-set> } + | <rsc> """ out = Location() out.id = self.match_identifier() - out.resource = self.match_resource() + if self.try_match('^/(.+)/$'): + out.rsc_pattern = self.matched(1) + elif self.try_match('{'): + tokens = self.match_until('}') + self.match('}') + if not tokens: + self.err("Empty resource set") + parser = ResourceSet('role', tokens, self) + out.rsc_set = parser.parse() + else: + out.resource = self.match_resource() if self.try_match(self._SCORE_RE): out.score = self.validate_score(self.matched(1)) out.node = self.match_identifier() @@ -624,6 +643,12 @@ parse_collocation = parse_colocation def parse_order(self): + ''' + order <id> {kind|<score>}: <rsc>[:<action>] <rsc>[:<action>] ... + [symmetrical=<bool>] + + kind :: Mandatory | Optional | Serialize + ''' out = Order() out.id = self.match_identifier() if self.try_match('(%s)$' % ('|'.join(self.validation.rsc_order_kinds()))): @@ -637,6 +662,12 @@ return out def parse_rsc_ticket(self): + ''' + rsc_ticket <id> <ticket_id>: <rsc>[:<role>] [<rsc>[:<role>] ...] + [loss-policy=<loss_policy_action>] + + loss_policy_action :: stop | demote | fence | freeze + ''' out = RscTicket() out.id = self.match_identifier() self.match(self._SCORE_RE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/modules/ui_history.py new/crmsh/modules/ui_history.py --- old/crmsh/modules/ui_history.py 2013-12-09 21:14:30.000000000 +0100 +++ new/crmsh/modules/ui_history.py 2013-12-20 11:02:10.000000000 +0100 @@ -493,7 +493,7 @@ that depends on the current value of the TERM variable. ''' opt_l = [] - if not self._common_pe_render_check(context.get_command_name(), opt_l, *args): + if not self._common_pe_render_check(context, opt_l, *args): return False if "status" in opt_l: s = self._render_pe(self._pe_status_nohdr, t) @@ -511,7 +511,7 @@ def do_show(self, context, t, *args): "usage: show <pe> [status]" opt_l = [] - if not self._common_pe_render_check(context.get_command_name(), opt_l, *args): + if not self._common_pe_render_check(context, opt_l, *args): return False showfun = self._pe_config if "status" in opt_l: @@ -553,7 +553,7 @@ def do_diff(self, context, t1, t2, *args): "usage: diff <pe> <pe> [status] [html]" opt_l = [] - if not self._common_pe_render_check(context.get_command_name(), opt_l, *args): + if not self._common_pe_render_check(context, opt_l, *args): return False showfun = self._pe_config_plain mkhtml = "html" in opt_l @@ -577,7 +577,7 @@ def do_wdiff(self, context, t1, t2, *args): "usage: wdiff <pe> <pe> [status]" opt_l = [] - if not self._common_pe_render_check(context.get_command_name(), opt_l, *args): + if not self._common_pe_render_check(context, opt_l, *args): return False showfun = self._pe_config_plain if "status" in opt_l: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/modules/ui_report.py new/crmsh/modules/ui_report.py --- old/crmsh/modules/ui_report.py 2013-12-09 21:14:30.000000000 +0100 +++ new/crmsh/modules/ui_report.py 2013-12-20 11:02:10.000000000 +0100 @@ -43,4 +43,4 @@ create -f "YYYY-MM-DD H:M:S" [-t "YYYY-MM-DD H:M:S"] [options ...] [dest] ''' - return utils.ext_cmd(self.extcmd + ' '.join(args)) == 0 + return utils.ext_cmd(self.extcmd + ' ' + ' '.join(args)) == 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/modules/utils.py new/crmsh/modules/utils.py --- old/crmsh/modules/utils.py 2013-12-09 21:14:30.000000000 +0100 +++ new/crmsh/modules/utils.py 2013-12-20 11:02:10.000000000 +0100 @@ -980,13 +980,17 @@ def get_pcmk_version(dflt): version = dflt - if not is_program('crmd'): + if is_program('crmd'): + cmd = 'crmd' + elif os.path.isfile(os.path.join(config.path.crm_daemon_dir, 'crmd')): + cmd = os.path.join(config.path.crm_daemon_dir, 'crmd') + else: return version try: - rc, s = get_stdout("crmd version") + rc, s = get_stdout("%s version" % (cmd)) if rc != 0: - common_err("crmd exited with %d" % rc) + common_err("%s exited with %d" % (cmd, rc)) else: version = s.split()[2] common_debug("found pacemaker version: %s" % version) @@ -1073,10 +1077,28 @@ return is_min_pcmk_ver("1.1.8", cib_f=cib_f) +_cibadmin_features_cached = None + +def cibadmin_features(): + ''' + # usage example: + if 'corosync-plugin' in cibadmin_features() + ''' + global _cibadmin_features_cached + if _cibadmin_features_cached is None: + _cibadmin_features_cached = [] + rc, outp = get_stdout(['cibadmin', '-!'], shell=False) + if rc == 0: + outp = outp.strip() + m = re.match(r'Pacemaker\s(\S+)\s$Build: ([^$]+)\):\s(.*)', outp) + if m and len(m.groups()) > 2: + _cibadmin_features_cached = m.group(3).split() + return _cibadmin_features_cached + + def cibadmin_can_patch(): - # cibadmin -P doesn't handle comments, hopefully in v1.1.11 - return False - #return is_min_pcmk_ver("1.1.11") + # cibadmin -P doesn't handle comments in <1.1.11 (unless patched) + return is_min_pcmk_ver("1.1.11") # quote function from python module shlex.py in python 3.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/modules/xmlutil.py new/crmsh/modules/xmlutil.py --- old/crmsh/modules/xmlutil.py 2013-12-09 21:14:30.000000000 +0100 +++ new/crmsh/modules/xmlutil.py 2013-12-20 11:02:10.000000000 +0100 @@ -938,7 +938,8 @@ if not is_constraint(node): return [] xml_obj_type = node.tag - if xml_obj_type == "rsc_location": + rsc_list = [] + if xml_obj_type == "rsc_location" and node.get("rsc"): rsc_list = [node.get("rsc")] elif node.xpath("resource_set/resource_ref"): # resource sets diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/test/unittests/test.conf new/crmsh/test/unittests/test.conf --- old/crmsh/test/unittests/test.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/crmsh/test/unittests/test.conf 2013-12-20 11:02:10.000000000 +0100 @@ -0,0 +1,12 @@ +[path] +sharedir = ../../doc +cache = ../../doc +crm_config = . +crm_daemon_dir = . +crm_daemon_user = hacluster +ocf_root = . +crm_dtd_dir = . +pe_state_dir = . +heartbeat_dir = . +hb_delnode = ./hb_delnode +nagios_plugins = . diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/test/unittests/test_parse.py new/crmsh/test/unittests/test_parse.py --- old/crmsh/test/unittests/test_parse.py 2013-12-09 21:14:30.000000000 +0100 +++ new/crmsh/test/unittests/test_parse.py 2013-12-20 11:02:10.000000000 +0100 @@ -186,6 +186,23 @@ self.assertEqual(out.score[1], 'INFINITY') self.assertEqual(out.node, 'foo') + out = self.parser.parse('location loc-1 /foo.*/ inf: bar') + self.assertEqual(out.id, 'loc-1') + self.assertEqual(out.rsc_pattern, 'foo.*') + self.assertEqual(out.score[1], 'INFINITY') + self.assertEqual(out.node, 'bar') + #print out.to_list() + + out = self.parser.parse('location loc-1 // inf: bar') + self.assertFalse(out) + + out = self.parser.parse('location loc-1 { one ( two three ) four } inf: bar') + self.assertEqual(out.id, 'loc-1') + self.assertEqual(3, sum(1 for s in out.rsc_set if s[0] == 'resource_set')) + self.assertEqual(out.score[1], 'INFINITY') + self.assertEqual(out.node, 'bar') + #print out.to_list() + out = self.parser.parse('colocation col-1 inf: foo:master ( bar wiz sequential=yes )') self.assertEqual(out.id, 'col-1') self.assertEqual(2, sum(1 for s in out.resources if s[0] == 'resource_set')) @@ -198,7 +215,7 @@ self.assertEqual(3, sum(1 for s in out.resources if s[0] == 'resource_set')) out = self.parser.parse('colocation col-1 0: a:master b') - print out.resources + #print out.resources self.assertEqual(out.id, 'col-1') out = self.parser.parse('colocation col-1 10: ) bar wiz') @@ -221,6 +238,7 @@ out = self.parser.parse('order order_2 Mandatory: [ A B ] C') self.assertEqual(out.id, 'order_2') + self.assertEqual(out.to_list(), [['order', [['id', 'order_2'], ('kind', 'Mandatory')]], ['resource_set', [['require-all', 'false'], ['sequential', 'false'], ['resource_ref', ['id', 'A']], ['resource_ref', ['id', 'B']]]], ['resource_set', [['resource_ref', ['id', 'C']]]]]) out = self.parser.parse('rsc_ticket ticket-A_public-ip ticket-A: public-ip') self.assertEqual(out.id, 'ticket-A_public-ip') @@ -302,7 +320,7 @@ primitive rsc_dummy ocf:heartbeat:Dummy monitor rsc_dummy 30 ''') - print outp + #print outp self.assertEqual(2, len(outp)) outp = self._parse_lines(''' @@ -311,7 +329,7 @@ clone testfs-clone testfs \ meta ordered="true" interleave="true" ''') - print outp + #print outp self.assertEqual(2, len(outp)) inp = ''' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/test/unittests/testrunner.py new/crmsh/test/unittests/testrunner.py --- old/crmsh/test/unittests/testrunner.py 2013-12-09 21:14:30.000000000 +0100 +++ new/crmsh/test/unittests/testrunner.py 2013-12-20 11:02:10.000000000 +0100 @@ -26,28 +26,6 @@ os.chdir(os.path.dirname(os.path.abspath(sys.modules[__name__].__file__))) -def create_config_py(): - "TODO: make config.py.in a runtime, not compile-time generated module" - if not os.path.isfile('../../modules/config.py'): - fake_config_py = """DATADIR = "." -PACKAGE = "../doc" -CRM_CACHE_DIR = "." -CRM_DTD_DIRECTORY = "." -PE_STATE_DIR = "." -CRM_CONFIG_DIR = "." -CRM_DAEMON_DIR = "." -CRM_DAEMON_USER = "hacluster" -VERSION = "dev" -BUILD_VERSION = "dev" -HA_VARLIBHBDIR = "." -OCF_ROOT_DIR = "." -""" - f = open('../../modules/config.py', 'w') - f.write(fake_config_py) - f.close() -create_config_py() - - def test_info(f): m = re.match(r'^test_(.+)\.py$', os.path.basename(f)) if m: @@ -58,8 +36,9 @@ def run_test(name, testfile): print "%s" % (name.capitalize()) - cmd = 'PYTHONPATH=%s python -B %s' % ( + cmd = 'PYTHONPATH=%s CRM_CONFIG_FILE=%s python -B %s' % ( '../../modules', + 'test.conf', testfile ) ret = subprocess.call(cmd, shell=True) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit clamav for openSUSE:Factory
by root＠hilbert.suse.de 30 Dec '13

30 Dec '13

Hello community, here is the log from the commit of package clamav for openSUSE:Factory checked in at 2013-12-30 09:49:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/clamav (Old) and /work/SRC/openSUSE:Factory/.clamav.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "clamav" Changes: -------- --- /work/SRC/openSUSE:Factory/clamav/clamav.changes 2013-09-30 17:51:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.clamav.new/clamav.changes 2013-12-30 09:49:52.000000000 +0100 @@ -1,0 +2,7 @@ +Sun Dec 15 16:03:46 UTC 2013 - uweigand(a)de.ibm.com + +- fix build failures on ppc64le: + * fanotify is only supported on x86 platforms + * building tomsfastmath on (non-x86) 64-bit platforms requires -DFP_64BIT + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ clamav.spec ++++++ --- /var/tmp/diff_new_pack.DC4Jiq/_old 2013-12-30 09:49:53.000000000 +0100 +++ /var/tmp/diff_new_pack.DC4Jiq/_new 2013-12-30 09:49:53.000000000 +0100 @@ -96,6 +96,10 @@ # SLES9 needs this macro to enable the quarantine feature in libmilter CFLAGS="$CFLAGS -D_FFR_QUARANTINE -D_FFR_SMFI_OPENSOCKET" %endif +%ifarch ppc64 ppc64le +# tomsfastmath needs this for correct operation on 64-bit platforms +CFLAGS="$CFLAGS -DFP_64BIT" +%endif ./configure \ --prefix=%_prefix \ --libdir=%_libdir \ @@ -109,6 +113,9 @@ --enable-milter \ %clamav_check \ %llvm \ +%ifnarch %ix86 x86_64 + --disable-fanotify \ +%endif --disable-zlib-vcheck \ --enable-clamdtop \ --disable-timestamps -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0