August 2014 - openSUSE Commits - openSUSE Mailing Lists

commit yast2-installation for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '14

30 Aug '14

Hello community, here is the log from the commit of package yast2-installation for openSUSE:Factory checked in at 2014-08-30 16:03:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-installation (Old) and /work/SRC/openSUSE:Factory/.yast2-installation.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-installation" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-installation/yast2-installation.changes 2014-08-20 17:53:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-installation.new/yast2-installation.changes 2014-08-30 16:04:29.000000000 +0200 @@ -1,0 +2,32 @@ +Thu Aug 28 15:04:59 CEST 2014 - locilka(a)suse.com + +- Setting data for &product; macro (used in helps) as soon as + the base-product repository is initialized (bnc#886608) +- 3.1.113 + +------------------------------------------------------------------- +Wed Aug 27 15:39:52 CEST 2014 - locilka(a)suse.com + +- Fixed [Abort] button handling in Disks Activation dialog + (bnc#893281) +- 3.1.112 + +------------------------------------------------------------------- +Wed Aug 27 10:33:03 CEST 2014 - schubi(a)suse.de + +- Autoyast: Second stage will not be called at all. This bug has + been generated due the fix in bnc#886464. +- 3.1.111 + +------------------------------------------------------------------- +Mon Aug 25 09:15:13 CEST 2014 - schubi(a)suse.de + +- Autoyast + -- Disabling second installation stage via autoyast + configuration "second_stage". + -- Centralized minimal configuration and disabling more + configuration steps like X11, user, default_desktop,... + -- bnc#886464 and bnc#892091 +- 3.1.110 + +------------------------------------------------------------------- Old: ---- yast2-installation-3.1.109.tar.bz2 New: ---- yast2-installation-3.1.113.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.7qLObB/_old 2014-08-30 16:04:31.000000000 +0200 +++ /var/tmp/diff_new_pack.7qLObB/_new 2014-08-30 16:04:31.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 3.1.109 +Version: 3.1.113 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-installation-3.1.109.tar.bz2 -> yast2-installation-3.1.113.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.109/package/yast2-installation.changes new/yast2-installation-3.1.113/package/yast2-installation.changes --- old/yast2-installation-3.1.109/package/yast2-installation.changes 2014-08-18 15:55:14.000000000 +0200 +++ new/yast2-installation-3.1.113/package/yast2-installation.changes 2014-08-28 15:35:08.000000000 +0200 @@ -1,4 +1,36 @@ ------------------------------------------------------------------- +Thu Aug 28 15:04:59 CEST 2014 - locilka(a)suse.com + +- Setting data for &product; macro (used in helps) as soon as + the base-product repository is initialized (bnc#886608) +- 3.1.113 + +------------------------------------------------------------------- +Wed Aug 27 15:39:52 CEST 2014 - locilka(a)suse.com + +- Fixed [Abort] button handling in Disks Activation dialog + (bnc#893281) +- 3.1.112 + +------------------------------------------------------------------- +Wed Aug 27 10:33:03 CEST 2014 - schubi(a)suse.de + +- Autoyast: Second stage will not be called at all. This bug has + been generated due the fix in bnc#886464. +- 3.1.111 + +------------------------------------------------------------------- +Mon Aug 25 09:15:13 CEST 2014 - schubi(a)suse.de + +- Autoyast + -- Disabling second installation stage via autoyast + configuration "second_stage". + -- Centralized minimal configuration and disabling more + configuration steps like X11, user, default_desktop,... + -- bnc#886464 and bnc#892091 +- 3.1.110 + +------------------------------------------------------------------- Mon Aug 18 12:30:53 UTC 2014 - jreidinger(a)suse.com - workaround problem with missing capabilities in image deployment diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.109/package/yast2-installation.spec new/yast2-installation-3.1.113/package/yast2-installation.spec --- old/yast2-installation-3.1.109/package/yast2-installation.spec 2014-08-18 15:55:14.000000000 +0200 +++ new/yast2-installation-3.1.113/package/yast2-installation.spec 2014-08-28 15:35:08.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 3.1.109 +Version: 3.1.113 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.109/src/clients/desktop_finish.rb new/yast2-installation-3.1.113/src/clients/desktop_finish.rb --- old/yast2-installation-3.1.109/src/clients/desktop_finish.rb 2014-08-18 15:55:14.000000000 +0200 +++ new/yast2-installation-3.1.113/src/clients/desktop_finish.rb 2014-08-28 15:35:08.000000000 +0200 @@ -31,8 +31,6 @@ # $Id$ # -require "installation/minimal_installation" - module Yast class DesktopFinishClient < Client def main @@ -66,14 +64,13 @@ Builtins.y2debug("param=%1", @param) if @func == "Info" - minimal_inst = ::Installation::MinimalInstallation.instance.enabled? return { "steps" => 1, # progress step title "title" => _( "Initializing default window manager..." ), - "when" => minimal_inst ? [] : [:installation, :autoinst] + "when" => [:installation, :autoinst] } elsif @func == "Write" # this detects WM and DM according to selected patterns and diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.109/src/clients/inst_disks_activate.rb new/yast2-installation-3.1.113/src/clients/inst_disks_activate.rb --- old/yast2-installation-3.1.109/src/clients/inst_disks_activate.rb 2014-08-18 15:55:14.000000000 +0200 +++ new/yast2-installation-3.1.113/src/clients/inst_disks_activate.rb 2014-08-28 15:35:08.000000000 +0200 @@ -138,7 +138,7 @@ WFM.call("inst_lan", [@argmap.merge({"skip_detection" => true})]) @ret = :redraw when :abort - @ret = nil if Popup.ConfirmAbort(:painless) + @ret = nil unless Popup.ConfirmAbort(:painless) end if @ret == :redraw diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.109/src/clients/inst_finish.rb new/yast2-installation-3.1.113/src/clients/inst_finish.rb --- old/yast2-installation-3.1.109/src/clients/inst_finish.rb 2014-08-18 15:55:14.000000000 +0200 +++ new/yast2-installation-3.1.113/src/clients/inst_finish.rb 2014-08-28 15:35:08.000000000 +0200 @@ -27,6 +27,9 @@ # Jiri Srain <jsrain(a)suse.de> # # $Id$ + +require "installation/minimal_installation" + module Yast class InstFinishClient < Client def main @@ -120,63 +123,108 @@ Pkg.TargetLoad PackageCallbacks.RestorePreviousProgressCallbacks + if ::Installation::MinimalInstallation.instance.enabled? + copy_files_steps = [ + "autoinst_scripts1", + "copy_files", + "copy_systemfiles", + # For live installer only + Mode.live_installation ? "live_copy_files" : "", + "switch_scr" + ] + + save_config_steps = [ + "save_config", + # For live installer only + Mode.live_installation ? "live_save_config" : "", + "storage", + "kernel", + ] + + save_settings_steps = [ + "yast_inf", + "autoinst_scripts2", + "installation_settings" + ] + + install_bootloader_steps = [ + "prep_shrink", # ensure that prep partition is small enough for boot sector (bnc#867345) + "bootloader" + ] + else + # NOT minimal configuration + + copy_files_steps = [ + "autoinst_scripts1", + "copy_files", + "copy_systemfiles", + "clone", + # For live installer only + Mode.live_installation ? "live_copy_files" : "", + "switch_scr" + ] + + save_config_steps = [ + "ldconfig", + "save_config", + # For live installer only + Mode.live_installation ? "live_save_config" : "", + "default_target", + "desktop", + "storage", + "iscsi-client", + "fcoe-client", + "kernel", + "x11", + "proxy", + "pkg", + # product registration step is optional + WFM.ClientExists("scc_finish") ? "scc" : "", + "driver_update1", + # bnc #340733 + "system_settings" + ] + + save_settings_steps = [ + "yast_inf", + "network", + "firewall_stage1", + "ntp-client", + "ssh_settings", + "save_hw_status", + "users", + "autoinst_scripts2", + "installation_settings" + ] + + install_bootloader_steps = [ + "prep_shrink", # ensure that prep partition is small enough for boot sector (bnc#867345) + "bootloader", + ProductFeatures.GetBooleanFeature("globals", "enable_kdump") == true ? "kdump" : "", + "cio_ignore" + ] + end + @stages = [ { "id" => "copy_files", # progress stage "label" => _("Copy files to installed system"), - "steps" => [ - "autoinst_scripts1", - "copy_files", - "copy_systemfiles", - "clone", - # For live installer only - Mode.live_installation ? "live_copy_files" : "", - "switch_scr" - ], + "steps" => copy_files_steps, "icon" => "pattern-basis" }, { "id" => "save_config", # progress stage "label" => _("Save configuration"), - "steps" => [ - "ldconfig", - "save_config", - # For live installer only - Mode.live_installation ? "live_save_config" : "", - "default_target", - "desktop", - "storage", - "iscsi-client", - "fcoe-client", - "kernel", - "x11", - "proxy", - "pkg", - # product registration step is optional - WFM.ClientExists("scc_finish") ? "scc" : "", - "driver_update1", - # bnc #340733 - "system_settings" - ], + "steps" => save_config_steps, "icon" => "yast-desktop-select" }, { "id" => "save_settings", # progress stage "label" => _("Save installation settings"), - "steps" => [ - "yast_inf", - "network", - "firewall_stage1", - "ntp-client", - "ssh_settings", - "save_hw_status", - "users", - "autoinst_scripts2", - "installation_settings" - ], + "steps" => save_settings_steps, "icon" => "yast-network" }, # bnc#860089: Save bootloader as late as possible @@ -185,12 +233,7 @@ "id" => "install_bootloader", # progress stage "label" => _("Install boot manager"), - "steps" => [ - "prep_shrink", # ensure that prep partition is small enough for boot sector (bnc#867345) - "bootloader", - ProductFeatures.GetBooleanFeature("globals", "enable_kdump") == true ? "kdump" : "", - "cio_ignore" - ], + "steps" => install_bootloader_steps, "icon" => "yast-bootloader" }, { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.109/src/clients/inst_system_analysis.rb new/yast2-installation-3.1.113/src/clients/inst_system_analysis.rb --- old/yast2-installation-3.1.109/src/clients/inst_system_analysis.rb 2014-08-18 15:55:14.000000000 +0200 +++ new/yast2-installation-3.1.113/src/clients/inst_system_analysis.rb 2014-08-28 15:35:08.000000000 +0200 @@ -24,9 +24,9 @@ # Summary: Installation mode selection, system analysis # Authors: Jiri Srain <jsrain(a)suse.cz> # Lukas Ocilka <locilka(a)suse.cz> -# -# $Id$ -# + +require "yast" + module Yast class InstSystemAnalysisClient < Client def main @@ -290,6 +290,20 @@ true end + def download_and_show_release_notes + # try on-line release notes first + WFM.CallFunction("inst_download_release_notes") + + if InstData.release_notes.empty? && load_release_notes(Packages.GetBaseSourceID) + # push button + Wizard.ShowReleaseNotesButton(_("Re&lease Notes..."), "rel_notes") + + product_name = Product.name || _("Unknown Product") + InstData.release_notes[product_name] = @media_text + UI::SetReleaseNotes( { product_name => @media_text } ) + end + end + def InitInstallationRepositories # disable callbacks PackageCallbacks.RegisterEmptyProgressCallbacks @@ -301,29 +315,18 @@ if Packages.InitFailed # popup message Popup.Message( - _( - "Failed to initialize the software repositories.\nAborting the installation." - ) + _("Failed to initialize the software repositories.\nAborting the installation.") ) ret = false else @packager_initialized = true Packages.InitializeAddOnProducts - #try on-line release notes first - WFM.CallFunction("inst_download_release_notes") - if InstData.release_notes.empty? - if load_release_notes(Packages.GetBaseSourceID) - # push button - Wizard.ShowReleaseNotesButton(_("Re&lease Notes..."), "rel_notes") - - base_product = Product.FindBaseProducts.first || {} - product_name = base_product["name"] || _("Unknown Product") - InstData.release_notes[product_name] = @media_text - UI::SetReleaseNotes( { product_name => @media_text } ) - end - end + # bnc#886608: Adjusting product name (for &product; macro) right after we + # initialize libzypp and get the base product name (intentionally not translated) + UI.SetProductName(Product.name || "SUSE Linux") + download_and_show_release_notes end # reregister callbacks diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.109/src/clients/save_hw_status_finish.rb new/yast2-installation-3.1.113/src/clients/save_hw_status_finish.rb --- old/yast2-installation-3.1.109/src/clients/save_hw_status_finish.rb 2014-08-18 15:55:14.000000000 +0200 +++ new/yast2-installation-3.1.113/src/clients/save_hw_status_finish.rb 2014-08-28 15:35:08.000000000 +0200 @@ -31,8 +31,6 @@ # $Id$ # -require "installation/minimal_installation" - module Yast class SaveHwStatusFinishClient < Client def main @@ -63,12 +61,11 @@ Builtins.y2debug("param=%1", @param) if @func == "Info" - minimal_inst = ::Installation::MinimalInstallation.instance.enabled? return { "steps" => 1, # progress step title "title" => _("Saving hardware configuration..."), - "when" => minimal_inst ? [] : [:installation, :update, :autoinst] + "when" => [:installation, :update, :autoinst] } elsif @func == "Write" # Package yast2-printer needs to be installed diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.109/src/include/installation/inst_inc_first.rb new/yast2-installation-3.1.113/src/include/installation/inst_inc_first.rb --- old/yast2-installation-3.1.109/src/include/installation/inst_inc_first.rb 2014-08-18 15:55:14.000000000 +0200 +++ new/yast2-installation-3.1.113/src/include/installation/inst_inc_first.rb 2014-08-28 15:35:08.000000000 +0200 @@ -44,6 +44,7 @@ Yast.import "String" Yast.import "Mode" Yast.import "ProductFeatures" + Yast.import "AutoinstConfig" Yast.include include_target, "installation/misc.rb" end @@ -173,26 +174,33 @@ def HandleSecondStageRequired if Stage.initial # the current one is 'initial' - # after reboot/kexec it would be 'continue' - stage_to_check = "continue" - - # for matching the control file - mode_to_check = Mode.mode - - # file name - run_yast_at_boot = Builtins.sformat( - "%1/%2", - Installation.destdir, - Installation.run_yast_at_boot - ) - - Builtins.y2milestone( - "Checking RunRequired (%1, %2)", - stage_to_check, - mode_to_check - ) + run_second_stage = true + if (Mode.autoinst || Mode.autoupgrade) && !AutoinstConfig.second_stage + run_second_stage = false + Builtins.y2milestone("Autoyast: second stage is disabled") + else + # after reboot/kexec it would be 'continue' + stage_to_check = "continue" + + # for matching the control file + mode_to_check = Mode.mode + + # file name + run_yast_at_boot = Builtins.sformat( + "%1/%2", + Installation.destdir, + Installation.run_yast_at_boot + ) + + Builtins.y2milestone( + "Checking RunRequired (%1, %2)", + stage_to_check, + mode_to_check + ) + run_second_stage = ProductControl.RunRequired(stage_to_check, mode_to_check) + end - if ProductControl.RunRequired(stage_to_check, mode_to_check) + if run_second_stage Builtins.y2milestone("Running the second stage is required") WFM.Write(path(".local.string"), run_yast_at_boot, "") WriteSecondStageRequired(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 libsrtp for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '14

30 Aug '14

Hello community, here is the log from the commit of package libsrtp for openSUSE:Factory checked in at 2014-08-30 16:03:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libsrtp (Old) and /work/SRC/openSUSE:Factory/.libsrtp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libsrtp" Changes: -------- --- /work/SRC/openSUSE:Factory/libsrtp/libsrtp.changes 2013-10-17 17:41:33.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libsrtp.new/libsrtp.changes 2014-08-30 16:04:27.000000000 +0200 @@ -1,0 +2,12 @@ +Thu Aug 28 06:03:05 UTC 2014 - jengelh(a)inai.de + +- Relax build restrictions for SLE11 (needs BuildRequires xz to + even start, and we can drop dist-xz from the suggestive patch + so that automake ~1.10) + +------------------------------------------------------------------- +Tue Aug 26 21:16:21 UTC 2014 - jengelh(a)inai.de + +- Update project metadata, and patch description + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libsrtp.spec ++++++ --- /var/tmp/diff_new_pack.TILR5R/_old 2014-08-30 16:04:28.000000000 +0200 +++ /var/tmp/diff_new_pack.TILR5R/_new 2014-08-30 16:04:28.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libsrtp # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,15 +25,18 @@ License: BSD-3-Clause Group: Development/Libraries/C and C++ Url: http://srtp.sourceforge.net/srtp.html + +#Git-Clone: git://github.com/cisco/libsrtp Source: %{name}-git%{git_snapshot}.tar.xz -# PATCH-FEATURE-OPENSUSE libsrtp-automake.patch jengelh(a)medozas.de -- Support for automake to easily build shared library. +# PATCH-FEATURE-OPENSUSE libsrtp-automake.patch jengelh(a)inai.de -- Support for automake to easily build shared library. Patch: %{name}-automake.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf -BuildRequires: automake >= 1.11 +BuildRequires: automake BuildRequires: dos2unix BuildRequires: libtool BuildRequires: pkg-config +BuildRequires: xz Provides: srtp = %{version}-%{release} Obsoletes: srtp < %{version} @@ -130,13 +133,13 @@ %postun -n %{library_name} -p /sbin/ldconfig %files -n %{library_name} -%defattr(-,root,root,-) +%defattr(-,root,root) %{_libdir}/libsrtp.so.2* %files devel -%defattr(-,root,root,-) +%defattr(-,root,root) %doc CHANGES LICENSE README TODO VERSION doc/*.pdf doc/*.txt -%{_includedir}/srtp +%{_includedir}/srtp/ %{_libdir}/libsrtp.so %{_libdir}/pkgconfig/libsrtp.pc ++++++ libsrtp-automake.patch ++++++ --- /var/tmp/diff_new_pack.TILR5R/_old 2014-08-30 16:04:28.000000000 +0200 +++ /var/tmp/diff_new_pack.TILR5R/_new 2014-08-30 16:04:28.000000000 +0200 @@ -5,6 +5,14 @@ Also add a pkgconfig file for easy detection of presence and paths by secondary projects. +As libsrtp 1.4.5 has not yet officially been released (as a tarball, +on sf.net) and the API is still changing, using -release +${PACKAGE_VERSION} won't be of help. We really need to count ABI +versions ourselves. So far, + + libsrtp.so.1: srtp 1.4.4 + libsrtp.so.2: srtp 1.4.5-pre (7db9eb2c67ec8da7c016b7422885) + --- Makefile.am | 99 +++++++++++++++++++++++++++++++++++++++++++++ configure.in | 13 ++++- @@ -136,7 +144,7 @@ dnl Checks for programs. -AC_PROG_RANLIB -+AM_INIT_AUTOMAKE([-Wall foreign subdir-objects no-dist-gzip dist-xz tar-pax]) ++AM_INIT_AUTOMAKE([-Wall foreign subdir-objects tar-pax]) AC_PROG_CC +AM_PROG_CC_C_O AC_PROG_INSTALL -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit evolution-data-server for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '14

30 Aug '14

Hello community, here is the log from the commit of package evolution-data-server for openSUSE:Factory checked in at 2014-08-30 16:03:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/evolution-data-server (Old) and /work/SRC/openSUSE:Factory/.evolution-data-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "evolution-data-server" Changes: -------- --- /work/SRC/openSUSE:Factory/evolution-data-server/evolution-data-server.changes 2014-08-15 09:55:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.evolution-data-server.new/evolution-data-server.changes 2014-08-30 16:04:25.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Aug 27 12:17:03 UTC 2014 - fcrozat(a)suse.com + +- Add 0001-Bug-735311-Adapt-to-new-Google-HTTP-restriction.patch: + adapt to Google Calendar new HTTP restriction (bnc#893775, + bgo#735311). + +------------------------------------------------------------------- New: ---- 0001-Bug-735311-Adapt-to-new-Google-HTTP-restriction.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ evolution-data-server.spec ++++++ --- /var/tmp/diff_new_pack.nL0vzL/_old 2014-08-30 16:04:27.000000000 +0200 +++ /var/tmp/diff_new_pack.nL0vzL/_new 2014-08-30 16:04:27.000000000 +0200 @@ -40,6 +40,8 @@ Url: http://www.gnome.org Source0: http://download.gnome.org/sources/evolution-data-server/3.12/%{name}-%{vers… Source99: baselibs.conf +# PATCH-FIX-UPSTREAM 0001-Bug-735311-Adapt-to-new-Google-HTTP-restriction.patch bnc#893775 bgo#735311 fcrozat(a)suse.com -- Adapt to new Google HTTP restriction +Patch0: 0001-Bug-735311-Adapt-to-new-Google-HTTP-restriction.patch BuildRequires: db-devel %if %USE_EVOLDAP BuildRequires: evoldap2-devel @@ -255,6 +257,7 @@ %prep %setup -q translation-update-upstream +%patch0 -p1 %build %{configure} \ ++++++ 0001-Bug-735311-Adapt-to-new-Google-HTTP-restriction.patch ++++++ >From 5e9d80092b19f9bd2c02712ab0a50fa70b052c74 Mon Sep 17 00:00:00 2001 From: Matthew Barnes <mbarnes(a)redhat.com> Date: Mon, 25 Aug 2014 11:01:20 -0400 Subject: Bug 735311 - Adapt to new Google HTTP restriction Google has recently imposed a limit on the number of unauthorized HTTP requests to its OAuth2-based interfaces. The normal operation of SoupSession is to issue the first HTTP request unauthorized and see if the server issues a "401 Unauthorized" response (since not all HTTP services require authorization). On a "401 Unauthorized" response, SoupSession emits an "authenticate" signal, which the application is supposed to handle. Once credentials are in hand, SoupSession resends the same HTTP request and subsequent requests with an Authenticate header while the socket connection holds. Google's unauthorized request limit breaks this logic flow. Once the limit is exceeded, the Google server issues a "403 Forbidden" response instead of "401 Unauthorized" to an unauthorized HTTP request. This breaks error handling in the E-D-S CalDAV backend. The workaround is to preload the SoupAuthManager with a pre-configured SoupAuth when using OAuth 2.0 authentication. This avoids the initial unauthorized HTTP round-trip. The backend implements the GInitable interface for this since obtaining a valid access token is a failable step. (cherry picked from commit 00a465670ef3d8adbaf011b3e697ba5befb00623) diff --git a/calendar/backends/caldav/e-cal-backend-caldav.c b/calendar/backends/caldav/e-cal-backend-caldav.c index f189126..686020e 100644 --- a/calendar/backends/caldav/e-cal-backend-caldav.c +++ b/calendar/backends/caldav/e-cal-backend-caldav.c @@ -133,6 +133,8 @@ struct _ECalBackendCalDAVPrivate { }; /* Forward Declarations */ +static void e_caldav_backend_initable_init + (GInitableIface *interface); static void caldav_source_authenticator_init (ESourceAuthenticatorInterface *iface); @@ -141,6 +143,9 @@ G_DEFINE_TYPE_WITH_CODE ( e_cal_backend_caldav, E_TYPE_CAL_BACKEND_SYNC, G_IMPLEMENT_INTERFACE ( + G_TYPE_INITABLE, + e_caldav_backend_initable_init) + G_IMPLEMENT_INTERFACE ( E_TYPE_SOURCE_AUTHENTICATOR, caldav_source_authenticator_init)) @@ -5238,11 +5243,83 @@ e_cal_backend_caldav_finalize (GObject *object) G_OBJECT_CLASS (parent_class)->finalize (object); } -static void -e_cal_backend_caldav_init (ECalBackendCalDAV *cbdav) +static gboolean +caldav_backend_initable_init (GInitable *initable, + GCancellable *cancellable, + GError **error) { + ECalBackendCalDAVPrivate *priv; SoupSessionFeature *feature; + ESource *source; + const gchar *extension_name; + gchar *auth_method = NULL; + gboolean success = TRUE; + + priv = E_CAL_BACKEND_CALDAV_GET_PRIVATE (initable); + + feature = soup_session_get_feature ( + priv->session, SOUP_TYPE_AUTH_MANAGER); + + /* Add the "Bearer" auth type to support OAuth 2.0. */ + soup_session_feature_add_feature (feature, E_TYPE_SOUP_AUTH_BEARER); + g_mutex_init (&priv->bearer_auth_error_lock); + + /* Preload the SoupAuthManager with a valid "Bearer" token + * when using OAuth 2.0. This avoids an extra unauthorized + * HTTP round-trip, which apparently Google doesn't like. */ + + source = e_backend_get_source (E_BACKEND (initable)); + + extension_name = E_SOURCE_EXTENSION_AUTHENTICATION; + if (e_source_has_extension (source, extension_name)) { + ESourceAuthentication *extension; + + extension = e_source_get_extension (source, extension_name); + auth_method = e_source_authentication_dup_method (extension); + } + + if (g_strcmp0 (auth_method, "OAuth2") == 0) { + ESourceWebdav *extension; + SoupAuth *soup_auth; + SoupURI *soup_uri; + gchar *access_token = NULL; + gint expires_in_seconds = -1; + + extension_name = E_SOURCE_EXTENSION_WEBDAV_BACKEND; + extension = e_source_get_extension (source, extension_name); + soup_uri = e_source_webdav_dup_soup_uri (extension); + soup_auth = g_object_new ( + E_TYPE_SOUP_AUTH_BEARER, + SOUP_AUTH_HOST, soup_uri->host, NULL); + + success = e_source_get_oauth2_access_token_sync ( + source, cancellable, &access_token, + &expires_in_seconds, error); + + if (success) { + e_soup_auth_bearer_set_access_token ( + E_SOUP_AUTH_BEARER (soup_auth), + access_token, expires_in_seconds); + + soup_auth_manager_use_auth ( + SOUP_AUTH_MANAGER (feature), + soup_uri, soup_auth); + } + + g_free (access_token); + g_object_unref (soup_auth); + soup_uri_free (soup_uri); + } + + g_free (auth_method); + + return success; +} + +static void +e_cal_backend_caldav_init (ECalBackendCalDAV *cbdav) +{ cbdav->priv = E_CAL_BACKEND_CALDAV_GET_PRIVATE (cbdav); cbdav->priv->session = soup_session_sync_new (); g_object_set ( @@ -5257,17 +5334,6 @@ e_cal_backend_caldav_init (ECalBackendCalDAV *cbdav) cbdav->priv->session, "proxy-resolver", G_BINDING_SYNC_CREATE); - /* XXX SoupAuthManager is public API as of libsoup 2.42, but - * this isn't worth bumping our libsoup requirement over. - * So get the SoupAuthManager GType by its type name. */ - feature = soup_session_get_feature ( - cbdav->priv->session, - g_type_from_name ("SoupAuthManager")); - - /* Add the "Bearer" auth type to support OAuth 2.0. */ - soup_session_feature_add_feature (feature, E_TYPE_SOUP_AUTH_BEARER); - g_mutex_init (&cbdav->priv->bearer_auth_error_lock); - if (G_UNLIKELY (caldav_debug_show (DEBUG_MESSAGE))) caldav_debug_setup (cbdav->priv->session); @@ -5337,3 +5403,10 @@ e_cal_backend_caldav_class_init (ECalBackendCalDAVClass *class) backend_class->start_view = caldav_start_view; } + +static void +e_caldav_backend_initable_init (GInitableIface *interface) +{ + interface->init = caldav_backend_initable_init; +} + diff --git a/libedataserver/e-source-webdav.c b/libedataserver/e-source-webdav.c index eda83d5..9ddbbc0 100644 --- a/libedataserver/e-source-webdav.c +++ b/libedataserver/e-source-webdav.c @@ -244,7 +244,9 @@ source_webdav_update_soup_uri_from_properties (ESourceWebdav *webdav_extension) soup_uri_set_user (soup_uri, user); soup_uri_set_host (soup_uri, host); - soup_uri_set_port (soup_uri, port); + + if (port > 0) + soup_uri_set_port (soup_uri, port); /* SoupURI doesn't like NULL paths. */ soup_uri_set_path (soup_uri, (path != NULL) ? path : ""); -- cgit v0.10.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 resource-agents for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '14

30 Aug '14

Hello community, here is the log from the commit of package resource-agents for openSUSE:Factory checked in at 2014-08-30 16:03:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/resource-agents (Old) and /work/SRC/openSUSE:Factory/.resource-agents.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "resource-agents" Changes: -------- --- /work/SRC/openSUSE:Factory/resource-agents/resource-agents.changes 2014-07-24 06:58:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.resource-agents.new/resource-agents.changes 2014-08-30 16:04:23.000000000 +0200 @@ -1,0 +2,72 @@ +Thu Aug 28 08:18:51 UTC 2014 - kgronlund(a)suse.com + +- Add COPYING.LGPL + +------------------------------------------------------------------- +Wed Aug 27 14:35:29 UTC 2014 - kgronlund(a)suse.com + +- Disable monitoring-plugins-metadata + +------------------------------------------------------------------- +Tue Aug 26 12:34:00 UTC 2014 - kgronlund(a)suse.com + +- Add patch findif-multiple-routes-bnc892755.patch + - findif.sh: Use the most specific matching route (bnc#892755) + +------------------------------------------------------------------- +Thu Aug 14 15:19:21 UTC 2014 - kgronlund(a)suse.com + +- drop dependency on monitoring-plugins-udp since it is folded into + monitoring-plugins-tcp + +------------------------------------------------------------------- +Thu Aug 7 07:00:28 UTC 2014 - kgronlund(a)suse.com + +- Rename nagios-plugins-metadata to monitoring-plugins-metadata (bnc#890337) + +------------------------------------------------------------------- +Tue Aug 5 16:33:20 UTC 2014 - kgronlund(a)suse.com + +- Medium: Xen: Properly quote domain name in call to create +- Updated patch: xen-replace-xm-with-xl.patch + +------------------------------------------------------------------- +Tue Aug 5 13:58:13 UTC 2014 - kgronlund(a)suse.com + +- Low: oracledb.sh: remove process path from process search results +- Low: Dummy: add sample usage of 'ocf_exit_reason' +- High: shellfuncs: set exit error reason string +- Medium: oracle: fix setting monitor user profile for other languages (nls) +- Low: LVM: Warn users about the danger of lvmetad +- Low: nfsnotify: fixes error message output +- Low: nfsserver: fix usage of rquatad_port option +- Low: nfsserver: warn user when nfs port options can not be set +- Low: nfsserver: fixes issue with proc/fs/nfsd not being mounted during start on some distros +- Low: ocf-shellfunctions: handle local nodename when version has distro postfix +- Low: bind-mount.sh: Update meta-data to reflect required arguments +- Low: mysql: Refactoring mysql logic into common library that can be shared with galera agent +- Medium: oracle: reset MONUSR password if it expired +- High: oracle: try as sysdba if monitor as MONUSR fails +- High: oralistener.sh: Do not fail during stop if listener has already stopped +- Low: oracledb.sh: Fix exit_idle loop to exit process wait loop correctly +- Low: orainstance.sh: the exit_idle function was a no-op because of a malformed grep search +- Low: oralsnr: ignore listener case during grep for pid +- dropped merged patches: + - 0001-High-oracle-Require-monitoring-user-as-parameter-bnc.patch + - 0001-Medium-VirtualDomain-Try-xen-list-if-no-emulator-is-.patch + - 0001-Medium-mysql-Update-mysql-with-more-sensible-default.patch + - apache-fix-bnc884674.patch +- upstream cs: v3.9.5-508-g4f369d8 + +------------------------------------------------------------------- +Tue Aug 5 11:03:31 UTC 2014 - kgronlund(a)suse.com + +- Update license to include GPL-3.0+ + +------------------------------------------------------------------- +Tue Aug 5 07:15:07 UTC 2014 - kgronlund(a)suse.com + +- Reintroduce nagios plugins metadata (bnc#890337) + - Add nagios-plugins-metadata.tar.bz2 + +------------------------------------------------------------------- Old: ---- 0001-High-oracle-Require-monitoring-user-as-parameter-bnc.patch 0001-Medium-VirtualDomain-Try-xen-list-if-no-emulator-is-.patch 0001-Medium-mysql-Update-mysql-with-more-sensible-default.patch apache-fix-bnc884674.patch resource-agents-3.9.5+git453.tar.xz New: ---- findif-multiple-routes-bnc892755.patch monitoring-plugins-metadata.tar.bz2 resource-agents-3.9.5+git508.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ resource-agents.spec ++++++ --- /var/tmp/diff_new_pack.gPKRoA/_old 2014-08-30 16:04:25.000000000 +0200 +++ /var/tmp/diff_new_pack.gPKRoA/_new 2014-08-30 16:04:25.000000000 +0200 @@ -40,15 +40,20 @@ %define _rundir %{_localstatedir}/run %endif +# Disabled by default since openSUSE:Factory +# lacks monitoring-plugins +%define with_monitoring 0 + Name: resource-agents Summary: Open Source HA Reusable Cluster Resource Scripts -License: GPL-2.0 and LGPL-2.1+ +License: GPL-2.0 and LGPL-2.1+ and GPL-3.0+ Group: Productivity/Clustering/HA -Version: 3.9.5+git453 +Version: 3.9.5+git508 Release: 0 Url: http://linux-ha.org/ Source: resource-agents-%{version}.tar.xz Source1: resource-agents.conf +Source2: monitoring-plugins-metadata.tar.bz2 # PATCH-FIX-OPENSUSE: activate VG with partial PV by default Patch2: lvm-vg-partial-active.diff # PATCH-FIX-OPENSUSE: fix path to sm-notify @@ -61,10 +66,6 @@ Patch8: 0006-Revert-Low-build-Move-binaries-in-usr-lib-heartbeat-.patch # PATCH-FIX-OPENSUSE: fix sg_persist for code normalization Patch10: fix-sg_persist-for-code-normalization.patch -# PATCH-FIX-UPSTREAM: Require monitoring user as parameter (bnc#850589, bnc#859683), kgronlund(a)suse.com -Patch12: 0001-High-oracle-Require-monitoring-user-as-parameter-bnc.patch -# PATCH-FIX-UPSTREAM: mysql: Update mysql with more sensible defaults (bnc#863844) -Patch16: 0001-Medium-mysql-Update-mysql-with-more-sensible-default.patch # PATCH-FIX-UPSTREAM: sg_persist: fix commented by Lars Patch17: fix-sg_persist-commented-byLars.patch # PATCH: sg_persist: fix demote error @@ -75,10 +76,8 @@ Patch20: sg_persist-ocft-not-configure-iscsi.patch # PATCH-FIX-UPSTREAM: Allow Xen RA to use xl if available (bnc#882548) Patch21: xen-replace-xm-with-xl.patch -# PATCH-FIX-OPENSUSE: VirtualDomain: Try xen-list if no emulator is set (bnc#885292) -Patch22: 0001-Medium-VirtualDomain-Try-xen-list-if-no-emulator-is-.patch -# PATCH-FIX-UPSTREAM: Revised fix for apache RA on SUSE distributions (bnc#884674) -Patch23: apache-fix-bnc884674.patch +# PATCH-FIX-UPSTREAM: findif.sh: Use the most specific matching route (bnc#892755) +Patch22: findif-multiple-routes-bnc892755.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Obsoletes: heartbeat-resources @@ -114,6 +113,7 @@ %package -n ldirectord Summary: A Monitoring Daemon for Maintaining High Availability Resources +License: GPL-2.0 and LGPL-2.1+ Group: Productivity/Clustering/HA Requires: %{SSLeay} Requires: %{name} @@ -147,6 +147,29 @@ See 'ldirectord -h' and linux-ha/doc/ldirectord for more information. +%if %{with_monitoring} + +%package -n monitoring-plugins-metadata +Summary: Metadata for Monitoring plugins +License: LGPL-2.1+ and GPL-2.0+ +Group: Productivity/Clustering/HA +Provides: nagios-plugins-metadata +Requires: monitoring-plugins-fping +Requires: monitoring-plugins-http +Requires: monitoring-plugins-ldap +Requires: monitoring-plugins-mysql +Requires: monitoring-plugins-pgsql +Requires: monitoring-plugins-tcp +Requires: resource-agents +#BuildArch: noarch + +%description -n monitoring-plugins-metadata +XML files containing metadata which facilitates using nagios +plugins as resource agents. These files were produced from help +pages of individual nagios plugins. + +%endif + %prep ########################################################### %setup -q @@ -156,15 +179,12 @@ %patch5 -p1 %patch8 -p1 %patch10 -p1 -%patch12 -p1 -%patch16 -p1 %patch17 -p1 %patch18 -p1 %patch19 -p1 %patch20 -p1 %patch21 -p1 %patch22 -p1 -%patch23 -p1 ########################################################### %build @@ -231,6 +251,15 @@ done ) +%if %{with_monitoring} +# install nagios plugins XML metadata +tar -xjf %{SOURCE2} +mkdir -p %{buildroot}%{_datadir}/nagios/plugins-metadata +for file in $(find plugins-metadata -type f); do + install -m 644 $file %{buildroot}%{_datadir}/nagios/plugins-metadata +done +%endif + ########################################################### %clean @@ -310,6 +339,7 @@ %ghost %dir %attr (1755, root, root) %{_rundir}/resource-agents %doc AUTHORS %doc COPYING +%doc COPYING.LGPL %doc COPYING.GPLv3 %doc %{_datadir}/%{name}/ra-api-1.dtd %doc %{_mandir}/man7/*.7* @@ -347,4 +377,13 @@ %{_sysconfdir}/ha.d/resource.d/ldirectord %config(noreplace) %{_sysconfdir}/logrotate.d/ldirectord +%if %{with_monitoring} +%files -n monitoring-plugins-metadata +########################################################### +%defattr(-,root,root) +%dir %{_datadir}/nagios +%dir %{_datadir}/nagios/plugins-metadata +%attr(0644,root,root) %{_datadir}/nagios/plugins-metadata/* +%endif + %changelog ++++++ findif-multiple-routes-bnc892755.patch ++++++ commit b1d41edf4cab34f86facf7fc037a6a0783e79167 Author: Vincent Untz <vuntz(a)suse.com> Date: Wed Aug 20 16:17:33 2014 +0200 findif.sh: Use the most specific matching route When more than one interface is configured with a network that matches the IP address we're looking for, but with different networks, the "ip route" command we're using returns more than one line: ip -o -f inet route list match 10.122.24.59 scope link 10.122.0.0/18 dev eth1.12 proto kernel src 10.122.24.159 10.122.24.0/25 dev eth0 proto kernel src 10.122.24.53 The code assumed that only one line would be returned, and so it's parsing only the first line, without trying to find out which line is the best match. What we want is the route with the bigger netmask. It turns out that it also means that it's the route with the bigger network IP. https://bugzilla.novell.com/show_bug.cgi?id=892755 diff --git a/heartbeat/findif.sh b/heartbeat/findif.sh index fd92d9b..feb26ec 100644 --- a/heartbeat/findif.sh +++ b/heartbeat/findif.sh @@ -137,9 +137,9 @@ findif() fi if [ -n "$nic" ] ; then # NIC supports more than two. - set -- `ip -o -f $family route list match $match $scope | grep "dev $nic"` + set -- `ip -o -f $family route list match $match $scope | sort | tail -n1 | grep "dev $nic"` else - set -- `ip -o -f $family route list match $match $scope` + set -- `ip -o -f $family route list match $match $scope | sort | tail -n1` fi if [ $# = 0 ] ; then case $OCF_RESKEY_ip in ++++++ resource-agents-3.9.5+git453.tar.xz -> resource-agents-3.9.5+git508.tar.xz ++++++ ++++ 2094 lines of diff (skipped) ++++++ xen-replace-xm-with-xl.patch ++++++ --- /var/tmp/diff_new_pack.gPKRoA/_old 2014-08-30 16:04:25.000000000 +0200 +++ /var/tmp/diff_new_pack.gPKRoA/_new 2014-08-30 16:04:25.000000000 +0200 @@ -1,5 +1,5 @@ diff --git a/heartbeat/Xen b/heartbeat/Xen -index cbc7c373bfa2..c673faa54844 100755 +index cbc7c37..6659169 100755 --- a/heartbeat/Xen +++ b/heartbeat/Xen @@ -6,7 +6,7 @@ @@ -56,11 +56,19 @@ and stop actions used for Dom0 and the DomUs. The default is to not adjust memory dynamically. </longdesc> -@@ -187,30 +189,30 @@ Xen_Status() { +@@ -187,30 +189,38 @@ Xen_Status() { return $OCF_SUCCESS fi fi - STATUS=`xm list --long $1 2>/dev/null | grep status 2>/dev/null` ++ if have_binary xenstore-ls; then ++ xenstore-ls -f /vm | grep -E "/vm.*name = \"$1\"" > /dev/null 2>&1 ++ if [ $? -ne 0 ]; then ++ return $OCF_NOT_RUNNING ++ else ++ return $OCF_SUCCESS ++ fi ++ fi + STATUS=`$xentool list --long $1 2>/dev/null | grep status 2>/dev/null` if [ "X${STATUS}" != "X" ]; then # we have Xen 3.0.4 or higher @@ -92,7 +100,7 @@ # running; apparently, this period lasts only for a second or # two # If a status returns not running, then test status -@@ -251,16 +253,16 @@ Xen_Adjust_Memory() { +@@ -251,16 +261,16 @@ Xen_Adjust_Memory() { #NEWMEM=`echo "(${MAXMEM}-${OCF_RESKEY_reserved_Dom0_memory})/(${RUNCNT}+${CNTNEW})"|bc` NEWMEM=$(( (${MAXMEM} - ${OCF_RESKEY_reserved_Dom0_memory}) / (${RUNCNT} + ${CNTNEW} ) )) # do not rely on ballooning add dom0_mem=512 instead to force memory for dom0 @@ -112,7 +120,7 @@ } Xen_List_running() { ALL_DOMS=`Xen_List_all` -@@ -298,7 +300,7 @@ Xen_Monitor() { +@@ -298,7 +308,7 @@ Xen_Monitor() { } Xen_Total_Memory() { @@ -121,7 +129,7 @@ } Xen_Start() { -@@ -316,16 +318,16 @@ Xen_Start() { +@@ -316,16 +326,16 @@ Xen_Start() { Xen_Adjust_Memory 1 ocf_log info "New memory for virtual domains: ${NEWMEM}" sed -i -e "/^memory=/ s/^memory=.*/memory=${NEWMEM}/" ${OCF_RESKEY_xmfile} @@ -130,7 +138,7 @@ fi - xm create ${OCF_RESKEY_xmfile} name=$DOMAIN_NAME -+ $xentool create ${OCF_RESKEY_xmfile} name=$DOMAIN_NAME ++ $xentool create ${OCF_RESKEY_xmfile} name=\"$DOMAIN_NAME\" rc=$? if [ $rc -ne 0 ]; then return $OCF_ERR_GENERIC @@ -142,7 +150,7 @@ fi fi while sleep 1; do -@@ -350,18 +352,18 @@ xen_domain_stop() { +@@ -350,18 +360,18 @@ xen_domain_stop() { if [ "$timeout" -gt 0 ]; then ocf_log info "Xen domain $dom will be stopped (timeout: ${timeout}s)" if ocf_is_true "${OCF_RESKEY_shutdown_acpi}"; then @@ -165,7 +173,7 @@ if [ "$timeout" -eq 0 ]; then while Xen_Status $dom; do ocf_log warn "Xen domain $dom will be destroyed!" -@@ -369,7 +371,7 @@ xen_domain_stop() { +@@ -369,7 +379,7 @@ xen_domain_stop() { sleep 1 done # Note: This does not give up. stop isn't allowed to to fail. @@ -174,7 +182,7 @@ # This is the correct behaviour. fi -@@ -381,18 +383,18 @@ Xen_Stop() { +@@ -381,18 +391,18 @@ Xen_Stop() { if Xen_Status_with_Retry ${DOMAIN_NAME}; then vm=${DOMAIN_NAME} elif Xen_Status migrating-${DOMAIN_NAME}; then @@ -198,7 +206,7 @@ $xenkill ${DOMAIN_NAME} fi -@@ -404,10 +406,10 @@ Xen_Migrate_To() { +@@ -404,10 +414,10 @@ Xen_Migrate_To() { target_node="$OCF_RESKEY_CRM_meta_migrate_target" target_attr="$OCF_RESKEY_node_ip_attribute" target_addr="$target_node" @@ -212,7 +220,7 @@ if [ -n "$target_attr" ]; then nodevalue=`crm_attribute --type nodes --node-uname $target_node --attr-name $target_attr --get-value -q` if [ -n "${nodevalue}" -a "${nodevalue}" != "(null)" ]; then -@@ -416,15 +418,18 @@ Xen_Migrate_To() { +@@ -416,15 +426,18 @@ Xen_Migrate_To() { fi fi @@ -236,7 +244,7 @@ return $OCF_SUCCESS fi else -@@ -495,19 +500,19 @@ else +@@ -495,19 +508,19 @@ else DOMAIN_NAME=${DOMAIN_NAME:-${OCF_RESOURCE_INSTANCE}} fi -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libyui-qt-pkg for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '14

30 Aug '14

Hello community, here is the log from the commit of package libyui-qt-pkg for openSUSE:Factory checked in at 2014-08-30 16:03:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libyui-qt-pkg (Old) and /work/SRC/openSUSE:Factory/.libyui-qt-pkg.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libyui-qt-pkg" Changes: -------- --- /work/SRC/openSUSE:Factory/libyui-qt-pkg/libyui-qt-pkg.changes 2014-07-29 16:48:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libyui-qt-pkg.new/libyui-qt-pkg.changes 2014-08-30 16:04:21.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Aug 26 13:12:05 UTC 2014 - mvidner(a)suse.com + +- Really added the libqdiagsolver conflict (bnc#870683, bnc#866622). +- 2.44.7 + +------------------------------------------------------------------- Old: ---- libyui-qt-pkg-2.44.6.tar.bz2 New: ---- libyui-qt-pkg-2.44.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libyui-qt-pkg-doc.spec ++++++ --- /var/tmp/diff_new_pack.0E92NB/_old 2014-08-30 16:04:22.000000000 +0200 +++ /var/tmp/diff_new_pack.0E92NB/_new 2014-08-30 16:04:22.000000000 +0200 @@ -17,7 +17,7 @@ Name: libyui-qt-pkg-doc -Version: 2.44.6 +Version: 2.44.7 Release: 0 Source: libyui-qt-pkg-%{version}.tar.bz2 ++++++ libyui-qt-pkg.spec ++++++ --- /var/tmp/diff_new_pack.0E92NB/_old 2014-08-30 16:04:22.000000000 +0200 +++ /var/tmp/diff_new_pack.0E92NB/_new 2014-08-30 16:04:22.000000000 +0200 @@ -17,7 +17,7 @@ Name: libyui-qt-pkg -Version: 2.44.6 +Version: 2.44.7 Release: 0 Source: libyui-qt-pkg-%{version}.tar.bz2 @@ -35,10 +35,6 @@ %define libzypp_devel_version libzypp-devel >= 12.5.0 BuildRequires: %{libzypp_devel_version} -# new packager is in qt5 and crashes if qt3 diagsolver is used (bnc#870683) -Obsoletes: libqdialogsolver1 < 1.4.0 -Conflicts: libqdialogsolver1 < 1.4.0 - Url: http://github.com/libyui/ Summary: Libyui - Qt Package Selector License: LGPL-2.1 or LGPL-3.0 @@ -60,6 +56,10 @@ Provides: libyui_pkg Supplements: packageand(libyui-qt:yast2-packager) +# new packager is in qt5 and crashes if qt3 diagsolver is used (bnc#870683) +Obsoletes: libqdialogsolver1 < 1.4.0 +Conflicts: libqdialogsolver1 < 1.4.0 + Url: http://github.com/libyui/ Summary: Libyui - Qt Package Selector Group: System/Libraries ++++++ libyui-qt-pkg-2.44.6.tar.bz2 -> libyui-qt-pkg-2.44.7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.44.6/ChangeLog new/libyui-qt-pkg-2.44.7/ChangeLog --- old/libyui-qt-pkg-2.44.6/ChangeLog 2014-07-28 14:35:44.000000000 +0200 +++ new/libyui-qt-pkg-2.44.7/ChangeLog 2014-08-26 15:35:19.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Aug 26 13:12:05 UTC 2014 - mvidner(a)suse.com + +- Really added the libqdiagsolver conflict (bnc#870683, bnc#866622). +- 2.44.7 + +------------------------------------------------------------------- Mon Jul 28 12:23:18 UTC 2014 - mvidner(a)suse.com - Recommend this package when yast2-packager and libyui-qt are diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.44.6/VERSION.cmake new/libyui-qt-pkg-2.44.7/VERSION.cmake --- old/libyui-qt-pkg-2.44.6/VERSION.cmake 2014-07-28 14:35:44.000000000 +0200 +++ new/libyui-qt-pkg-2.44.7/VERSION.cmake 2014-08-26 15:35:19.000000000 +0200 @@ -1,6 +1,6 @@ SET( VERSION_MAJOR "2" ) SET( VERSION_MINOR "44" ) -SET( VERSION_PATCH "6" ) +SET( VERSION_PATCH "7" ) SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" ) ##### This is need for the libyui core, ONLY. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.44.6/libyui-qt-pkg.spec.in new/libyui-qt-pkg-2.44.7/libyui-qt-pkg.spec.in --- old/libyui-qt-pkg-2.44.6/libyui-qt-pkg.spec.in 2014-07-28 14:35:44.000000000 +0200 +++ new/libyui-qt-pkg-2.44.7/libyui-qt-pkg.spec.in 2014-08-26 15:35:19.000000000 +0200 @@ -35,10 +35,6 @@ %define libzypp_devel_version libzypp-devel >= 12.5.0 BuildRequires: %{libzypp_devel_version} -# new packager is in qt5 and crashes if qt3 diagsolver is used (bnc#870683) -Obsoletes: libqdialogsolver1 < 1.4.0 -Conflicts: libqdialogsolver1 < 1.4.0 - Url: @URL@ Summary: @SUMMARY@ License: LGPL-2.1 or LGPL-3.0 @@ -58,6 +54,10 @@ Provides: libyui_pkg Supplements: packageand(libyui-qt:yast2-packager) +# new packager is in qt5 and crashes if qt3 diagsolver is used (bnc#870683) +Obsoletes: libqdialogsolver1 < 1.4.0 +Conflicts: libqdialogsolver1 < 1.4.0 + Url: @URL@ Summary: @SUMMARY@ Group: System/Libraries -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libyui for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '14

30 Aug '14

Hello community, here is the log from the commit of package libyui for openSUSE:Factory checked in at 2014-08-30 16:03:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libyui (Old) and /work/SRC/openSUSE:Factory/.libyui.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libyui" Changes: -------- --- /work/SRC/openSUSE:Factory/libyui/libyui.changes 2014-05-27 11:51:17.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libyui.new/libyui.changes 2014-08-30 16:04:18.000000000 +0200 @@ -1,0 +2,11 @@ +Wed Aug 27 16:32:52 CEST 2014 - locilka(a)suse.com + +- The default product name should be "SUSE Linux" (bnc#886608) +- 3.1.4 + +------------------------------------------------------------------- +Mon Aug 25 12:41:39 UTC 2014 - lslezak(a)suse.cz + +- Detect lib64 in a Debian compatible way, for Travis CI. + +------------------------------------------------------------------- Old: ---- libyui-3.1.3.tar.bz2 New: ---- libyui-3.1.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libyui-doc.spec ++++++ --- /var/tmp/diff_new_pack.PVld31/_old 2014-08-30 16:04:20.000000000 +0200 +++ /var/tmp/diff_new_pack.PVld31/_new 2014-08-30 16:04:20.000000000 +0200 @@ -17,7 +17,7 @@ Name: libyui-doc -Version: 3.1.3 +Version: 3.1.4 Release: 0 Source: libyui-%{version}.tar.bz2 ++++++ libyui.spec ++++++ --- /var/tmp/diff_new_pack.PVld31/_old 2014-08-30 16:04:20.000000000 +0200 +++ /var/tmp/diff_new_pack.PVld31/_new 2014-08-30 16:04:20.000000000 +0200 @@ -17,7 +17,7 @@ Name: libyui -Version: 3.1.3 +Version: 3.1.4 Release: 0 Source: libyui-%{version}.tar.bz2 ++++++ libyui-3.1.3.tar.bz2 -> libyui-3.1.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-3.1.3/.travis.yml new/libyui-3.1.4/.travis.yml --- old/libyui-3.1.3/.travis.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/libyui-3.1.4/.travis.yml 2014-08-25 14:57:18.000000000 +0200 @@ -0,0 +1,14 @@ +language: cpp +compiler: + - gcc +# install additional packages +# http://docs.travis-ci.com/user/installing-dependencies/ +before_install: + - sudo apt-get update -qq + - sudo apt-get install -y libboost-dev +script: + - make -f Makefile.cvs + - cd build + - make -j 4 + - sudo make install + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-3.1.3/ChangeLog new/libyui-3.1.4/ChangeLog --- old/libyui-3.1.3/ChangeLog 2014-05-26 13:57:46.000000000 +0200 +++ new/libyui-3.1.4/ChangeLog 2014-08-27 16:57:17.000000000 +0200 @@ -1,4 +1,15 @@ ------------------------------------------------------------------- +Wed Aug 27 16:32:52 CEST 2014 - locilka(a)suse.com + +- The default product name should be "SUSE Linux" (bnc#886608) +- 3.1.4 + +------------------------------------------------------------------- +Mon Aug 25 12:41:39 UTC 2014 - lslezak(a)suse.cz + +- Detect lib64 in a Debian compatible way, for Travis CI. + +------------------------------------------------------------------- Sat May 24 20:48:47 UTC 2014 - bjoern.esser(a)gmail.com - pull in GPLv3-license, since LGPLv3 is additional rules on top diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-3.1.3/README.md new/libyui-3.1.4/README.md --- old/libyui-3.1.3/README.md 2014-02-18 17:12:09.000000000 +0100 +++ new/libyui-3.1.4/README.md 2014-08-25 14:57:18.000000000 +0200 @@ -1 +1,4 @@ ![libYUI-boilerplate](http://img191.imageshack.us/img191/9364/libyui.png) + + +[![Build Status](https://travis-ci.org/libyui/libyui.png?branch=master)](https://tra… diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-3.1.3/Rakefile new/libyui-3.1.4/Rakefile --- old/libyui-3.1.3/Rakefile 2014-04-22 17:47:44.000000000 +0200 +++ new/libyui-3.1.4/Rakefile 2014-08-13 10:22:11.000000000 +0200 @@ -38,10 +38,9 @@ puts 'No tests yet' if verbose end -LIBYUI_PREFIX = ENV["HOME"] + "/libyui-prefix" -LIBYUI_BASE = ENV.fetch("LIBYUI_BASE", "../libyui") +LIBYUI_PREFIX = ENV.fetch("LIBYUI_PREFIX", ENV["HOME"] + "/libyui-prefix") +LIBYUI_BASE = ENV.fetch("LIBYUI_BASE", "../libyui") -# build the gem package desc 'Build a tarball for OBS' task :tarball do rm_rf BUILDDIR diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-3.1.3/VERSION.cmake new/libyui-3.1.4/VERSION.cmake --- old/libyui-3.1.3/VERSION.cmake 2014-05-26 13:57:46.000000000 +0200 +++ new/libyui-3.1.4/VERSION.cmake 2014-08-27 16:57:17.000000000 +0200 @@ -1,6 +1,6 @@ SET( VERSION_MAJOR "3") SET( VERSION_MINOR "1" ) -SET( VERSION_PATCH "3" ) +SET( VERSION_PATCH "4" ) SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${GIT_SHA1_VERSION}" ) ##### This is need for the libyui core, ONLY. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-3.1.3/buildtools/Doxyfile.in new/libyui-3.1.4/buildtools/Doxyfile.in --- old/libyui-3.1.3/buildtools/Doxyfile.in 2014-02-18 17:12:09.000000000 +0100 +++ new/libyui-3.1.4/buildtools/Doxyfile.in 2014-08-15 09:47:11.000000000 +0200 @@ -20,7 +20,7 @@ STRIP_FROM_PATH = STRIP_FROM_INC_PATH = SHORT_NAMES = NO -JAVADOC_AUTOBRIEF = NO +JAVADOC_AUTOBRIEF = YES QT_AUTOBRIEF = YES MULTILINE_CPP_IS_BRIEF = NO INHERIT_DOCS = YES @@ -34,7 +34,7 @@ OPTIMIZE_OUTPUT_VHDL = NO EXTENSION_MAPPING = MARKDOWN_SUPPORT = YES -BUILTIN_STL_SUPPORT = NO +BUILTIN_STL_SUPPORT = YES CPP_CLI_SUPPORT = NO SIP_SUPPORT = NO IDL_PROPERTY_SUPPORT = YES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-3.1.3/buildtools/LibyuiCommon.cmake new/libyui-3.1.4/buildtools/LibyuiCommon.cmake --- old/libyui-3.1.3/buildtools/LibyuiCommon.cmake 2014-02-21 11:30:58.000000000 +0100 +++ new/libyui-3.1.4/buildtools/LibyuiCommon.cmake 2014-08-25 14:57:18.000000000 +0200 @@ -135,11 +135,12 @@ MACRO( SET_LIBDIR ) IF( NOT LIB_DIR ) - IF (CMAKE_SIZEOF_VOID_P MATCHES "8") + GET_PROPERTY( LIB64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS ) + IF( "${LIB64}" STREQUAL "TRUE" ) SET( LIB_DIR "lib64" ) - ELSE (CMAKE_SIZEOF_VOID_P MATCHES "8") - SET( LIB_DIR "lib" ) - ENDIF (CMAKE_SIZEOF_VOID_P MATCHES "8") + ELSE() + SET( LIB_DIR "lib" ) + ENDIF() ELSE( NOT LIB_DIR ) STRING( REPLACE "${PREFIX}/" "" LIB_DIR "${LIB_DIR}" ) ENDIF( NOT LIB_DIR ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-3.1.3/src/YApplication.cc new/libyui-3.1.4/src/YApplication.cc --- old/libyui-3.1.3/src/YApplication.cc 2014-04-18 13:07:40.000000000 +0200 +++ new/libyui-3.1.4/src/YApplication.cc 2014-08-27 16:57:17.000000000 +0200 @@ -44,7 +44,7 @@ struct YApplicationPrivate { YApplicationPrivate() - : productName( "openSUSE" ) + : productName( "SUSE Linux" ) , reverseLayout( false ) , showProductLogo( false ) {} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-3.1.3/src/YItem.h new/libyui-3.1.4/src/YItem.h --- old/libyui-3.1.3/src/YItem.h 2014-02-18 17:12:09.000000000 +0100 +++ new/libyui-3.1.4/src/YItem.h 2014-08-15 09:47:11.000000000 +0200 @@ -31,8 +31,14 @@ class YItem; +// without "documenting" the file, typedefs will be dropped +//! @file + +//! Collection of pointers to YItem. typedef std::vector<YItem *> YItemCollection; +//! Mutable iterator over @ref YItemCollection. typedef YItemCollection::iterator YItemIterator; +//! Const iterator over @ref YItemCollection. typedef YItemCollection::const_iterator YItemConstIterator; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-3.1.3/src/YTableItem.h new/libyui-3.1.4/src/YTableItem.h --- old/libyui-3.1.3/src/YTableItem.h 2014-02-18 17:12:09.000000000 +0100 +++ new/libyui-3.1.4/src/YTableItem.h 2014-08-15 09:47:11.000000000 +0200 @@ -30,8 +30,14 @@ class YTableCell; +// without "documenting" the file, typedefs will be dropped +//! @file + +//! Collection of pointers to YTableCell typedef std::vector<YTableCell *> YTableCellCollection; +//! Mutable iterator over @ref YTableCellCollection typedef YTableCellCollection::iterator YTableCellIterator; +//! Const iterator over @ref YTableCellCollection typedef YTableCellCollection::const_iterator YTableCellConstIterator; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2 for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '14

30 Aug '14

Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at 2014-08-30 16:03:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2 (Old) and /work/SRC/openSUSE:Factory/.yast2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2/yast2.changes 2014-08-25 11:03:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2.new/yast2.changes 2014-08-30 16:04:16.000000000 +0200 @@ -1,0 +2,12 @@ +Wed Aug 27 13:24:34 CEST 2014 - locilka(a)suse.com + +- Lazy-loading SuSEfirewall2 services - some new services can be + added when Yast is already running, and the config has been read + already (bnc#872960) +- Preventing from showing incorrect service name or description if + they are coming from TEMPLATE file (bnc#893583) +- Fixed service file parsing - comments starting with more than one + '#' characters were reported as unexpected input (just warning) +- 3.1.102 + +------------------------------------------------------------------- Old: ---- yast2-3.1.101.tar.bz2 New: ---- yast2-3.1.102.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.02OEJQ/_old 2014-08-30 16:04:17.000000000 +0200 +++ /var/tmp/diff_new_pack.02OEJQ/_new 2014-08-30 16:04:17.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.101 +Version: 3.1.102 Release: 0 Url: https://github.com/yast/yast-yast2 ++++++ yast2-3.1.101.tar.bz2 -> yast2-3.1.102.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.101/library/network/src/modules/SuSEFirewall.rb new/yast2-3.1.102/library/network/src/modules/SuSEFirewall.rb --- old/yast2-3.1.101/library/network/src/modules/SuSEFirewall.rb 2014-08-21 13:42:19.000000000 +0200 +++ new/yast2-3.1.102/library/network/src/modules/SuSEFirewall.rb 2014-08-27 14:27:18.000000000 +0200 @@ -2480,7 +2480,7 @@ Progress.New( read_caption, " ", - 4, + 3, [ # TRANSLATORS: Progress step _("Check for network devices"), @@ -2488,8 +2488,6 @@ _("Read current configuration"), # TRANSLATORS: Progress step _("Check possibly conflicting services"), - # TRANSLATORS: Progress step - _("Read dynamic definitions of installed services") ], [ # TRANSLATORS: Progress step @@ -2498,8 +2496,6 @@ _("Reading current configuration..."), # TRANSLATORS: Progress step _("Checking possibly conflicting services..."), - # TRANSLATORS: Progress step - _("Reading dynamic definitions of installed services..."), Message.Finished ], "" @@ -2545,10 +2541,6 @@ Progress.NextStage if have_progress - SuSEFirewallServices.ReadServicesDefinedByRPMPackages - - Progress.NextStage if have_progress - # bnc #399217 # Converting built-in service definitions to services defined by packages ConvertToServicesDefinedByPackages() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.101/library/network/src/modules/SuSEFirewallServices.rb new/yast2-3.1.102/library/network/src/modules/SuSEFirewallServices.rb --- old/yast2-3.1.101/library/network/src/modules/SuSEFirewallServices.rb 2014-08-21 13:42:19.000000000 +0200 +++ new/yast2-3.1.102/library/network/src/modules/SuSEFirewallServices.rb 2014-08-27 14:27:18.000000000 +0200 @@ -65,6 +65,9 @@ IGNORED_SERVICES = ["TEMPLATE", "..", "."] + TEMPLATE_SERVICE_NAME = "template service" + TEMPLATE_SERVICE_DESCRIPTION = "opens ports for foo in order to allow bar" + def main textdomain "base" @@ -312,15 +315,22 @@ "comments" => [ # jail followed by anything but jail (immediately) "^[ \t]*#[^#].*$", + # comments that are not commented key:value pairs (see "params") + # they always use two jails + "^[ \t]*##[ \t]*[^([a-zA-Z0-9_]+:.*)]$", + # comments with three jails and more + "^[ \t]*###.*$", # jail alone - "^[ \t]*\#$", + "^[ \t]*#[ \t]*$", # (empty space) "^[ \t]*$", # sysconfig entries "^[ \t]*[a-zA-Z0-9_]+.*" ], "params" => [ - { "match" => ["^##[ \t]*([^:]+):[ \t]*(.*)[ \t]*$", "%s: %s"] } + # commented key:value pairs + # e.g.: ## Name: service name + { "match" => ["^##[ \t]*([a-zA-Z0-9_]+):[ \t]*(.*)[ \t]*$", "%s: %s"] } ] } ) @@ -360,6 +370,7 @@ # # @return [Boolean] if successful def ReadServicesDefinedByRPMPackages + log.info "Reading SuSEfirewall2 services from #{SERVICES_DIR}" @services ||= {} if !FileUtils.Exists(SERVICES_DIR) || @@ -434,9 +445,17 @@ ) ) ) - next if definition.nil? || definition == "" + next if definition.nil? || definition.empty? # call gettext to translate the metadata @services[service_name][metadata_key] = Builtins.dgettext(SERVICES_TEXTDOMAIN, definition) + + # bnc#893583: Sanitize metadata, do not allow using texts from template service + case metadata_key + when "name" + @services[service_name][metadata_key] = filename if definition == TEMPLATE_SERVICE_NAME + when "description" + @services[service_name][metadata_key] = "" if definition == TEMPLATE_SERVICE_DESCRIPTION + end end SCR.UnregisterAgent(path(".firewall_service_metadata")) @@ -445,6 +464,8 @@ end end + log.info "Services found: #{(a)services.keys.sort}" + true end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.101/package/yast2.changes new/yast2-3.1.102/package/yast2.changes --- old/yast2-3.1.101/package/yast2.changes 2014-08-21 13:42:19.000000000 +0200 +++ new/yast2-3.1.102/package/yast2.changes 2014-08-27 14:27:18.000000000 +0200 @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Wed Aug 27 13:24:34 CEST 2014 - locilka(a)suse.com + +- Lazy-loading SuSEfirewall2 services - some new services can be + added when Yast is already running, and the config has been read + already (bnc#872960) +- Preventing from showing incorrect service name or description if + they are coming from TEMPLATE file (bnc#893583) +- Fixed service file parsing - comments starting with more than one + '#' characters were reported as unexpected input (just warning) +- 3.1.102 + +------------------------------------------------------------------- Thu Aug 21 13:29:52 CEST 2014 - locilka(a)suse.com - Fixed checking whether SuSEfirewall2 package is selected or diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.101/package/yast2.spec new/yast2-3.1.102/package/yast2.spec --- old/yast2-3.1.101/package/yast2.spec 2014-08-21 13:42:19.000000000 +0200 +++ new/yast2-3.1.102/package/yast2.spec 2014-08-27 14:27:18.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.101 +Version: 3.1.102 Release: 0 URL: https://github.com/yast/yast-yast2 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit grub2 for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '14

30 Aug '14

Hello community, here is the log from the commit of package grub2 for openSUSE:Factory checked in at 2014-08-30 16:03:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/grub2 (Old) and /work/SRC/openSUSE:Factory/.grub2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "grub2" Changes: -------- --- /work/SRC/openSUSE:Factory/grub2/grub2.changes 2014-08-15 09:55:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2014-08-30 16:04:12.000000000 +0200 @@ -1,0 +2,41 @@ +Wed Aug 27 07:53:35 UTC 2014 - schwab(a)suse.de + +- aarch64-reloc.patch: replace with upstream solution + +------------------------------------------------------------------- +Mon Aug 25 03:10:18 UTC 2014 - mchang(a)suse.com + +- remove unused patch, which's supersceded by new snapper rollback + support patches + * 0001-script-provide-overridable-root-by-subvol.patch + * 0002-script-create-menus-for-btrfs-snapshot.patch + +------------------------------------------------------------------- +Fri Aug 22 10:05:13 UTC 2014 - mchang(a)suse.com + +- fix openqa boot error on separate boot partition + * refresh grub2-btrfs-05-grub2-mkconfig.patch + +------------------------------------------------------------------- +Thu Aug 21 06:10:07 UTC 2014 - mchang(a)suse.com + +- update snapper plugin for rollback support + * refresh grub2-snapper-plugin.sh + +------------------------------------------------------------------- +Fri Aug 15 07:55:54 UTC 2014 - mchang(a)suse.com + +- snapper rollback support patches. +- rename patch + * 0002-btrfs-add-ability-to-boot-from-subvolumes.patch to + grub2-btrfs-01-add-ability-to-boot-from-subvolumes.patch + * 0004-btrfs-export-subvolume-envvars.patch to + grub2-btrfs-02-export-subvolume-envvars.patch +- added patches + * grub2-btrfs-03-follow_default.patch + * grub2-btrfs-04-grub2-install.patch + * grub2-btrfs-05-grub2-mkconfig.patch +- remove patch + * 0003-cmdline-add-envvar-loader_cmdline_append.patch + +------------------------------------------------------------------- Old: ---- 0001-script-provide-overridable-root-by-subvol.patch 0002-btrfs-add-ability-to-boot-from-subvolumes.patch 0002-script-create-menus-for-btrfs-snapshot.patch 0003-cmdline-add-envvar-loader_cmdline_append.patch 0004-btrfs-export-subvolume-envvars.patch New: ---- grub2-btrfs-01-add-ability-to-boot-from-subvolumes.patch grub2-btrfs-02-export-subvolume-envvars.patch grub2-btrfs-03-follow_default.patch grub2-btrfs-04-grub2-install.patch grub2-btrfs-05-grub2-mkconfig.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grub2.spec ++++++ --- /var/tmp/diff_new_pack.jibj9k/_old 2014-08-30 16:04:14.000000000 +0200 +++ /var/tmp/diff_new_pack.jibj9k/_new 2014-08-30 16:04:14.000000000 +0200 @@ -151,11 +151,11 @@ Patch41: grub2-vbe-blacklist-preferred-1440x900x32.patch Patch42: grub2-btrfs-fix-incorrect-address-reference.patch # Btrfs snapshot booting related patches -Patch101: 0002-btrfs-add-ability-to-boot-from-subvolumes.patch -Patch102: 0003-cmdline-add-envvar-loader_cmdline_append.patch -Patch103: 0004-btrfs-export-subvolume-envvars.patch -Patch110: 0001-script-provide-overridable-root-by-subvol.patch -Patch111: 0002-script-create-menus-for-btrfs-snapshot.patch +Patch101: grub2-btrfs-01-add-ability-to-boot-from-subvolumes.patch +Patch102: grub2-btrfs-02-export-subvolume-envvars.patch +Patch103: grub2-btrfs-03-follow_default.patch +Patch104: grub2-btrfs-04-grub2-install.patch +Patch105: grub2-btrfs-05-grub2-mkconfig.patch # PowerPC LE support Patch201: grub2-ppc64le-01-Add-Little-Endian-support-for-Power64-to-the-build.patch Patch202: grub2-ppc64le-02-Build-grub-as-O1-until-we-add-savegpr-and-restgpr-ro.patch @@ -354,8 +354,8 @@ %patch101 -p1 %patch102 -p1 %patch103 -p1 -%patch110 -p1 -%patch111 -p1 +%patch104 -p1 +%patch105 -p1 %patch201 -p1 %patch202 -p1 %patch203 -p1 ++++++ aarch64-reloc.patch ++++++ --- /var/tmp/diff_new_pack.jibj9k/_old 2014-08-30 16:04:14.000000000 +0200 +++ /var/tmp/diff_new_pack.jibj9k/_new 2014-08-30 16:04:14.000000000 +0200 @@ -1,56 +1,27 @@ -From f472bc5ac54e72eb09b0606f588085af504d754b Mon Sep 17 00:00:00 2001 -From: Andreas Schwab <schwab(a)suse.de> -Date: Tue, 12 Aug 2014 10:42:43 +0200 -Subject: [PATCH] Support R_AARCH64_PREL32 relocation +From 668add258ff7ffcfdc2c501fe5eb32e53c69b6f4 Mon Sep 17 00:00:00 2001 +From: Andrey Borzenkov <arvidjaar(a)gmail.com> +Date: Mon, 30 Dec 2013 12:56:19 +0000 +Subject: [PATCH] strip .eh_frame section from arm64-efi kernel - * include/grub/elf.h (R_AARCH64_PREL32): Define. - * util/grub-mkimagexx.c (make_reloc_section): Handle it. - (relocate_addresses): Likewise. +Fixes grub-mkimage error "relocation 0x105 is not implemented yet." --- - include/grub/elf.h | 1 + - util/grub-mkimagexx.c | 10 ++++++++++ - 2 files changed, 11 insertions(+) + ChangeLog | 4 ++++ + grub-core/Makefile.core.def | 2 +- + 2 files changed, 5 insertions(+), 1 deletion(-) -diff --git a/include/grub/elf.h b/include/grub/elf.h -index caa7963..836b304 100644 ---- a/include/grub/elf.h -+++ b/include/grub/elf.h -@@ -2070,6 +2070,7 @@ typedef Elf32_Addr Elf32_Conflict; - #define R_AARCH64_ABS32 258 /* Direct 32 bit. */ - #define R_AARCH64_JUMP26 282 /* 26-bit relative. */ - #define R_AARCH64_CALL26 283 /* 26-bit relative. */ -+#define R_AARCH64_PREL32 261 /* 32-bit pc-relative. */ - #define R_AARCH64_COPY 1024 /* Copy symbol at runtime. */ - #define R_AARCH64_GLOB_DAT 1025 /* Create GOT entry. */ - #define R_AARCH64_JUMP_SLOT 1026 /* Create PLT entry. */ -diff --git a/util/grub-mkimagexx.c b/util/grub-mkimagexx.c -index 0a1ac9e..376dc2d 100644 ---- a/util/grub-mkimagexx.c -+++ b/util/grub-mkimagexx.c -@@ -836,6 +836,15 @@ SUFFIX (relocate_addresses) (Elf_Ehdr *e, Elf_Shdr *sections, - *target = grub_host_to_target64 (grub_target_to_host64 (*target) + sym_addr); - } - break; -+ case R_AARCH64_PREL32: -+ { -+ grub_uint32_t *t32 = (grub_uint32_t *) target; -+ *t32 = grub_host_to_target64 (grub_target_to_host32 (*t32) -+ + sym_addr -+ - target_section_addr - offset -+ - image_target->vaddr_offset); -+ break; -+ } - case R_AARCH64_JUMP26: - case R_AARCH64_CALL26: - { -@@ -1197,6 +1206,7 @@ SUFFIX (make_reloc_section) (Elf_Ehdr *e, void **out, - } - break; - /* Relative relocations do not require fixup entries. */ -+ case R_AARCH64_PREL32: - case R_AARCH64_CALL26: - case R_AARCH64_JUMP26: - break; +diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def +index c916246..42443bc 100644 +--- a/grub-core/Makefile.core.def ++++ b/grub-core/Makefile.core.def +@@ -66,7 +66,7 @@ kernel = { + arm_efi_stripflags = '--strip-unneeded -K start -R .note -R .comment -R .note.gnu.gold-version'; + + arm64_efi_ldflags = '-Wl,-r,-d'; +- arm64_efi_stripflags = '--strip-unneeded -K start -R .note -R .comment -R .note.gnu.gold-version'; ++ arm64_efi_stripflags = '--strip-unneeded -K start -R .note -R .comment -R .note.gnu.gold-version -R .eh_frame'; + + i386_pc_ldflags = '$(TARGET_IMG_LDFLAGS)'; + i386_pc_ldflags = '$(TARGET_IMG_BASE_LDOPT),0x9000'; -- -2.0.4 +2.1.0 ++++++ grub2-btrfs-01-add-ability-to-boot-from-subvolumes.patch ++++++ ++++ 696 lines (skipped) ++++++ grub2-btrfs-02-export-subvolume-envvars.patch ++++++ From: Michael Chang <mchang(a)suse.com> Subject: export btrfs_subvol and btrfs_subvolid We should export btrfs_subvol and btrfs_subvolid to have both visible to subsidiary configuration files loaded using configfile. Signed-off-by: Michael Chang <mchang(a)suse.com> Index: grub-2.00/grub-core/fs/btrfs.c =================================================================== --- grub-2.00.orig/grub-core/fs/btrfs.c +++ grub-2.00/grub-core/fs/btrfs.c @@ -2252,6 +2252,8 @@ GRUB_MOD_INIT (btrfs) subvol_set_env); grub_register_variable_hook ("btrfs_subvolid", subvolid_get_env, subvolid_set_env); + grub_env_export ("btrfs_subvol"); + grub_env_export ("btrfs_subvolid"); } GRUB_MOD_FINI (btrfs) ++++++ grub2-btrfs-03-follow_default.patch ++++++ Index: grub-2.02~beta2/grub-core/fs/btrfs.c =================================================================== --- grub-2.02~beta2.orig/grub-core/fs/btrfs.c +++ grub-2.02~beta2/grub-core/fs/btrfs.c @@ -913,6 +913,7 @@ grub_btrfs_mount (grub_device_t dev) { struct grub_btrfs_data *data; grub_err_t err; + const char *relpath = grub_env_get ("btrfs_relative_path"); if (!dev->disk) { @@ -943,11 +944,14 @@ grub_btrfs_mount (grub_device_t dev) data->devices_attached[0].dev = dev; data->devices_attached[0].id = data->sblock.this_device.device_id; - err = btrfs_handle_subvol (data); - if (err) + if (relpath && (relpath[0] == '1' || relpath[0] == 'y')) { - grub_free (data); - return NULL; + err = btrfs_handle_subvol (data); + if (err) + { + grub_free (data); + return NULL; + } } return data; @@ -1407,24 +1411,39 @@ find_path (struct grub_btrfs_data *data, grub_size_t allocated = 0; struct grub_btrfs_dir_item *direl = NULL; struct grub_btrfs_key key_out; + int follow_default; const char *ctoken; grub_size_t ctokenlen; char *path_alloc = NULL; char *origpath = NULL; unsigned symlinks_max = 32; + const char *relpath = grub_env_get ("btrfs_relative_path"); + follow_default = 0; origpath = grub_strdup (path); if (!origpath) return grub_errno; - if (data->fs_tree) + if (relpath && (relpath[0] == '1' || relpath[0] == 'y')) { - *type = GRUB_BTRFS_DIR_ITEM_TYPE_DIRECTORY; - *tree = data->fs_tree; - /* This is a tree root, so everything starts at objectid 256 */ - key->object_id = grub_cpu_to_le64_compile_time (GRUB_BTRFS_OBJECT_ID_CHUNK); - key->type = GRUB_BTRFS_ITEM_TYPE_DIR_ITEM; - key->offset = 0; + if (data->fs_tree) + { + *type = GRUB_BTRFS_DIR_ITEM_TYPE_DIRECTORY; + *tree = data->fs_tree; + /* This is a tree root, so everything starts at objectid 256 */ + key->object_id = grub_cpu_to_le64_compile_time (GRUB_BTRFS_OBJECT_ID_CHUNK); + key->type = GRUB_BTRFS_ITEM_TYPE_DIR_ITEM; + key->offset = 0; + } + else + { + *type = GRUB_BTRFS_DIR_ITEM_TYPE_DIRECTORY; + *tree = data->sblock.root_tree; + key->object_id = data->sblock.root_dir_objectid; + key->type = GRUB_BTRFS_ITEM_TYPE_DIR_ITEM; + key->offset = 0; + follow_default = 1; + } } else { @@ -1435,15 +1454,23 @@ find_path (struct grub_btrfs_data *data, while (1) { - while (path[0] == '/') - path++; - if (!path[0]) - break; - slash = grub_strchr (path, '/'); - if (!slash) - slash = path + grub_strlen (path); - ctoken = path; - ctokenlen = slash - path; + if (!follow_default) + { + while (path[0] == '/') + path++; + if (!path[0]) + break; + slash = grub_strchr (path, '/'); + if (!slash) + slash = path + grub_strlen (path); + ctoken = path; + ctokenlen = slash - path; + } + else + { + ctoken = "default"; + ctokenlen = sizeof ("default") - 1; + } if (*type != GRUB_BTRFS_DIR_ITEM_TYPE_DIRECTORY) { @@ -1454,7 +1481,9 @@ find_path (struct grub_btrfs_data *data, if (ctokenlen == 1 && ctoken[0] == '.') { - path = slash; + if (!follow_default) + path = slash; + follow_default = 0; continue; } if (ctokenlen == 2 && ctoken[0] == '.' && ctoken[1] == '.') @@ -1485,8 +1514,9 @@ find_path (struct grub_btrfs_data *data, *type = GRUB_BTRFS_DIR_ITEM_TYPE_DIRECTORY; key->object_id = key_out.offset; - path = slash; - + if (!follow_default) + path = slash; + follow_default = 0; continue; } @@ -1555,7 +1585,9 @@ find_path (struct grub_btrfs_data *data, return err; } - path = slash; + if (!follow_default) + path = slash; + follow_default = 0; if (cdirel->type == GRUB_BTRFS_DIR_ITEM_TYPE_SYMLINK) { struct grub_btrfs_inode inode; @@ -1605,14 +1637,26 @@ find_path (struct grub_btrfs_data *data, path = path_alloc = tmp; if (path[0] == '/') { - if (data->fs_tree) + if (relpath && (relpath[0] == '1' || relpath[0] == 'y')) { - *type = GRUB_BTRFS_DIR_ITEM_TYPE_DIRECTORY; - *tree = data->fs_tree; - /* This is a tree root, so everything starts at objectid 256 */ - key->object_id = grub_cpu_to_le64_compile_time (GRUB_BTRFS_OBJECT_ID_CHUNK); - key->type = GRUB_BTRFS_ITEM_TYPE_DIR_ITEM; - key->offset = 0; + if (data->fs_tree) + { + *type = GRUB_BTRFS_DIR_ITEM_TYPE_DIRECTORY; + *tree = data->fs_tree; + /* This is a tree root, so everything starts at objectid 256 */ + key->object_id = grub_cpu_to_le64_compile_time (GRUB_BTRFS_OBJECT_ID_CHUNK); + key->type = GRUB_BTRFS_ITEM_TYPE_DIR_ITEM; + key->offset = 0; + } + else + { + *type = GRUB_BTRFS_DIR_ITEM_TYPE_DIRECTORY; + *tree = data->sblock.root_tree; + key->object_id = data->sblock.root_dir_objectid; + key->type = GRUB_BTRFS_ITEM_TYPE_DIR_ITEM; + key->offset = 0; + follow_default = 1; + } } else { @@ -2268,6 +2312,7 @@ GRUB_MOD_INIT (btrfs) subvolid_set_env); grub_env_export ("btrfs_subvol"); grub_env_export ("btrfs_subvolid"); + grub_env_export ("btrfs_relative_path"); } GRUB_MOD_FINI (btrfs) ++++++ grub2-btrfs-04-grub2-install.patch ++++++ Index: grub-2.02~beta2/grub-core/osdep/unix/config.c =================================================================== --- grub-2.02~beta2.orig/grub-core/osdep/unix/config.c +++ grub-2.02~beta2/grub-core/osdep/unix/config.c @@ -82,6 +82,19 @@ grub_util_load_config (struct grub_util_ if (v) cfg->grub_distributor = xstrdup (v); + v = getenv ("SUSE_BTRFS_SNAPSHOT_BOOTING"); + if (v) + { + if (grub_strncmp(v, "true", sizeof ("true") - 1) == 0) + { + cfg->is_suse_btrfs_snapshot_enabled = 1; + } + else + { + cfg->is_suse_btrfs_snapshot_enabled = 0; + } + } + cfgfile = grub_util_get_config_filename (); if (!grub_util_is_regular (cfgfile)) return; @@ -105,8 +118,8 @@ grub_util_load_config (struct grub_util_ *ptr++ = *iptr; } - strcpy (ptr, "'; printf \"GRUB_ENABLE_CRYPTODISK=%s\\nGRUB_DISTRIBUTOR=%s\\n\", " - "\"$GRUB_ENABLE_CRYPTODISK\", \"$GRUB_DISTRIBUTOR\""); + strcpy (ptr, "'; printf \"GRUB_ENABLE_CRYPTODISK=%s\\nGRUB_DISTRIBUTOR=%s\\nSUSE_BTRFS_SNAPSHOT_BOOTING=%s\\n\", " + "\"$GRUB_ENABLE_CRYPTODISK\", \"$GRUB_DISTRIBUTOR\", \"$SUSE_BTRFS_SNAPSHOT_BOOTING\""); argv[2] = script; argv[3] = '\0'; Index: grub-2.02~beta2/include/grub/emu/config.h =================================================================== --- grub-2.02~beta2.orig/include/grub/emu/config.h +++ grub-2.02~beta2/include/grub/emu/config.h @@ -37,6 +37,7 @@ struct grub_util_config { int is_cryptodisk_enabled; char *grub_distributor; + int is_suse_btrfs_snapshot_enabled; }; void Index: grub-2.02~beta2/util/config.c =================================================================== --- grub-2.02~beta2.orig/util/config.c +++ grub-2.02~beta2/util/config.c @@ -42,6 +42,16 @@ grub_util_parse_config (FILE *f, struct cfg->is_cryptodisk_enabled = 1; continue; } + if (grub_strncmp (ptr, "SUSE_BTRFS_SNAPSHOT_BOOTING=", + sizeof ("SUSE_BTRFS_SNAPSHOT_BOOTING=") - 1) == 0) + { + ptr += sizeof ("SUSE_BTRFS_SNAPSHOT_BOOTING=") - 1; + if (*ptr == '"' || *ptr == '\'') + ptr++; + if (grub_strncmp(ptr, "true", sizeof ("true") - 1) == 0) + cfg->is_suse_btrfs_snapshot_enabled = 1; + continue; + } if (grub_strncmp (ptr, "GRUB_DISTRIBUTOR=", sizeof ("GRUB_DISTRIBUTOR=") - 1) == 0) { Index: grub-2.02~beta2/util/grub-install.c =================================================================== --- grub-2.02~beta2.orig/util/grub-install.c +++ grub-2.02~beta2/util/grub-install.c @@ -816,6 +816,8 @@ fill_core_services (const char *core_ser free (sysv_plist); } +extern int use_relative_path_on_btrfs; + int main (int argc, char *argv[]) { @@ -849,6 +851,9 @@ main (int argc, char *argv[]) grub_util_load_config (&config); + if (config.is_suse_btrfs_snapshot_enabled) + use_relative_path_on_btrfs = 1; + if (!bootloader_id && config.grub_distributor) { char *ptr; @@ -1334,6 +1339,16 @@ main (int argc, char *argv[]) fprintf (load_cfg_f, "set debug='%s'\n", debug_image); } + + if (config.is_suse_btrfs_snapshot_enabled + && grub_strncmp(grub_fs->name, "btrfs", sizeof ("btrfs") - 1) == 0) + { + if (!load_cfg_f) + load_cfg_f = grub_util_fopen (load_cfg, "wb"); + have_load_cfg = 1; + fprintf (load_cfg_f, "set btrfs_relative_path='y'\n"); + } + char *prefix_drive = NULL; char *install_drive = NULL; Index: grub-2.02~beta2/grub-core/osdep/linux/getroot.c =================================================================== --- grub-2.02~beta2.orig/grub-core/osdep/linux/getroot.c +++ grub-2.02~beta2/grub-core/osdep/linux/getroot.c @@ -364,6 +364,7 @@ get_btrfs_fs_prefix (const char *mount_p return ret; } +int use_relative_path_on_btrfs = 0; char ** grub_find_root_devices_from_mountinfo (const char *dir, char **relroot) @@ -502,6 +503,12 @@ grub_find_root_devices_from_mountinfo (c { ret = grub_find_root_devices_from_btrfs (dir); fs_prefix = get_btrfs_fs_prefix (entries[i].enc_path); + if (use_relative_path_on_btrfs) + { + if (fs_prefix) + free (fs_prefix); + fs_prefix = xstrdup ("/"); + } } if (!ret) { Index: grub-2.02~beta2/util/grub-mkrelpath.c =================================================================== --- grub-2.02~beta2.orig/util/grub-mkrelpath.c +++ grub-2.02~beta2/util/grub-mkrelpath.c @@ -40,9 +40,12 @@ struct arguments }; static struct argp_option options[] = { + {"relative", 'r', 0, 0, "use relative path on btrfs", 0}, { 0, 0, 0, 0, 0, 0 } }; +extern int use_relative_path_on_btrfs; + static error_t argp_parser (int key, char *arg, struct argp_state *state) { @@ -52,6 +55,9 @@ argp_parser (int key, char *arg, struct switch (key) { + case 'r': + use_relative_path_on_btrfs = 1; + break; case ARGP_KEY_ARG: if (state->arg_num == 0) arguments->pathname = xstrdup (arg); ++++++ grub2-btrfs-05-grub2-mkconfig.patch ++++++ --- util/grub-mkconfig.in | 3 ++- util/grub-mkconfig_lib.in | 4 ++++ util/grub.d/00_header.in | 23 ++++++++++++++++++++++- util/grub.d/10_linux.in | 11 ++++++++++- util/grub.d/20_linux_xen.in | 4 ++++ 5 files changed, 42 insertions(+), 3 deletions(-) Index: grub-2.02~beta2/util/grub-mkconfig_lib.in =================================================================== --- grub-2.02~beta2.orig/util/grub-mkconfig_lib.in +++ grub-2.02~beta2/util/grub-mkconfig_lib.in @@ -49,7 +49,11 @@ grub_warn () make_system_path_relative_to_its_root () { + if [ "x${SUSE_BTRFS_SNAPSHOT_BOOTING}" = "xtrue" ] ; then + "${grub_mkrelpath}" -r "$1" + else "${grub_mkrelpath}" "$1" + fi } is_path_readable_by_grub () Index: grub-2.02~beta2/util/grub.d/00_header.in =================================================================== --- grub-2.02~beta2.orig/util/grub.d/00_header.in +++ grub-2.02~beta2/util/grub.d/00_header.in @@ -27,6 +27,14 @@ export TEXTDOMAINDIR="@localedir@" . "@datadir@/@PACKAGE@/grub-mkconfig_lib" +if [ "x${SUSE_BTRFS_SNAPSHOT_BOOTING}" = "xtrue" ] && + [ "x${GRUB_FS}" = "xbtrfs" ] ; then + cat <<EOF +set btrfs_relative_path="y" +export btrfs_relative_path +EOF +fi + # Do this as early as possible, since other commands might depend on it. # (e.g. the `loadfont' command might need lvm or raid modules) for i in ${GRUB_PRELOAD_MODULES} ; do @@ -43,7 +51,9 @@ if [ "x${GRUB_DEFAULT_BUTTON}" = "xsaved if [ "x${GRUB_TIMEOUT_BUTTON}" = "x" ] ; then GRUB_TIMEOUT_BUTTON="$GRUB_TIMEOUT" ; fi cat << EOF -if [ -s \$prefix/grubenv ]; then +if [ -f \${config_directory}/grubenv ]; then + load_env -f \${config_directory}/grubenv +elif [ -s \$prefix/grubenv ]; then load_env fi EOF @@ -356,3 +366,14 @@ fi if [ "x${GRUB_BADRAM}" != "x" ] ; then echo "badram ${GRUB_BADRAM}" fi + +if [ "x${SUSE_BTRFS_SNAPSHOT_BOOTING}" = "xtrue" ] && + [ "x${GRUB_FS}" = "xbtrfs" ] ; then + cat <<EOF +if [ -n "\$extra_cmdline" ]; then + submenu "Bootable snapshot #\$snapshot_num" { + menuentry "If OK, run 'snapper rollback \$snapshot_num' and reboot." { true; } + } +fi +EOF +fi Index: grub-2.02~beta2/util/grub-mkconfig.in =================================================================== --- grub-2.02~beta2.orig/util/grub-mkconfig.in +++ grub-2.02~beta2/util/grub-mkconfig.in @@ -250,7 +250,8 @@ export GRUB_DEFAULT \ GRUB_OS_PROBER_SKIP_LIST \ GRUB_DISABLE_SUBMENU \ GRUB_CMDLINE_LINUX_RECOVERY \ - GRUB_USE_LINUXEFI + GRUB_USE_LINUXEFI \ + SUSE_BTRFS_SNAPSHOT_BOOTING if test "x${grub_cfg}" != "x"; then rm -f "${grub_cfg}.new" Index: grub-2.02~beta2/util/grub.d/10_linux.in =================================================================== --- grub-2.02~beta2.orig/util/grub.d/10_linux.in +++ grub-2.02~beta2/util/grub.d/10_linux.in @@ -53,10 +53,14 @@ fi case x"$GRUB_FS" in xbtrfs) + if [ "x${SUSE_BTRFS_SNAPSHOT_BOOTING}" = "xtrue" ]; then + GRUB_CMDLINE_LINUX="${GRUB_CMDLINE_LINUX} \${extra_cmdline}" + else rootsubvol="`make_system_path_relative_to_its_root /`" rootsubvol="${rootsubvol#/}" if [ "x${rootsubvol}" != x ]; then GRUB_CMDLINE_LINUX="rootflags=subvol=${rootsubvol} ${GRUB_CMDLINE_LINUX}" + fi fi;; xzfs) rpool=`${grub_probe} --device ${GRUB_DEVICE} --target=fs_label 2>/dev/null || true` Index: grub-2.02~beta2/util/grub.d/20_linux_xen.in =================================================================== --- grub-2.02~beta2.orig/util/grub.d/20_linux_xen.in +++ grub-2.02~beta2/util/grub.d/20_linux_xen.in @@ -67,10 +67,14 @@ fi case x"$GRUB_FS" in xbtrfs) + if [ "x${SUSE_BTRFS_SNAPSHOT_BOOTING}" = "xtrue" ]; then + GRUB_CMDLINE_LINUX="${GRUB_CMDLINE_LINUX} \${extra_cmdline}" + else rootsubvol="`make_system_path_relative_to_its_root /`" rootsubvol="${rootsubvol#/}" if [ "x${rootsubvol}" != x ]; then GRUB_CMDLINE_LINUX="rootflags=subvol=${rootsubvol} ${GRUB_CMDLINE_LINUX}" + fi fi;; xzfs) rpool=`${grub_probe} --device ${GRUB_DEVICE} --target=fs_label 2>/dev/null || true` ++++++ grub2-snapper-plugin.sh ++++++ --- /var/tmp/diff_new_pack.jibj9k/_old 2014-08-30 16:04:15.000000000 +0200 +++ /var/tmp/diff_new_pack.jibj9k/_new 2014-08-30 16:04:15.000000000 +0200 @@ -18,117 +18,148 @@ grub_mkconfig="/usr/sbin/grub2-mkconfig" grub_mkrelpath="/usr/bin/grub2-mkrelpath" +grub_script_check="/usr/bin/grub2-script-check" grub_setting="/etc/default/grub" grub_cfg="/boot/grub2/grub.cfg" grub_snapshot_cfg="/boot/grub2/snapshot_submenu.cfg" -snapshot_submenu_name="snapshot_submenu.cfg" -snapshot_menuentry_name="snapshot_menuentry.cfg" -snapshot_menuentry_cfg="boot/grub2/${snapshot_menuentry_name}" +snapper_snapshot_path="/.snapshots" +snapshot_submenu_name="grub-snapshot.cfg" +snapper_snapshots_cfg="${snapper_snapshot_path}/${snapshot_submenu_name}" + +# add hotkeys for s390. (bnc#885668) +hotkey= +incr_hotkey() +{ + [ -n "$hotkey" ] || return + expr $hotkey + 1 +} +print_hotkey() +{ + keys="123456789abdfgijklmnoprstuvwyz" + if [ -z "$hotkey" ]||[ $hotkey -eq 0 ]||[ $hotkey -gt 30 ]; then + return + fi + echo "--hotkey=$(expr substr $keys $hotkey 1)" +} -rel_root=`"$grub_mkrelpath" /` -snapshot_submenu_refresh () { +snapshot_submenu () { -for s_dir in /.snapshots/*; do + s_dir="$1" snapshot="${s_dir}/snapshot" - snapper_cfg="${s_dir}/${snapshot_submenu_name}" + num="`basename $s_dir`" - if [ ! -d "$snapshot" ]; then - rm -f "${snapper_cfg}" - rm -f "${s_dir}/${snapshot_menuentry_name}" - continue - fi - # bnc#864842 Important snapshots are not marked as such in grub2 menu # the format is "important distribution version (kernel_version, timestamp, pre/post)" - cfgs="${s_dir}/${snapshot_menuentry_name} ${snapshot}/${snapshot_menuentry_cfg}" date=`xmllint --xpath '/snapshot/date/text()' "${s_dir}/info.xml" || echo ""` - date=`echo $date | sed 's/$.*$ $.*$:.*/\1,\2/'` - important=`xmllint --xpath "/snapshot/userdata[key='important']/value/text()" "${s_dir}/info.xml" || echo ""` + date=`echo $date | sed 's/$.*$ $.*$:.*/\1T\2/'` + important=`xmllint --xpath "/snapshot/userdata[key='important']/value/text()" "${s_dir}/info.xml" 2>/dev/null || echo ""` stype=`xmllint --xpath '/snapshot/type/text()' "${s_dir}/info.xml" || echo ""` - kernel_ver=`readlink /boot/vmlinuz | sed 's/vmlinuz-$[^-]*$.*/\1/'` + kernel_ver=`readlink ${snapshot}/boot/vmlinuz | sed -e 's/^vmlinuz-//' -e 's/-default$//'` + if [ -z "$kernel_ver" -a -L ${snapshot}/boot/image ]; then + kernel_ver=`readlink ${snapshot}/boot/image | sed -e 's/^image-//' -e 's/-default$//'` + fi eval `cat ${snapshot}/etc/os-release` - test "$important" = "yes" && important="*" || important="" + test "$important" = "yes" && important="*" || important=" " test "$stype" = "single" && stype="" - if test -n "$stype"; then - title="${important}${NAME} $VERSION ($kernel_ver,$date,$stype)" - else - title="${important}${NAME} $VERSION ($kernel_ver,$date)" + test -z "$stype" || stype=",$stype" + desc=`xmllint --xpath '/snapshot/description/text()' "${s_dir}/info.xml" 2>/dev/null || echo ""` + #test "$desc" = "timeline" && return 1 + test -z "$desc" || desc=",$desc" + title="${important}${NAME} $VERSION ($kernel_ver,$date$stype$desc)" + + cat <<EOF + + if [ -f "${snapper_snapshot_path}/$num/snapshot/boot/grub2/grub.cfg" ]; then + snapshot_found=true + saved_subvol=\$btrfs_subvol + menuentry `print_hotkey` "$title" "${snapper_snapshot_path}/$num/snapshot" "`$grub_mkrelpath ${snapper_snapshot_path}/${num}/snapshot`" { + btrfs_subvol="\$2" + extra_cmdline="rootflags=subvol=\$3" + export extra_cmdline + snapshot_num=$num + export snapshot_num + configfile "\$btrfs_subvol/boot/grub2/grub.cfg" + btrfs_subvol=\$saved_subvol + } fi - cat <<EOF > "${snapper_cfg}.new" - - for x in $cfgs; do - snap="${rel_root}${snapshot}" - snap_cfg="${rel_root}\$x" - - if [ -f "\$snap_cfg" ]; then - snapshot_found=true - submenu "$title" "\$snap" "\$snap_cfg" { - set subvol="\$2" - export subvol - source "\$3" - } - break - fi - done - EOF - - if grub2-script-check "${snapper_cfg}.new"; then - mv -f "${snapper_cfg}.new" "${snapper_cfg}" - fi + hotkey=`incr_hotkey` + return 0 +} -done +snapper_snapshots_cfg_refresh () { -} + if [ ! -d "$snapper_snapshot_path" ]; then + return + fi -grub_snapshot_cfg_refresh () { + for s_dir in ${snapper_snapshot_path}/*; do -: > "${grub_snapshot_cfg}.tmp" -for s_dir in /.snapshots/*; do + snapshot="${s_dir}/snapshot" - snapshot="${s_dir}/snapshot" - snapper_cfg="${s_dir}/${snapshot_submenu_name}" + # list only read-only snapshot (bnc#878528) + if [ -w "$snapshot" ]; then + continue + fi + if [ -r "${s_dir}/info.xml" -a -r "${s_dir}/snapshot/boot/grub2/grub.cfg" ]; then + cs="${s_dir}\n${cs}" + fi - if [ -f "${snapper_cfg}" ]; then - echo "source ${rel_root}${snapper_cfg}" >>"${grub_snapshot_cfg}.tmp" - continue - fi + done -done + hk="" + [ -z "$hotkey" ] || hk="--hotkey=s" -cat <<EOF >"${grub_snapshot_cfg}.new" -submenu "Bootable snapshots" { -`sort -V "${grub_snapshot_cfg}.tmp"` - if [ x\$snapshot_found != xtrue ]; then - submenu "Not Found" {true} - fi -} -EOF + for c in `echo -e "${cs}" | sort -Vr`; do + if ! snapshot_submenu "$c" > "${c}/${snapshot_submenu_name}"; then + rm -f "${c}/${snapshot_submenu_name}" + continue + fi + snapshot_cfg="${snapshot_cfg} + if [ -f "$c/${snapshot_submenu_name}"; then + source "$c/${snapshot_submenu_name}" + fi" + done -if grub2-script-check "${grub_snapshot_cfg}.new"; then - mv -f "${grub_snapshot_cfg}.new" "${grub_snapshot_cfg}" + cat <<EOF >"${snapper_snapshots_cfg}.new" +if [ -z "\$extra_cmdline" ]; then + submenu $hk "Start bootloader from a read-only snapshot" {${snapshot_cfg} + if [ x\$snapshot_found != xtrue ]; then + submenu "Not Found" { true; } + fi + } fi +EOF + + if ${grub_script_check} "${snapper_snapshots_cfg}.new"; then + mv -f "${snapper_snapshots_cfg}.new" "${snapper_snapshots_cfg}" + fi } snapshot_submenu_clean () { - for s_dir in /.snapshots/*; do + for s_dir in ${snapper_snapshot_path}/*; do - snapshot="${s_dir}/snapshot" snapper_cfg="${s_dir}/${snapshot_submenu_name}" if [ -f "$snapper_cfg" ]; then rm -f "$snapper_cfg" + rmdir "$s_dir" 2>/dev/null || true fi done + + if [ -f "${snapper_snapshot_path}/${snapshot_submenu_name}" ]; then + rm -f "${snapper_snapshot_path}/${snapshot_submenu_name}" + fi + } set_grub_setting () { @@ -137,17 +168,32 @@ val=$2 if grep -q "$name" "$grub_setting"; then - sed -i -e "s/.*$$name$=.*/\1=$val/" "$grub_setting" + sed -i -e "s!.*$$name$=.*!\1=\"$val\"!" "$grub_setting" else - echo "$name=$val" >> "$grub_setting" + echo "$name=\"$val\"" >> "$grub_setting" fi } -update_grub_cfg () { +enable_grub_settings () { + set_grub_setting SUSE_BTRFS_SNAPSHOT_BOOTING "true" +} - "$grub_mkconfig" -o "$grub_cfg" +disable_grub_settings () { + set_grub_setting SUSE_BTRFS_SNAPSHOT_BOOTING "false" } +update_grub () { + "${grub_mkconfig}" -o "${grub_cfg}" +} + +machine=`uname -m` +case "$machine" in +(s390|s390x) + hotkey=1 + ;; +esac +cmdline="$0 $* hotkey='$hotkey'" + # Check the arguments. while test $# -gt 0 do @@ -173,32 +219,20 @@ done if [ "x${opt_enable}" = "xtrue" ]; then - - set_grub_setting SUSE_DISABLE_BOOTING_SNAPSHOT false - set_grub_setting SUSE_ENABLE_CUSTOM_SNAPSHOT_SUBMENU true - update_grub_cfg - snapshot_submenu_refresh - grub_snapshot_cfg_refresh - + #enable_grub_settings + #update_grub + snapper_snapshots_cfg_refresh elif [ "x${opt_enable}" = "xfalse" ]; then - + #disable_grub_settings + update_grub snapshot_submenu_clean - set_grub_setting SUSE_DISABLE_BOOTING_SNAPSHOT true - set_grub_setting SUSE_ENABLE_CUSTOM_SNAPSHOT_SUBMENU false - update_grub_cfg - fi if [ x${opt_refresh} = "xtrue" ]; then - - snapshot_submenu_refresh - grub_snapshot_cfg_refresh - + snapper_snapshots_cfg_refresh fi if [ x${opt_clean} = "xtrue" ]; then - snapshot_submenu_clean - grub_snapshot_cfg_refresh - fi + -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-bootloader for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '14

30 Aug '14

Hello community, here is the log from the commit of package yast2-bootloader for openSUSE:Factory checked in at 2014-08-30 16:03:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-bootloader (Old) and /work/SRC/openSUSE:Factory/.yast2-bootloader.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-bootloader" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-bootloader/yast2-bootloader.changes 2014-08-20 17:54:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-bootloader.new/yast2-bootloader.changes 2014-08-30 16:04:10.000000000 +0200 @@ -1,0 +2,15 @@ +Wed Aug 27 07:53:45 UTC 2014 - jreidinger(a)suse.com + +- do not reset secure boot to false at the end of installation in + case of incapable device (bnc#892032) +- 3.1.91 + +------------------------------------------------------------------- +Tue Aug 26 11:37:17 UTC 2014 - jreidinger(a)suse.com + +- fix partition activation on LVM (bnc#893449) +- fix activation device when md raid devices do not have + recognizable bios id +- 3.1.90 + +------------------------------------------------------------------- Old: ---- yast2-bootloader-3.1.89.tar.bz2 New: ---- yast2-bootloader-3.1.91.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.ninOvQ/_old 2014-08-30 16:04:11.000000000 +0200 +++ /var/tmp/diff_new_pack.ninOvQ/_new 2014-08-30 16:04:11.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 3.1.89 +Version: 3.1.91 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-bootloader-3.1.89.tar.bz2 -> yast2-bootloader-3.1.91.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.89/package/yast2-bootloader.changes new/yast2-bootloader-3.1.91/package/yast2-bootloader.changes --- old/yast2-bootloader-3.1.89/package/yast2-bootloader.changes 2014-08-15 14:28:10.000000000 +0200 +++ new/yast2-bootloader-3.1.91/package/yast2-bootloader.changes 2014-08-27 10:13:18.000000000 +0200 @@ -1,4 +1,19 @@ ------------------------------------------------------------------- +Wed Aug 27 07:53:45 UTC 2014 - jreidinger(a)suse.com + +- do not reset secure boot to false at the end of installation in + case of incapable device (bnc#892032) +- 3.1.91 + +------------------------------------------------------------------- +Tue Aug 26 11:37:17 UTC 2014 - jreidinger(a)suse.com + +- fix partition activation on LVM (bnc#893449) +- fix activation device when md raid devices do not have + recognizable bios id +- 3.1.90 + +------------------------------------------------------------------- Fri Aug 15 12:27:58 CEST 2014 - snwint(a)suse.de - remove nonsense check (bnc #768538) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.89/package/yast2-bootloader.spec new/yast2-bootloader-3.1.91/package/yast2-bootloader.spec --- old/yast2-bootloader-3.1.89/package/yast2-bootloader.spec 2014-08-15 14:28:10.000000000 +0200 +++ new/yast2-bootloader-3.1.91/package/yast2-bootloader.spec 2014-08-27 10:13:18.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 3.1.89 +Version: 3.1.91 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.89/src/include/bootloader/grub2/misc.rb new/yast2-bootloader-3.1.91/src/include/bootloader/grub2/misc.rb --- old/yast2-bootloader-3.1.89/src/include/bootloader/grub2/misc.rb 2014-08-15 14:28:10.000000000 +0200 +++ new/yast2-bootloader-3.1.91/src/include/bootloader/grub2/misc.rb 2014-08-27 10:13:18.000000000 +0200 @@ -90,7 +90,9 @@ # value, and code on the caller side that evaluates this. if Builtins.substring(loader_device, 0, 7) == "/dev/md" md = BootCommon.Md2Partitions(loader_device) - min = 256 # max. is 255; 256 means "no bios_id found" + # max. is 255; 256 means "no bios_id found", so to have at least one + # underlaying device use higher + min = 257 device = "" Builtins.foreach(md) do |d, id| if Ops.less_than(id, min) @@ -105,21 +107,24 @@ end end + tm = Storage.GetTargetMap + partitions = Ops.get_list(tm, [mbr_dev, "partitions"], []) + partitions.select! { |p| p["used_fs"] != :swap } # (bnc # 337742) - Unable to boot the openSUSE (32 and 64 bits) after installation - # if loader_device is disk device activate BootStorage::BootPartitionDevice + # if loader_device is disk Choose any partition which is not swap to + # satisfy such bios (bnc#893449) if num == 0 - Builtins.y2milestone("loader_device is disk device") - p_dev = Storage.GetDiskPartition(BootStorage.BootPartitionDevice) - num = BootCommon.myToInteger(Ops.get(p_dev, "nr")) - # handle situation when we have md raid and boot from md0 and sda and md0 is boot device (bnc#882592) - # This also prevents mess when we can potentially have mix of different number and device - return {} if p_dev["disk"] != mbr_dev + # strange, no partitions on our mbr device, we probably won't boot + if partitions.empty? + Builtins.y2warning("no non-swap partitions for mbr device #{mbr_dev}") + return {} + end + num = partitions.first["nr"] + Builtins.y2milestone("loader_device is disk device, so use its #{num} partition") end if Ops.greater_than(num, 4) Builtins.y2milestone("Bootloader partition type can be logical") - tm = Storage.GetTargetMap - partitions = Ops.get_list(tm, [mbr_dev, "partitions"], []) Builtins.foreach(partitions) do |p| if Ops.get(p, "type") == :extended num = Ops.get_integer(p, "nr", num) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.89/src/modules/BootCommon.rb new/yast2-bootloader-3.1.91/src/modules/BootCommon.rb --- old/yast2-bootloader-3.1.89/src/modules/BootCommon.rb 2014-08-15 14:28:10.000000000 +0200 +++ new/yast2-bootloader-3.1.91/src/modules/BootCommon.rb 2014-08-27 10:13:18.000000000 +0200 @@ -893,22 +893,6 @@ nil end - def checkSecureBoot - ret = false - sbvar = "/sys/firmware/efi/vars/SecureBoot-8be4df61-93ca-11d2-aa0d-00e098032b8c/data" - sbvar_avail = 0 == - Convert.to_integer( - SCR.Execute(path(".target.bash"), Ops.add("test -e ", sbvar)) - ) - - if sbvar_avail - cmd = Builtins.sformat("test `od -An -N1 -t u1 %1` -eq 1", sbvar) - ret = 0 == Convert.to_integer(SCR.Execute(path(".target.bash"), cmd)) - end - - ret - end - def getSystemSecureBootStatus(recheck) return @secure_boot if !recheck && @secure_boot != nil @@ -923,7 +907,8 @@ end end - @secure_boot = checkSecureBoot + # propose secure boot always to true (bnc#872054), otherwise respect user choice + @secure_boot = true if @secure_boot.nil? @secure_boot end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.89/test/partitions_to_activate_test.rb new/yast2-bootloader-3.1.91/test/partitions_to_activate_test.rb --- old/yast2-bootloader-3.1.89/test/partitions_to_activate_test.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-bootloader-3.1.91/test/partitions_to_activate_test.rb 2014-08-27 10:13:18.000000000 +0200 @@ -0,0 +1,76 @@ +require_relative "test_helper" + +Yast.import "BootGRUB2" + +# it should be probably part of BootStorage module, but we are too late in +# release phase, so place it here and adapt when location of this method changed +describe Yast::BootloaderGrub2MiscInclude do + before do + # simple mock getting disks from partition as it need initialized libstorage + allow(Yast::Storage).to receive(:GetDiskPartition) do |partition| + if partition == "/dev/system/root" + disk = "/dev/system" + number = "system" + else + number = partition[/(\d+)$/,1] + disk = number ? partition[0..-(number.size+1)] : partition + end + { "disk" => disk, "nr" => number } + end + allow(Yast::Storage).to receive(:GetDeviceName) do |disk, partition| + disk+partition.to_s + end + end + + + def target_map_stub(name) + path = File.join(File.dirname(__FILE__), "data", name) + tm = eval(File.read(path)) + allow(Yast::Storage).to receive(:GetTargetMap).and_return(tm) + end + + describe "#grub_getPartitionToActivate" do + it "returns map with device, its disk and partition number" do + target_map_stub("storage_mdraid.rb") + result = Yast::BootGRUB2.grub_getPartitionToActivate("/dev/vda1") + expected_result = { + "mbr" => "/dev/vda", + "num" => 1, + "dev" => "/dev/vda1" + } + expect(result).to eq expected_result + end + + it "returns underlaying devices for md raid" do + target_map_stub("storage_mdraid.rb") + result = Yast::BootGRUB2.grub_getPartitionToActivate("/dev/md1") + expected_result = { + "mbr" => "/dev/vda", + "num" => 1, + "dev" => "/dev/vda1" + } + expect(result).to eq expected_result + + end + + it "choose any partition on disk if disk is passed" do + target_map_stub("storage_lvm.rb") + result = Yast::BootGRUB2.grub_getPartitionToActivate("/dev/vda") + expected_result = { + "mbr" => "/dev/vda", + "num" => 3, + "dev" => "/dev/vda3" + } + expect(result).to eq expected_result + end + + it "return empty map if device do not exists" do + target_map_stub("storage_lvm.rb") + result = Yast::BootGRUB2.grub_getPartitionToActivate("/dev/nonexist") + expected_result = {} + expect(result).to eq expected_result + end + + # TODO prepare test for extended partition, need target map containing it + end +end -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ocaml for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '14

30 Aug '14

Hello community, here is the log from the commit of package ocaml for openSUSE:Factory checked in at 2014-08-30 16:03:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ocaml (Old) and /work/SRC/openSUSE:Factory/.ocaml.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ocaml" Changes: -------- --- /work/SRC/openSUSE:Factory/ocaml/ocaml.changes 2014-05-02 19:21:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ocaml.new/ocaml.changes 2014-08-30 16:04:08.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Aug 27 09:30:55 CEST 2014 - ohering(a)suse.de + +- Require as/gcc for ocamlopt (bnc#891177) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocaml.spec ++++++ --- /var/tmp/diff_new_pack.vDOZFJ/_old 2014-08-30 16:04:09.000000000 +0200 +++ /var/tmp/diff_new_pack.vDOZFJ/_new 2014-08-30 16:04:09.000000000 +0200 @@ -61,6 +61,7 @@ # This gets ocamlobjinfo to work with .cmxs files BuildRequires: binutils-devel %if %{do_opt} +Requires: gcc Provides: ocaml(ocaml.opt) = %{version} %endif Provides: ocaml(compiler) = %{version} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0