February 2014 - YaST Commits - openSUSE Mailing Lists

[yast-commit] [yast/yast-ruby-bindings] 3c25df: format spec file
by GitHub 04 Feb '14

04 Feb '14

Branch: refs/heads/master Home: https://github.com/yast/yast-ruby-bindings Commit: 3c25dffe717858480e800d8b41623124c993052b https://github.com/yast/yast-ruby-bindings/commit/3c25dffe717858480e800d8b4… Author: Josef Reidinger <jreidinger(a)suse.cz> Date: 2014-02-04 (Tue, 04 Feb 2014) Changed paths: M package/yast2-ruby-bindings.changes M package/yast2-ruby-bindings.spec Log Message: ----------- format spec file

1 0

[yast-commit] Request 31564 changed to declined (submit SUSE:SLE-12:GA/yast2-ruby-bindings)
by Ruediger Oertel 04 Feb '14

04 Feb '14

Visit https://build.suse.de/request/show/31564 State of request 31564 was changed by oertel: new -> declined Comment: please run specfile through autoformatter to add copyright header, thanks Actions: - submit Devel:YaST:Head/yast2-ruby-bindings => SUSE:SLE-12:GA/yast2-ruby-bindings -- Configure notifications at https://build.suse.de/user/notifications SUSE Internal OBS Instance (https://build.suse.de/) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] Request 31538 changed to accepted (submit SUSE:SLE-12:GA/yast2-storage)
by Ruediger Oertel 04 Feb '14

04 Feb '14

Visit https://build.suse.de/request/show/31538 State of request 31538 was changed by oertel: new -> accepted Comment: Accepted submit request 31538 from user leonardocf Actions: - submit Devel:YaST:Head/yast2-storage => SUSE:SLE-12:GA/yast2-storage -- Configure notifications at https://build.suse.de/user/notifications SUSE Internal OBS Instance (https://build.suse.de/) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] [ci_new_pac] JFYI yast2-storage -> sle12
by ro 04 Feb '14

04 Feb '14

Script 'mail_helper' called by ro Hello packager, This is just FYI. Your package was checked in in distribution "sle12" by autobuild-member: ro. Here comes the log... ---------------------------%<------------------------------ Hi, here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-storage -> sle12 ## BNC# 860400 : "DASD partitioning fails" (RESOLVED/FIXED) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-storage/yast2-storage.changes 2014-01-27 16:09:45.000000000 +0100 +++ /mounts/work_src_done/SLE12/yast2-storage/yast2-storage.changes 2014-02-03 14:20:34.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Feb 03 12:44:35 CET 2014 - aschnell(a)suse.de + +- include only devices know to libstorage in target-map + (bnc#860400) +- version 3.1.7 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2-storage - at least 20 other packages ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-storage (Old) and /mounts/work_src_done/SLE12/yast2-storage (BS:build ID:31538 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-storage", Maintainer is "yast-commit(a)opensuse.org" Old: ---- yast2-storage-3.1.6.tar.bz2 New: ---- yast2-storage-3.1.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-storage.spec ++++++ --- /var/tmp/diff_new_pack.hWPVi6/_old 2014-02-04 15:04:44.000000000 +0100 +++ /var/tmp/diff_new_pack.hWPVi6/_new 2014-02-04 15:04:44.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-storage -Version: 3.1.6 +Version: 3.1.7 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-storage-3.1.6.tar.bz2 -> yast2-storage-3.1.7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.6/package/yast2-storage.changes new/yast2-storage-3.1.7/package/yast2-storage.changes --- old/yast2-storage-3.1.6/package/yast2-storage.changes 2014-01-27 11:52:47.000000000 +0100 +++ new/yast2-storage-3.1.7/package/yast2-storage.changes 2014-02-03 14:20:40.000000000 +0100 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Feb 03 12:44:35 CET 2014 - aschnell(a)suse.de + +- include only devices know to libstorage in target-map + (bnc#860400) +- version 3.1.7 + +------------------------------------------------------------------- Tue Jan 21 11:31:36 UTC 2014 - jsrain(a)suse.cz - propose dedicated /boot/zipl partition on S/390 (bnc#853930) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.6/package/yast2-storage.spec new/yast2-storage-3.1.7/package/yast2-storage.spec --- old/yast2-storage-3.1.6/package/yast2-storage.spec 2014-01-27 11:52:47.000000000 +0100 +++ new/yast2-storage-3.1.7/package/yast2-storage.spec 2014-02-03 14:20:40.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-storage -Version: 3.1.6 +Version: 3.1.7 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.6/src/modules/Storage.rb new/yast2-storage-3.1.7/src/modules/Storage.rb --- old/yast2-storage-3.1.6/src/modules/Storage.rb 2014-01-27 11:52:48.000000000 +0100 +++ new/yast2-storage-3.1.7/src/modules/Storage.rb 2014-02-03 14:20:40.000000000 +0100 @@ -4511,8 +4511,14 @@ Builtins.size(rename), 0 ) - Builtins.y2milestone("probing done") + # remove all devices unknown to libstorage, otherwise the target-map + # has containers without container-type + tmp.select! do |dev, disk| + @conts.any? { |c| c["device"] == dev } + end + + Builtins.y2milestone("probing done") @probe_done = true changed = true Builtins.foreach(tmp) do |dev, disk| continue with "q"... Checked in at Tue Feb 4 15:04:54 CET 2014 by ro Remember to have fun... -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] Request 31588 changed to accepted (submit SUSE:SLE-12:GA/yast2-slp)
by Ruediger Oertel 04 Feb '14

04 Feb '14

Visit https://build.suse.de/request/show/31588 State of request 31588 was changed by oertel: new -> accepted Comment: Accepted submit request 31588 from user leonardocf Actions: - submit Devel:YaST:Head/yast2-slp => SUSE:SLE-12:GA/yast2-slp -- Configure notifications at https://build.suse.de/user/notifications SUSE Internal OBS Instance (https://build.suse.de/) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] [ci_new_pac] JFYI yast2-slp -> sle12
by ro 04 Feb '14

04 Feb '14

Script 'mail_helper' called by ro Hello packager, This is just FYI. Your package was checked in in distribution "sle12" by autobuild-member: ro. Here comes the log... ---------------------------%<------------------------------ Hi, here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-slp -> sle12 Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-slp/yast2-slp.changes 2014-01-17 14:16:33.000000000 +0100 +++ /mounts/work_src_done/SLE12/yast2-slp/yast2-slp.changes 2014-02-04 11:17:46.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Jan 31 10:18:53 UTC 2014 - vmoravec(a)suse.com + +- Add SlpService module (fate#316384) +- 3.1.2 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2-product-creator - yast2-slp ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-slp (Old) and /mounts/work_src_done/SLE12/yast2-slp (BS:build ID:31588 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-slp", Maintainer is "yast-commit(a)opensuse.org" Old: ---- yast2-slp-3.1.1.tar.bz2 New: ---- yast2-slp-3.1.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-slp.spec ++++++ --- /var/tmp/diff_new_pack.N5qYSk/_old 2014-02-04 15:04:27.000000000 +0100 +++ /var/tmp/diff_new_pack.N5qYSk/_new 2014-02-04 15:04:27.000000000 +0100 @@ -17,30 +17,25 @@ Name: yast2-slp -Version: 3.1.1 +Version: 3.1.2 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 -BuildRequires: doxygen -BuildRequires: gcc-c++ -BuildRequires: libtool -BuildRequires: openslp-devel -BuildRequires: perl-XML-Writer -BuildRequires: yast2 -BuildRequires: yast2-core-devel -BuildRequires: yast2-devtools >= 3.0.6 +Group: System/YaST +License: GPL-2.0+ +BuildRequires: gcc-c++ openslp-devel doxygen perl-XML-Writer yast2-core-devel yast2 libtool +BuildRequires: yast2-devtools >= 3.1.10 +BuildRequires: rubygem-rspec %if 0%{?suse_version} < 1220 BuildRequires: libxcrypt-devel %endif -Requires: openslp -Requires: yast2 +Requires: openslp yast2 Requires: yast2-ruby-bindings >= 1.0.0 Summary: YaST2 - SLP Agent and Browser -License: GPL-2.0+ -Group: System/YaST +Url: https://github.com/yast/yast-slp %description This module enables YaST modules to register services with SLP. @@ -55,6 +50,7 @@ %install %yast_install + %files %defattr(-,root,root) %{yast_scrconfdir}/*.scr @@ -62,6 +58,5 @@ %{yast_plugindir}/libpy2ag_slp.so %{yast_plugindir}/libpy2ag_slp.la %{yast_moduledir}/SLP.rb +%{yast_moduledir}/SlpService.rb %doc %{yast_docdir} - -%changelog ++++++ yast2-slp-3.1.1.tar.bz2 -> yast2-slp-3.1.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slp-3.1.1/VERSION new/yast2-slp-3.1.2/VERSION --- old/yast2-slp-3.1.1/VERSION 2013-11-15 13:19:35.000000000 +0100 +++ new/yast2-slp-3.1.2/VERSION 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -3.1.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slp-3.1.1/package/yast2-slp.changes new/yast2-slp-3.1.2/package/yast2-slp.changes --- old/yast2-slp-3.1.1/package/yast2-slp.changes 2013-11-15 13:19:35.000000000 +0100 +++ new/yast2-slp-3.1.2/package/yast2-slp.changes 2014-02-04 11:38:29.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jan 31 10:18:53 UTC 2014 - vmoravec(a)suse.com + +- Add SlpService module (fate#316384) +- 3.1.2 + +------------------------------------------------------------------- Wed Nov 13 15:56:18 UTC 2013 - jreidinger(a)suse.com - Add explicit COPYING file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slp-3.1.1/package/yast2-slp.spec new/yast2-slp-3.1.2/package/yast2-slp.spec --- old/yast2-slp-3.1.1/package/yast2-slp.spec 2013-11-15 13:19:35.000000000 +0100 +++ new/yast2-slp-3.1.2/package/yast2-slp.spec 2014-02-04 11:38:29.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-slp -Version: 3.1.1 +Version: 3.1.2 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -26,7 +26,8 @@ Group: System/YaST License: GPL-2.0+ BuildRequires: gcc-c++ openslp-devel doxygen perl-XML-Writer yast2-core-devel yast2 libtool -BuildRequires: yast2-devtools >= 3.0.6 +BuildRequires: yast2-devtools >= 3.1.10 +BuildRequires: rubygem-rspec %if 0%{?suse_version} < 1220 BuildRequires: libxcrypt-devel %endif @@ -34,6 +35,7 @@ Requires: yast2-ruby-bindings >= 1.0.0 Summary: YaST2 - SLP Agent and Browser +Url: https://github.com/yast/yast-slp %description This module enables YaST modules to register services with SLP. @@ -56,4 +58,5 @@ %{yast_plugindir}/libpy2ag_slp.so %{yast_plugindir}/libpy2ag_slp.la %{yast_moduledir}/SLP.rb +%{yast_moduledir}/SlpService.rb %doc %{yast_docdir} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slp-3.1.1/src/Makefile.am new/yast2-slp-3.1.2/src/Makefile.am --- old/yast2-slp-3.1.1/src/Makefile.am 2013-11-15 13:19:35.000000000 +0100 +++ new/yast2-slp-3.1.2/src/Makefile.am 2014-02-04 11:38:29.000000000 +0100 @@ -1,7 +1,8 @@ # Sources for slp module_DATA = \ - modules/SLP.rb + modules/SLP.rb \ + modules/SlpService.rb EXTRA_DIST = $(module_DATA) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slp-3.1.1/src/modules/SlpService.rb new/yast2-slp-3.1.2/src/modules/SlpService.rb --- old/yast2-slp-3.1.1/src/modules/SlpService.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-slp-3.1.2/src/modules/SlpService.rb 2014-02-04 11:38:29.000000000 +0100 @@ -0,0 +1,178 @@ +# = API for consuming SLP services in Yast +# The purpose of this module is to have a more developer friendly +# API for searching and manipulating SLP services. It hides the complexity of +# SLP protocol queries by concentrating the discovery call into a single method +# taking into account the service type along with its attributes. +# +# @example A simple query for available ldap services +# +# Yast::SlpService.find('ldap') # return a service object or nil if none found +# Yast::SlpService.all('ldap') # return all discovered services in a collection +# +# @example A query for installation server service with scope and protocol parameters +# +# Yast::SlpService.all('install.suse', :scope=>'some-scope', :protocol=>'ftp') +# +# +# @example Another query narrowing the results by criteria for service attributes +# +# Yast::SlpService.all('install.suse', :machine=>'x86_64') +# +# +# @example How to access the obtained service properties +# +# service = Yast::SlpService.find('ldap', :port=>389, :description=>'main') +# service.name # => 'ldap' +# service.ip # => '10.10.10.10' +# service.port # => 389 +# service.slp_type # => 'service:ldap' +# service.slp_url # => 'service:ldap://server.me:389' +# service.protocol # => 'ldap' +# service.host # => 'server.me' +# service.lifetime # => 65535 +# service.attributes.description # => 'Main LDAP server' +# +# The matching of the attributes is case insensitive. +# +# @example How to get a list of available service types +# +# Yast::SlpService.types.each do |type| +# puts type.name +# puts type.protocol +# end +# +# The rule is: if the service name is equal to protocol name, don't pass the protocol +# name as parameter to the search query (this is typical i.e. for ntp, ssh or ldap services). + +require 'resolv' +require 'ostruct' + +module Yast + Yast.import 'SLP' + + class SlpServiceClass < Module + + SCHEME = 'service' + DELIMITER = ':' + + def find(service_name, params={}) + service = nil + service_type = create_service_type(service_name, params[:protocol]) + discover_service(service_type, params[:scope]).each do |slp_response| + service = Service.create(params.merge(:name=>service_name, :data=>slp_response)) + break if service + end + service + end + + def all(service_name, params={}) + service_type = create_service_type(service_name, params[:protocol]) + services = discover_service(service_type, params[:scope]).map do |slp_response| + Service.create(params.merge(:name=>service_name, :data=>slp_response)) + end + services.compact + end + + def types + available_services = [] + discovered_services = discover_service_types + return available_services if discovered_services.empty? + + discovered_services.each do |slp_service_type| + available_services << parse_slp_type(slp_service_type) + end + available_services + end + + private + + def create_service_type(service_name, protocol) + [SCHEME, service_name, protocol].compact.join(DELIMITER) + end + + def parse_slp_type(service_type) + type_parts = service_type.split(DELIMITER) + case type_parts.size + when 2 + name = protocol = type_parts.last + when 3 + name = type_parts[1] + protocol = type_parts[2] + else + raise "Incorrect slp service type: #{service.inspect}" + end + OpenStruct.new :name => name, :protocol => protocol + end + + def discover_service(service_name, scope='') + SLP.FindSrvs(service_name, scope) + end + + def discover_service_types + SLP.FindSrvTypes('*', '') + end + + class Service + + def self.create params + service = new(params) + return service if service.verified? + end + + attr_reader :name, :ip, :host, :protocol, :port, :params + attr_reader :slp_type, :slp_url, :lifetime, :attributes + + def initialize(params) + @name = params.delete(:name) + slp_data = params.delete(:data) + @ip = slp_data['ip'] + @port = slp_data['pcPort'] + @slp_type = slp_data['pcSrvType'] + @slp_url = slp_data['srvurl'] + @protocol = params.delete(:protocol) || slp_type.split(DELIMITER).last + @host = DnsCache.resolve(ip) + @lifetime = slp_data['lifetime'] + @attributes = OpenStruct.new(SLP.GetUnicastAttrMap(slp_url, ip)) + @params = params + end + + def verified? + params.all? do |key, value| + if respond_to?(key) + result = send(key).to_s + result.match(/#{value}/i) + elsif attributes.respond_to?(key) + result = attributes.send(key).to_s + result.match(/#{value}/i) + else + true + end + end + end + end + + module DnsCache + def self.resolve(ip_address) + host = find(ip_address) + return host if host + + host = Resolv.getname(ip_address) + update(ip_address => host) + host + end + + def self.entries + @entries ||= {} + end + + def self.find ip_address + entries[ip_address] + end + + def self.update entry + entries.merge!(entry) + end + end + end + SlpService = SlpServiceClass.new +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slp-3.1.1/test/Makefile.am new/yast2-slp-3.1.2/test/Makefile.am --- old/yast2-slp-3.1.1/test/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-slp-3.1.2/test/Makefile.am 2014-02-04 11:38:29.000000000 +0100 @@ -0,0 +1,8 @@ +TESTS = \ + slp_service_test.rb + +TEST_EXTENSIONS = .rb +RB_LOG_COMPILER = rspec +VERBOSE = 1 +EXTRA_DIST = $(TESTS) + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slp-3.1.1/test/slp_service_test.rb new/yast2-slp-3.1.2/test/slp_service_test.rb --- old/yast2-slp-3.1.1/test/slp_service_test.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-slp-3.1.2/test/slp_service_test.rb 2014-02-04 11:38:29.000000000 +0100 @@ -0,0 +1,101 @@ +#!/usr/bin/env rspec +# +ENV['Y2DIR'] = File.expand_path('../../src', __FILE__) + +require 'yast' + +Yast.import 'SlpService' + +describe Yast::SlpService do + before do + @service = double('service', + :name=>'install.suse', :ip=>'10.100.2.16', + :host => 'fallback.suse.cz', :protocol => 'http', + :lifetime => 65535, :port => 0) + + @attributes = double('attributes', :machine=>'x86_64', :description=>'SLE_10_SP4_SDK') + + + Yast::SlpService.stub(:discover_service).and_return( + [ + { + 'ip' => '10.100.2.16', + 'pcFamily' => 'IP', + 'pcHost' => '10.100.2.16', + 'pcPort' => 0, + 'pcSrvPart' => '/install/SLP/SLE-10-SP4-SDK-RC3/x86_64/DVD1', + 'pcSrvType' => 'service:install.suse:http', + 'srvurl' => 'service:install.suse:http://10.100.2.16/install/SLP/SLE-10-SP4-SDK-RC3/x86_64/DVD1', + 'lifetime' => 65535 + } + ] + ) + + Yast::SLP.stub(:GetUnicastAttrMap).and_return( + { + 'machine' => 'x86_64', + 'description' => 'SLE_10_SP4_SDK' + } + ) + + Yast::SLP.stub(:FindSrvTypes).and_return( + [ + 'service:smtp', + 'service:install.suse:http', + 'service:ntp', + 'service:ldap' + ] + ) + + ::Resolv.stub(:getname).and_return('fallback.suse.cz') + end + + describe '#find' do + it 'returns the first discovered service that matches the service name and params' do + service = Yast::SlpService.find('install.suse', :machine=>'x86_64') + expect(service.name).to eq((a)service.name) + expect(service.ip).to eq((a)service.ip) + expect(service.host).to eq((a)service.host) + expect(service.protocol).to eq((a)service.protocol) + expect(service.port).to eq((a)service.port) + expect(service.lifetime).to eq((a)service.lifetime) + expect(service).to respond_to(:attributes) + expect(service.attributes).to respond_to(:machine) + expect(service.attributes.machine).to eq((a)attributes.machine) + expect(service.attributes).to respond_to(:description) + expect(service.attributes.description).to eq((a)attributes.description) + end + + it 'returns nil if no matching service found' do + service = Yast::SlpService.find('install.suse', :machine=>'Dell') + expect(service).to eq(nil) + end + end + + describe '#all' do + it 'returns a collection of services' do + services = Yast::SlpService.all('install.suse') + expect(services.size).to eq(1) + service = services.first + expect(service).to be_a(Yast::SlpServiceClass::Service) + expect(service.name).to eq((a)service.name) + expect(service.ip).to eq((a)service.ip) + expect(service.host).to eq((a)service.host) + expect(service.protocol).to eq((a)service.protocol) + end + end + + describe '#types' do + before do + @type = double('type', :name => 'install.suse', :protocol => 'http') + end + + it 'returns a collection of discovered service types' do + service_types = Yast::SlpService.types + expect(service_types).to respond_to(:each) + type = service_types.find {|t| t.name == @type.name } + expect(type).not_to eq(nil) + expect(type.protocol).to eq((a)type.protocol) + end + end +end continue with "q"... Checked in at Tue Feb 4 15:04:33 CET 2014 by ro Remember to have fun... -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] [ci_new_pac] JFYI yast2-samba-client -> sle12
by ro 04 Feb '14

04 Feb '14

Script 'mail_helper' called by ro Hello packager, This is just FYI. Your package was checked in in distribution "sle12" by autobuild-member: ro. Here comes the log... ---------------------------%<------------------------------ Hi, here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-samba-client -> sle12 Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-samba-client/yast2-samba-client.changes 2014-01-17 14:16:33.000000000 +0100 +++ /mounts/work_src_done/SLE12/yast2-samba-client/yast2-samba-client.changes 2014-02-04 09:38:24.000000000 +0100 @@ -1,0 +2,14 @@ +Mon Feb 3 17:40:22 UTC 2014 - varkoly(a)suse.com + +- Include Kerberos.rb module because dropping yast2-kerberos-client +- 3.1.3 + +------------------------------------------------------------------- +Mon Feb 3 13:59:29 UTC 2014 - nopower(a)suse.com + +- Add in 'Expert Settings' page new 'Allowed group(s)' field to + facilitate populating the requires_of_membership field in + pam_winbind.conf configuration file. (fate #312146) +- 3.1.2 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2-samba-client - yast2-samba-server ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-samba-client (Old) and /mounts/work_src_done/SLE12/yast2-samba-client (BS:build ID:31582 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-samba-client", Maintainer is "yast-commit(a)opensuse.org" Old: ---- yast2-samba-client-3.1.1.tar.bz2 New: ---- yast2-samba-client-3.1.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-samba-client.spec ++++++ --- /var/tmp/diff_new_pack.JPRHh4/_old 2014-02-04 15:04:08.000000000 +0100 +++ /var/tmp/diff_new_pack.JPRHh4/_new 2014-02-04 15:04:08.000000000 +0100 @@ -17,20 +17,18 @@ Name: yast2-samba-client -Version: 3.1.1 +Version: 3.1.3 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 -BuildRequires: perl-XML-Writer -BuildRequires: update-desktop-files -BuildRequires: yast2-devtools >= 3.0.6 -BuildRequires: yast2-pam -BuildRequires: yast2-perl-bindings -BuildRequires: yast2-testsuite +Group: System/YaST +License: GPL-2.0 +BuildRequires: yast2-pam yast2-perl-bindings perl-XML-Writer yast2-testsuite update-desktop-files +BuildRequires: yast2-devtools >= 3.1.10 Requires: perl-XML-LibXML -Requires: yast2-kerberos-client +Conflicts: yast2-kerberos-client < 3.1.2 # new Pam.ycp API Requires: yast2-pam >= 2.14.0 @@ -39,13 +37,11 @@ # Wizard::SetDesktopTitleAndIcon Requires: yast2 >= 2.21.22 -BuildArch: noarch +BuildArchitectures: noarch Requires: yast2-ruby-bindings >= 1.0.0 Summary: YaST2 - Samba Client Configuration -License: GPL-2.0 -Group: System/YaST %description This package contains the YaST2 component for configuration of an SMB @@ -60,6 +56,7 @@ %install %yast_install + %files %defattr(-,root,root) %dir %{yast_yncludedir}/samba-client @@ -73,5 +70,3 @@ %{yast_agentdir}/ag_pam_mount %{yast_schemadir}/autoyast/rnc/samba-client.rnc %doc %{yast_docdir} - -%changelog ++++++ yast2-samba-client-3.1.1.tar.bz2 -> yast2-samba-client-3.1.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-3.1.1/CONTRIBUTING.md new/yast2-samba-client-3.1.3/CONTRIBUTING.md --- old/yast2-samba-client-3.1.1/CONTRIBUTING.md 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-samba-client-3.1.3/CONTRIBUTING.md 2014-02-04 09:59:27.000000000 +0100 @@ -0,0 +1,87 @@ +YaST Contribution Guidelines +============================ + +YaST is an open source project and as such it welcomes all kinds of +contributions. If you decide to contribute, please follow these guidelines to +ensure the process is effective and pleasant both for you and YaST maintainers. + +There are two main forms of contribution: reporting bugs and performing code +changes. + +Bug Reports +----------- + +If you find a problem, please report it either using +[Bugzilla](https://bugzilla.novell.com/enter_bug.cgi?format=guided&product=openSUSE+Factory&component=YaST2) +or [GitHub issues](../../issues). (For Bugzilla, use the [simplified +registration](https://secure-www.novell.com/selfreg/jsp/createSimpleAccount.jsp) +if you don't have an account yet.) + +If you find a problem, please report it either using +[Bugzilla](https://bugzilla.novell.com/) or GitHub issues. We can't guarantee +that every bug will be fixed, but we'll try. + +When creating a bug report, please follow our [bug reporting +guidelines](http://en.opensuse.org/openSUSE:Report_a_YaST_bug). + +Code Changes +------------ + +We welcome all kinds of code contributions, from simple bug fixes to significant +refactorings and implementation of new features. However, before making any +non-trivial contribution, get in touch with us first — this can prevent wasted +effort on both sides. Also, have a look at our [development +documentation](http://en.opensuse.org/openSUSE:YaST_development). + +To send us your code change, use GitHub pull requests. The workflow is as +follows: + + 1. Fork the project. + + 2. Create a topic branch based on `master`. + + 3. Implement your change, including tests (if possible). Make sure you adhere + to the [Ruby style + guide](https://github.com/SUSE/style-guides/blob/master/Ruby.md). + + 4. Make sure your change didn't break anything by building the RPM package + (`rake osc:build`). The build process includes running the full testsuite. + + 5. Publish the branch and create a pull request. + + 6. YaST developers will review your change and possibly point out issues. + Adapt the code under their guidance until they are all resolved. + + 7. Finally, the pull request will get merged or rejected. + +See also [GitHub's guide on +contributing](https://help.github.com/articles/fork-a-repo). + +If you want to do multiple unrelated changes, use separate branches and pull +requests. + +Do not change the `VERSION` and `*.changes` files as this could lead to +conflicts. + +### Commits + +Each commit in the pull request should do only one thing, which is clearly +described by its commit message. Especially avoid mixing formatting changes and +functional changes into one commit. When writing commit messages, adhere to +[widely used +conventions](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html). + +If your commit is related to a bug in Buzgilla or an issue on GitHub, make sure +you mention it in the commit message for cross-reference. Use format like +bnc#775814 or gh#yast/yast-foo#42. See also [GitHub +autolinking](https://help.github.com/articles/github-flavored-markdown#references) +and [openSUSE abbreviation +reference](http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines#Current_set_of_abbreviations). + +Additional Information +---------------------- + +If you have any question, feel free to ask at the [development mailing +list](http://lists.opensuse.org/yast-devel/) or at the +[#yast](http://webchat.freenode.net/?channels=%23yast) IRC channel on freenode. +We'll do our best to provide a timely and accurate answer. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-3.1.1/VERSION new/yast2-samba-client-3.1.3/VERSION --- old/yast2-samba-client-3.1.1/VERSION 2013-10-23 08:33:30.000000000 +0200 +++ new/yast2-samba-client-3.1.3/VERSION 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -3.1.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-3.1.1/package/yast2-samba-client.changes new/yast2-samba-client-3.1.3/package/yast2-samba-client.changes --- old/yast2-samba-client-3.1.1/package/yast2-samba-client.changes 2013-10-23 08:33:30.000000000 +0200 +++ new/yast2-samba-client-3.1.3/package/yast2-samba-client.changes 2014-02-04 09:59:27.000000000 +0100 @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Mon Feb 3 17:40:22 UTC 2014 - varkoly(a)suse.com + +- Include Kerberos.rb module because dropping yast2-kerberos-client +- 3.1.3 + +------------------------------------------------------------------- +Mon Feb 3 13:59:29 UTC 2014 - nopower(a)suse.com + +- Add in 'Expert Settings' page new 'Allowed group(s)' field to + facilitate populating the requires_of_membership field in + pam_winbind.conf configuration file. (fate #312146) +- 3.1.2 + +------------------------------------------------------------------- Wed Oct 23 08:15:18 CEST 2013 - jsuchome(a)suse.cz - CLI; read AD settings, so the write command does not fallback diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-3.1.1/package/yast2-samba-client.spec new/yast2-samba-client-3.1.3/package/yast2-samba-client.spec --- old/yast2-samba-client-3.1.1/package/yast2-samba-client.spec 2013-10-23 08:33:30.000000000 +0200 +++ new/yast2-samba-client-3.1.3/package/yast2-samba-client.spec 2014-02-04 09:59:27.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-samba-client -Version: 3.1.0 +Version: 3.1.3 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -26,8 +26,9 @@ Group: System/YaST License: GPL-2.0 BuildRequires: yast2-pam yast2-perl-bindings perl-XML-Writer yast2-testsuite update-desktop-files -BuildRequires: yast2-devtools >= 3.0.6 -Requires: yast2-kerberos-client perl-XML-LibXML +BuildRequires: yast2-devtools >= 3.1.10 +Requires: perl-XML-LibXML +Conflicts: yast2-kerberos-client < 3.1.2 # new Pam.ycp API Requires: yast2-pam >= 2.14.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-3.1.1/src/include/samba-client/dialogs.rb new/yast2-samba-client-3.1.3/src/include/samba-client/dialogs.rb --- old/yast2-samba-client-3.1.1/src/include/samba-client/dialogs.rb 2013-10-16 09:38:52.000000000 +0200 +++ new/yast2-samba-client-3.1.3/src/include/samba-client/dialogs.rb 2014-02-04 09:59:27.000000000 +0100 @@ -252,6 +252,18 @@ ) ), VSpacing(0.2), + # require_groups + Frame("Allowed group(s)", + Left( + InputField( + Id("require_grp"), + Opt(:hstretch), + "group name(s) or SID(s)", + SambaConfig::WinbindGlobalGetStr("require_membership_of", "") + ) + ) + ), + VSpacing(0.2), # combobox label Left( ComboBox( @@ -260,7 +272,6 @@ kerberos_methods ) ), - VSpacing(0.2), # frame label Frame( _("Windows Internet Name Service"), @@ -389,6 +400,14 @@ kerberos_method == "secrets only" ? nil : kerberos_method ) + required_groups = Convert.to_string( + UI.QueryWidget(Id("require_grp"), :Value) + ) + #remove leading/trailing spaces from each comma separated entry + required_groups = required_groups.split(',').map(&:strip).join(',') + + SambaConfig::WinbindGlobalSetStr("require_membership_of", + required_groups); updated_volumes = deep_copy(non_cifs_volumes) Builtins.foreach(mount_map) do |id, volume| updated_volumes = Builtins.add(updated_volumes, volume) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-3.1.1/src/modules/Kerberos.rb new/yast2-samba-client-3.1.3/src/modules/Kerberos.rb --- old/yast2-samba-client-3.1.1/src/modules/Kerberos.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-samba-client-3.1.3/src/modules/Kerberos.rb 2014-02-04 09:59:27.000000000 +0100 @@ -0,0 +1,1115 @@ +# encoding: utf-8 + +# ------------------------------------------------------------------------------ +# Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. +# +# +# This program is free software; you can redistribute it and/or modify it under +# the terms of version 2 of the GNU General Public License as published by the +# Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along with +# this program; if not, contact Novell, Inc. +# +# To contact Novell about this file by physical or electronic mail, you may find +# current contact information at www.novell.com. +# ------------------------------------------------------------------------------ + +# File: modules/Kerberos.ycp +# Package: Configuration of kerberos-client +# Summary: Data for configuration of kerberos-client, i/o functions. +# Authors: Jiri Suchomel <jsuchome(a)suse.cz> +# +# $Id$ +# +# Representation of the configuration of kerberos-client. +# Input and output routines. +require "yast" + +module Yast + class KerberosClass < Module + def main + + textdomain "kerberos" + + Yast.import "FileUtils" + Yast.import "Hostname" + Yast.import "Label" + Yast.import "Mode" + Yast.import "Package" + Yast.import "Pam" + Yast.import "Progress" + Yast.import "Report" + Yast.import "Service" + Yast.import "Stage" + Yast.import "Summary" + + # Required packages for this module to operate + @required_packages = ["pam_krb5", "krb5", "krb5-client"] + + @write_only = false + + # if pam_krb5 module is used for login + @use_pam_krb = false + + # if pam_unix is in /etc/pam.d/login + @pam_unix_present = false + + # default realm and domain name + @default_realm = "" + @default_domain = "" + + @dns_default_realm = "" + @dns_kdc = "" + + # adress of KDC (key distribution centre) server for default realm + @kdc = "" + @admin_server = "" + + # used for pkinit-nss (feature 302132) + @trusted_servers = "" + + @clockskew = "300" + + @pam_modified = false + @ssh_modified = false + @modified = false + + # advanced krb5.conf settings (pam section) + @ticket_lifetime = "1d" + @renew_lifetime = "1d" + @forwardable = "true" + @proxiable = "false" + # obsolete, do not use + @retain_after_close = "false" + @ssh_support = false + @minimum_uid = "1" + + # deprecated at this scope: now present in ExpertSettings map + @use_shmem = "sshd" + @mappings = "" + + # --krb5-ignore_unknown_principals for pam-config + @ignore_unknown = true + + # section in /etc/ssh/ssh_config file for storing krb support + @ssh_section = "*" + + # packages to install (openssh etc.) + @packages = [] + + # if DNS can be used for retrieving configuration data + @dns_available = false + + # if DNS is used for retrieving configuration data + @dns_used = false + + # if sssd is configured, do not use pam_krb5 + @sssd = false + + # map with the settings configurable in the expert tabs + @ExpertSettings = {} + + # backup of original ExpertSettings + @OrigExpertSettings = {} + end + + # Data was modified? + # @return true if modified + def Modified + Builtins.y2debug("modified=%1", @modified) + @modified || @pam_modified || @ssh_modified + end + + + # Get all the Kerberos configuration from a map. + # @param [Hash] settings imported map + # @return success + def Import(settings) + settings = deep_copy(settings) + @use_pam_krb = Ops.get_boolean( + settings, + ["pam_login", "use_kerberos"], + false + ) + client = Ops.get_map(settings, "kerberos_client", {}) + + @default_domain = Ops.get_string(client, "default_domain", "") + @default_realm = Ops.get_string(client, "default_realm", "") + @kdc = Ops.get_string(client, "kdc_server", "") + @clockskew = Ops.get_string(client, "clockskew", @clockskew) + @ssh_support = Ops.get_boolean(client, "ssh_support", false) + @ignore_unknown = Ops.get_boolean( + client, + "ignore_unknown", + @ignore_unknown + ) + @ticket_lifetime = Ops.get_string(client, "ticket_lifetime", "1d") + @renew_lifetime = Ops.get_string(client, "renew_lifetime", "1d") + @minimum_uid = Ops.get_string(client, "minimum_uid", @minimum_uid) + @forwardable = Ops.get_boolean(client, "forwardable", true) ? "true" : "false" + @proxiable = Ops.get_boolean(client, "proxiable", false) ? "true" : "false" + @use_shmem = Ops.get_string(client, "use_shmem", @use_shmem) + @mappings = Ops.get_string(client, "mappings", "") + @trusted_servers = Ops.get_string(client, "trusted_servers", "") + @ExpertSettings = Ops.get_map(client, "ExpertSettings", {}) + if !Builtins.haskey(@ExpertSettings, "use_shmem") && + Builtins.haskey(client, "use_shmem") + Ops.set(@ExpertSettings, "use_shmem", @use_shmem) + end + + @sssd = Ops.get_boolean(settings, ["pam_login", "sssd"], @sssd) + @pam_modified = true + @modified = true + @ssh_modified = true + true + end + + + # Dump the Kerberos settings to a map, for autoinstallation use. + # @return [Hash] with settings + def Export + export_map = { + "pam_login" => { "use_kerberos" => @use_pam_krb, "sssd" => @sssd }, + "kerberos_client" => { + "default_domain" => @default_domain, + "default_realm" => @default_realm, + "kdc_server" => @kdc, + "clockskew" => @clockskew, + "ssh_support" => @ssh_support, + "ignore_unknown" => @ignore_unknown, + "ticket_lifetime" => @ticket_lifetime, + "renew_lifetime" => @renew_lifetime, + "minimum_uid" => @minimum_uid, + "forwardable" => @forwardable == "true", + "proxiable" => @proxiable == "true", + "ExpertSettings" => @ExpertSettings + } + } + if @mappings != "" + Ops.set(export_map, ["kerberos_client", "mappings"], @mappings) + end + if @trusted_servers != "" + Ops.set( + export_map, + ["kerberos_client", "trusted_servers"], + @trusted_servers + ) + end + deep_copy(export_map) + end + + # Reads the item values from the /etc/krb5.conf via ini agent + # If the item doesn't exist, returns the default value + # @param [Yast::Path] path_to_value path for agent (.etc.krb5_conf) + # @param [String] def_value default value for the key (path) + # @return [Array] string the values for given key + def ReadKrb5ConfValues(path_to_value, def_value) + value = Convert.convert( + SCR.Read(path_to_value), + :from => "any", + :to => "list <string>" + ) + value = [def_value] if value == nil + deep_copy(value) + end + + # Reads the item value from the /etc/krb5.conf via ini agent + # If the item doesn't exist, returns the default value + # @param [Yast::Path] path_to_value path for agent (.etc.krb5_conf) + # @param [String] def_value default value for the key (path) + # @return [String] the value + def ReadKrb5ConfValue(path_to_value, def_value) + vals = ReadKrb5ConfValues(path_to_value, def_value) + Ops.get_string(vals, 0, def_value) + end + + # Deprecated variant to ReadKrb5ConfValue + # @deprecated + def ReadFile(path_to_value, def_value) + Builtins.y2warning( + "This function is deprecated, use ReadKrb5ConfValue instead." + ) + ReadKrb5ConfValue(path_to_value, def_value) + end + + # Write list of values for given key to /etc/krb5.conf + # Do not write anything for empty and nil values + # @param [Yast::Path] path_to_value path for agent (.etc.krb5_conf) + # @param value + # @return false when nothing was written, success of write otherwise + def WriteKrb5ConfValues(path_to_value, values) + values = deep_copy(values) + return SCR.Write(path_to_value, nil) if values == nil || values == [] + SCR.Write(path_to_value, values) + end + + # Write (possible) multiple values of given key to /etc/krb5.conf + # @param [String] values values separated by spaces + def WriteKrb5ConfValuesAsString(path_to_value, values) + WriteKrb5ConfValues( + path_to_value, + Builtins.filter(Builtins.splitstring(values, " \t")) { |val| val != "" } + ) + end + # Write the item value to /etc/krb5.conf + # Do not write anything for empty and nil values + # @param [Yast::Path] path_to_value path for agent (.etc.krb5_conf) + # @param [String] value + # @return false when nothing was written, success of write otherwise + def WriteKrb5ConfValue(path_to_value, value) + return SCR.Write(path_to_value, nil) if value == nil || value == "" + WriteKrb5ConfValues(path_to_value, [value]) + end + + # Deprecated variant to WriteKrb5ConfValue + # @deprecated + def WriteFile(path_to_value, value) + Builtins.y2warning( + "This function is deprecated, use WriteKrb5ConfValue instead." + ) + WriteKrb5ConfValue(path_to_value, value) + end + + # Read given value from /etc/sssd/sssd.conf + # @param [String] default_value default, if not found in the file + def ReadSSSDValue(key, default_value) + ret = default_value + val = Convert.to_string( + SCR.Read( + Builtins.add( + Builtins.add(path(".etc.sssd_conf.v"), "domain/default"), + key + ) + ) + ) + ret = val if val != nil + ret + end + + # Reads Kerberos settings from the SCR + # @return success + def Read + pam_query = Pam.Query("krb5") + @use_pam_krb = Ops.greater_than(Builtins.size(pam_query), 0) + if @use_pam_krb # if krb is not enabled, ignore_unknown is true by default + @ignore_unknown = Builtins.contains( + Ops.get_list(pam_query, "account", []), + "ignore_unknown_principals" + ) + end + + # now read the settings from /etc/krb5.conf + if FileUtils.Exists("/etc/krb5.conf") + Builtins.y2debug( + "krb5.conf sections: %1", + SCR.Dir(path(".etc.krb5_conf.s")) + ) + + @default_realm = ReadKrb5ConfValue( + path(".etc.krb5_conf.v.libdefaults.default_realm"), + "" + ) + + @clockskew = ReadKrb5ConfValue( + path(".etc.krb5_conf.v.libdefaults.clockskew"), + "300" + ) + + if Ops.greater_than(Builtins.size(@default_realm), 0) + realm = Builtins.add(path(".etc.krb5_conf.v"), @default_realm) + @kdc = Builtins.mergestring( + ReadKrb5ConfValues(Builtins.add(realm, "kdc"), ""), + " " + ) + @admin_server = Builtins.mergestring( + ReadKrb5ConfValues(Builtins.add(realm, "admin_server"), ""), + " " + ) + @default_domain = ReadKrb5ConfValue( + Builtins.add(realm, "default_domain"), + "" + ) + end + @admin_server = "" if @admin_server == @kdc # we could replace it in Write in this case... + + pam_p = path(".etc.krb5_conf.v.pam") + @ticket_lifetime = ReadKrb5ConfValue( + Builtins.add(pam_p, "ticket_lifetime"), + "1d" + ) + @renew_lifetime = ReadKrb5ConfValue( + Builtins.add(pam_p, "renew_lifetime"), + "1d" + ) + @forwardable = ReadKrb5ConfValue( + Builtins.add(pam_p, "forwardable"), + "true" + ) + @proxiable = ReadKrb5ConfValue( + Builtins.add(pam_p, "proxiable"), + "false" + ) + @minimum_uid = ReadKrb5ConfValue( + Builtins.add(pam_p, "minimum_uid"), + "1" + ) + + Builtins.foreach( + [ + "keytab", + "ccache_dir", + "ccname_template", + "mappings", + "existing_ticket", + "external", + "validate", + "use_shmem", + "addressless", + "debug", + "debug_sensitive", + "initial_prompt", + "subsequent_prompt", + "banner" + ] + ) do |key| + val = ReadKrb5ConfValue(Builtins.add(pam_p, key), nil) + Ops.set(@ExpertSettings, key, val) if val != nil + end + if !Builtins.haskey(@ExpertSettings, "use_shmem") + Ops.set(@ExpertSettings, "use_shmem", "sshd") + end + @use_shmem = Ops.get_string(@ExpertSettings, "use_shmem", "sshd") + if !Builtins.haskey(@ExpertSettings, "external") + Ops.set(@ExpertSettings, "external", "sshd") + end + + @OrigExpertSettings = deep_copy(@ExpertSettings) + + @trusted_servers = ReadKrb5ConfValue( + path(".etc.krb5_conf.v.pkinit.trusted_servers"), + "" + ) + else + SCR.Execute( + path(".target.bash"), + Builtins.sformat("/usr/bin/touch /etc/krb5.conf") + ) + end + + # propose some good values, if there are install defaults + if @default_domain == "" + @default_domain = Hostname.CurrentDomain + # workaround for bug#393951 + if @default_domain == "" && Stage.cont + out = Convert.to_map( + SCR.Execute(path(".target.bash_output"), "domainname") + ) + if Ops.get_integer(out, "exit", 0) == 0 + @default_domain = Builtins.deletechars( + Ops.get_string(out, "stdout", ""), + "\n" + ) + end + end + end + + # now, check DNS status (Fate 301812) + if FileUtils.Exists("/usr/bin/dig") && @default_domain != "" && !Mode.test + out = Convert.to_map( + SCR.Execute( + path(".target.bash_output"), + Builtins.sformat("dig TXT _kerberos.%1 +short", @default_domain) + ) + ) + @dns_default_realm = Builtins.deletechars( + Ops.get_string(out, "stdout", ""), + "\n\"" + ) + if @dns_default_realm != "" + out = Convert.to_map( + SCR.Execute( + path(".target.bash_output"), + Builtins.sformat( + "dig SRV _kerberos._udp.%1 +short", + @default_domain + ) + ) + ) + split = Builtins.splitstring( + Ops.get( + Builtins.splitstring(Ops.get_string(out, "stdout", ""), "\n"), + 0, + "" + ), + " " + ) + @dns_kdc = Ops.get_string(split, 3, "") + if @dns_kdc != "" && + Builtins.substring( + @dns_kdc, + Ops.subtract(Builtins.size(@dns_kdc), 1), + 1 + ) == "." + @dns_kdc = Builtins.substring( + @dns_kdc, + 0, + Ops.subtract(Builtins.size(@dns_kdc), 1) + ) + end + @dns_available = true if @dns_kdc != "" + # empty domain_realm section and no kdc entry defined and + # values via DNS are available -> DNS is used + if @kdc == "" && + (!Builtins.contains( + SCR.Dir(path(".etc.krb5_conf.s")), + "domain_realm" + ) || + SCR.Dir(path(".etc.krb5_conf.v.domain_realm")) == []) + @dns_used = true + @kdc = @dns_kdc + @default_realm = @dns_default_realm + Builtins.y2milestone( + "kdc by DNS %1, default_domain: %2", + @dns_kdc, + @dns_default_realm + ) + Builtins.y2milestone("DNS is used for Kerberos data") + end + end + end + + if (@default_realm == "" || @default_realm == "MY.REALM" || + @default_realm == "EXAMPLE.COM") && + @default_domain != "" + @default_realm = Builtins.toupper(@default_domain) + end + if (@kdc == "" || @kdc == "MY.COMPUTER" || @kdc == "kerberos.example.com") && + FileUtils.Exists("/usr/bin/ypwhich") + out = Convert.to_map( + SCR.Execute(path(".target.bash_output"), "/usr/bin/ypwhich") + ) + @kdc = Builtins.deletechars(Ops.get_string(out, "stdout", ""), "\n") + end + if (@kdc == "" || @kdc == "MY.COMPUTER" || @kdc == "kerberos.example.com") && + FileUtils.Exists("/usr/bin/host") + proposed = Ops.add("kdc.", Hostname.CurrentDomain) + m = Convert.to_map( + SCR.Execute( + path(".target.bash_output"), + Builtins.sformat( + "LANG=C /usr/bin/host %1 | /bin/grep address", + proposed + ) + ) + ) + @kdc = proposed if Ops.get_integer(m, "exit", 1) == 0 + Builtins.y2milestone("no kdc defined, proposing: %1", @kdc) + end + + # read ssh support + Builtins.y2debug( + "ssh_config sections: %1", + SCR.Dir(path(".etc.ssh.ssh_config.s")) + ) + hostname = Hostname.CurrentHostname + + @ssh_support = nil + Builtins.foreach(SCR.Dir(path(".etc.ssh.ssh_config.s"))) do |sec| + # according to ssh man page, first value is taken: + next if @ssh_support != nil + cont = SCR.Dir(Builtins.add(path(".etc.ssh.ssh_config.v"), sec)) + Builtins.y2debug("section %1 contains: %2", sec, cont) + if (sec == "*" || sec == hostname) && + Builtins.contains(cont, "GSSAPIAuthentication") && + Builtins.contains(cont, "GSSAPIDelegateCredentials") + @ssh_support = SCR.Read( + Builtins.add( + Builtins.add(path(".etc.ssh.ssh_config.v"), sec), + "GSSAPIAuthentication" + ) + ) == "yes" && + SCR.Read( + Builtins.add( + Builtins.add(path(".etc.ssh.ssh_config.v"), sec), + "GSSAPIDelegateCredentials" + ) + ) == "yes" + @ssh_section = sec + end + end + @ssh_support = false if @ssh_support == nil + + @sssd = Pam.Enabled("sss") + + if @sssd && FileUtils.Exists("/etc/sssd/sssd.conf") + # read kerberos settings from sssd.conf (if available) + @default_realm = ReadSSSDValue("krb5_realm", @default_realm) + @kdc = ReadSSSDValue("krb5_server", @kdc) + Ops.set( + @ExpertSettings, + "ccache_dir", + ReadSSSDValue( + "krb5_ccachedir", + Ops.get_string(@ExpertSettings, "ccache_dir", "") + ) + ) + Ops.set( + @ExpertSettings, + "ccname_template", + ReadSSSDValue( + "krb5_ccname_template", + Ops.get_string(@ExpertSettings, "ccname_template", "") + ) + ) + Ops.set( + @ExpertSettings, + "keytab", + ReadSSSDValue( + "krb5_keytab", + Ops.get_string(@ExpertSettings, "keytab", "") + ) + ) + @renew_lifetime = ReadSSSDValue( + "krb5_renewable_lifetime", + @renew_lifetime + ) + @ticket_lifetime = ReadSSSDValue("krb5_lifetime", @ticket_lifetime) + Ops.set( + @ExpertSettings, + "validate", + Builtins.tolower( + ReadSSSDValue( + "krb5_validate", + Ops.get_string(@ExpertSettings, "validate", "") + ) + ) + ) + end + true + end + + # Write Kerberos related settings to sssd.conf + def WriteSSSD + Builtins.y2milestone("updating sssd.conf with new kerberos values") + + domain = Builtins.add(path(".etc.sssd_conf.v"), "domain/default") + + SCR.Write(Builtins.add(domain, "auth_provider"), "krb5") + SCR.Write(Builtins.add(domain, "chpass_provider"), "krb5") + SCR.Write(Builtins.add(domain, "krb5_realm"), @default_realm) + # divide by commas: krb5_server = kdcserver1, kdcserver2 (bnc#729174) + SCR.Write(Builtins.add(domain, "krb5_server"), @kdc.gsub(/\s+/, ",")) + + # write expert settings (bnc#778513) + SCR.Write( + Builtins.add(domain, "krb5_ccachedir"), + Ops.get_string(@ExpertSettings, "ccache_dir", "") == "" ? + nil : + Ops.get_string(@ExpertSettings, "ccache_dir", "") + ) + SCR.Write( + Builtins.add(domain, "krb5_ccname_template"), + Ops.get_string(@ExpertSettings, "ccname_template", "") == "" ? + nil : + Ops.get_string(@ExpertSettings, "ccname_template", "") + ) + SCR.Write( + Builtins.add(domain, "krb5_validate"), + Ops.get_string(@ExpertSettings, "validate", "") == "true" ? "True" : "False" + ) + SCR.Write( + Builtins.add(domain, "krb5_keytab"), + Ops.get_string(@ExpertSettings, "keytab", "") == "" ? + nil : + Ops.get_string(@ExpertSettings, "keytab", "") + ) + SCR.Write( + Builtins.add(domain, "krb5_renewable_lifetime"), + @renew_lifetime + ) + SCR.Write(Builtins.add(domain, "krb5_lifetime"), @ticket_lifetime) + + ret = SCR.Write(path(".etc.sssd_conf"), nil) + Builtins.y2error("error writing sssd.conf file") if !ret + ret + end + + # Saves Kerberos configuration. + # (No parameters because it is too short to abort) + # @return true on success + def Write + pam_installed = false + ret = true + + # dialog caption + caption = _("Saving Kerberos Client Configuration") + + no_stages = 3 + stages = [ + # progress stage label + _("Write PAM settings"), + # progress stage label + _("Write Kerberos client settings"), + # progress stage label + _("Write OpenSSH settings") + ] + steps = [ + # progress step label + _("Writing PAM settings..."), + # progress step label + _("Writing Kerberos client settings..."), + # progress step label + _("Writing OpenSSH settings..."), + # final progress step label + _("Finished") + ] + if @packages != [] + # progress stage label + stages = Builtins.prepend(stages, _("Install required packages")) + # progress step label + steps = Builtins.prepend(steps, _("Installing required packages...")) + no_stages = Ops.add(no_stages, 1) + end + + Progress.New(caption, " ", no_stages, stages, steps, "") + + if @packages != [] + Builtins.y2debug("packages to install: %1", @packages) + Progress.NextStage + to_install = [] + # check if packages are avialable... + Builtins.foreach(@packages) do |p| + if Package.Available(p) == true + to_install = Builtins.add(to_install, p) + end + end + Package.DoInstallAndRemove(to_install, []) + + @packages = [] + end + + Progress.NextStage + + # -- pam settings + if @pam_modified || @write_only + # whem sssd is configured, do not use pam_krb5 and update sssd.conf + # fate#308902 + if @sssd + Builtins.y2milestone("not using pam_krb5 because sssd is configured") + Pam.Remove("krb5") + elsif @use_pam_krb + Pam.Add("krb5") + # If ldap is configured we need to change it to ldap-account_only + Pam.Add("ldap-account_only") if Pam.Enabled("ldap") + if @ignore_unknown + Pam.Add("krb5-ignore_unknown_principals") + else + Pam.Remove("krb5-ignore_unknown_principals") + end + else + # if ldap-account_only is used we need to change it to ldap + Pam.Add("ldap") if Pam.Enabled("ldap-account_only") + Pam.Remove("krb5") + end + end + + # -- write to /etc/krb5.conf + Progress.NextStage + + if @modified && !@dns_used + # change the default realm name + WriteKrb5ConfValue( + path(".etc.krb5_conf.v.libdefaults.default_realm"), + @default_realm + ) + + # write the mapping domain-realm + if @default_domain != "" + domain = @default_domain + if Builtins.findfirstof(domain, ".") != 0 + domain = Ops.add(".", domain) + end + WriteKrb5ConfValue( + Builtins.add(path(".etc.krb5_conf.v.domain_realm"), domain), + @default_realm + ) + end + + WriteKrb5ConfValue( + path(".etc.krb5_conf.v.libdefaults.clockskew"), + @clockskew + ) + + if Builtins.contains(SCR.Dir(path(".etc.krb5_conf.s")), @default_realm) + # update the default realm settings + WriteKrb5ConfValuesAsString( + Builtins.add( + Builtins.add(path(".etc.krb5_conf.v"), @default_realm), + "kdc" + ), + @kdc + ) + if @default_domain != "" && @default_domain != nil + WriteKrb5ConfValue( + Builtins.add( + Builtins.add(path(".etc.krb5_conf.v"), @default_realm), + "default_domain" + ), + @default_domain + ) + end + if @admin_server == "" + # save only when the entry was mising or same as KDC + WriteKrb5ConfValuesAsString( + Builtins.add( + Builtins.add(path(".etc.krb5_conf.v"), @default_realm), + "admin_server" + ), + @kdc + ) + end + elsif @default_realm != "" + # specify the type of this subsection + SCR.Write( + Builtins.add(path(".etc.krb5_conf.st.realms"), @default_realm), + [1] + ) + # write the settings of the new default realm + WriteKrb5ConfValuesAsString( + Builtins.add( + Builtins.add(path(".etc.krb5_conf.v.realms"), @default_realm), + "kdc" + ), + @kdc + ) + if @default_domain != "" && @default_domain != nil + WriteKrb5ConfValue( + Builtins.add( + Builtins.add(path(".etc.krb5_conf.v.realms"), @default_realm), + "default_domain" + ), + @default_domain + ) + end + if @admin_server == "" + WriteKrb5ConfValuesAsString( + Builtins.add( + Builtins.add(path(".etc.krb5_conf.v.realms"), @default_realm), + "admin_server" + ), + @kdc + ) + end + end + end + if @modified + WriteSSSD() if @sssd + + # 3. Yes, if the user chooses DNS you need to remove the domain_realm + # section (so that the domain->realm mapping can be read through DNS) + # and at least the complete sub-section describing the realm + # (maybe even the whole [realms]-section). + if @dns_used + Builtins.y2milestone( + "DNS set to use: removing domain info from krb5.conf" + ) + WriteKrb5ConfValue(path(".etc.krb5_conf.s.domain_realm"), nil) + WriteKrb5ConfValue( + Builtins.add(path(".etc.krb5_conf.s"), @default_realm), + nil + ) + # write the default realm name + WriteKrb5ConfValue( + path(".etc.krb5_conf.v.libdefaults.default_realm"), + @default_realm + ) + end + + # write advanced settings + pam_sect = path(".etc.krb5_conf.v.pam") + if !Builtins.contains(SCR.Dir(path(".etc.krb5_conf.s")), "pam") + # specify the type of new subsection + SCR.Write(path(".etc.krb5_conf.st.appdefaults.pam"), [1]) + pam_sect = path(".etc.krb5_conf.v.appdefaults.pam") + end + + WriteKrb5ConfValue( + Builtins.add(pam_sect, "ticket_lifetime"), + @ticket_lifetime + ) + WriteKrb5ConfValue( + Builtins.add(pam_sect, "renew_lifetime"), + @renew_lifetime + ) + WriteKrb5ConfValue(Builtins.add(pam_sect, "forwardable"), @forwardable) + WriteKrb5ConfValue(Builtins.add(pam_sect, "proxiable"), @proxiable) + WriteKrb5ConfValue(Builtins.add(pam_sect, "minimum_uid"), @minimum_uid) + + Builtins.foreach(@ExpertSettings) do |key, value| + pth = Builtins.add(pam_sect, key) + if Ops.is_boolean?(value) + WriteKrb5ConfValue(pth, value == true ? "true" : "false") + next + end + # rest is string + if value != "" + WriteKrb5ConfValue(pth, Convert.to_string(value)) + # removin + elsif Ops.get_string(@OrigExpertSettings, key, "") != "" + WriteKrb5ConfValue(pth, nil) + end + end + + if @trusted_servers != "" && + Package.Installed("krb5-plugin-preauth-pkinit-nss") + pkinit_sect = path(".etc.krb5_conf.v.pkinit") + if !Builtins.contains(SCR.Dir(path(".etc.krb5_conf.s")), "pkinit") + SCR.Write(path(".etc.krb5_conf.st.appdefaults.pkinit"), [1]) + pkinit_sect = path(".etc.krb5_conf.v.appdefaults.pkinit") + end + WriteKrb5ConfValue( + Builtins.add(pkinit_sect, "trusted_servers"), + @trusted_servers + ) + if FileUtils.Exists("/etc/pam_pkcs11/pam_pkcs11.conf") + SCR.Write( + Builtins.add( + Builtins.add( + path(".etc.pam_pkcs11_conf.v.pam_pkcs11"), + "mapper ms" + ), + "domainname" + ), + @default_realm + ) + SCR.Write( + Builtins.add( + Builtins.add( + path(".etc.pam_pkcs11_conf.v.pam_pkcs11"), + "mapper ms" + ), + "domainnickname" + ), + @default_domain + ) + SCR.Write(path(".etc.pam_pkcs11_conf"), nil) + end + end + + # write the changes now + SCR.Write(path(".etc.krb5_conf"), nil) + + # unmount agent; otherwise it won't be available to read new created + # sections (it will treat DEFAULT_REALM as a subsection of [realms]) + SCR.UnmountAgent(path(".etc.krb5_conf")) + end + + # -- write openssh settings + Progress.NextStage + + if @ssh_modified + write = @ssh_support ? "yes" : "no" + SCR.Write( + Builtins.add( + Builtins.add(path(".etc.ssh.ssh_config.v"), @ssh_section), + "GSSAPIAuthentication" + ), + write + ) + SCR.Write( + Builtins.add( + Builtins.add(path(".etc.ssh.ssh_config.v"), @ssh_section), + "GSSAPIDelegateCredentials" + ), + write + ) + SCR.Write(path(".etc.ssh.ssh_config"), nil) + Builtins.y2milestone("/etc/ssh/ssh_config modified") + end + + # final stage + Progress.NextStage + + ret + end + + # Create a textual summary + # @return summary of the current configuration + def Summary + summary = "" + nc = Summary.NotConfigured + # summary header + summary = Summary.AddHeader(summary, _("PAM Login")) + + # summary item + summary = Summary.AddLine( + summary, + @use_pam_krb ? + _("Use Kerberos") : + # summary item + _("Do Not Use Kerberos") + ) + + # summary header + summary = Summary.AddHeader(summary, _("Default Realm")) + summary = Summary.AddLine( + summary, + @default_realm != "" ? @default_realm : nc + ) + + # summary header + summary = Summary.AddHeader(summary, _("Default Domain")) + summary = Summary.AddLine( + summary, + @default_domain != "" ? @default_domain : nc + ) + + # summary header + summary = Summary.AddHeader(summary, _("KDC Server Address")) + summary = Summary.AddLine(summary, @kdc != "" ? @kdc : nc) + + # summary header + summary = Summary.AddHeader(summary, _("Clock Skew")) + summary = Summary.AddLine(summary, @clockskew != "" ? @clockskew : nc) + + [summary, []] + end + + # Create a short textual summary + # @return summary of the current configuration + def ShortSummary + summary = "" + nc = Summary.NotConfigured + # summary text, %1 is value + summary = Ops.add( + Ops.add( + Ops.add( + Builtins.sformat( + _("KDC Server: %1 "), + @kdc != "" ? @kdc : nc + ), + # summary text, %1 is value + Builtins.sformat( + _("Default Domain: %1 "), + @default_domain != "" ? @default_domain : nc + ) + ), + # summary text, %1 is value + Builtins.sformat( + _("Default Realm: %1 "), + @default_realm != "" ? @default_realm : nc + ) + ), + # summary text (yes/no follows) + Builtins.sformat( + _("Kerberos Authentication Enabled: %1"), + @use_pam_krb ? + # summary value + _("Yes") : + # summary value + _("No") + ) + ) + if @dns_used + # summary line + summary = Ops.add( + Ops.add(summary, " "), + _("Configuration Acquired via DNS") + ) + end + + summary + end + + # Return the list of packages for kerberos configuration + def RequiredPackages + pkgs = deep_copy(@required_packages) + # do not install pam_krb5 if sssd is configured + pkgs = Builtins.filter(pkgs) { |p| p != "pam_krb5" } if @sssd + deep_copy(pkgs) + end + + + # Return required packages for auto-installation + # @return [Hash] of packages to be installed and to be removed + def AutoPackages + { "install" => RequiredPackages(), "remove" => [] } + end + + # Validation function for time-related values + def ValidateTimeEntries(key, val) + if !Builtins.regexpmatch(val, "^([0-9]+)[dmh]$") && + !Builtins.regexpmatch(val, "^([0-9]+)$") + if key == "clockskew" + # error popup (wrong format of entered value) + Report.Error(_("Clock skew is invalid.\nTry again.\n")) + else + # error popup (wrong format of entered value) + Report.Error(_("Lifetime is invalid.\nTry again.")) + end + return false + end + true + end + + publish :variable => :required_packages, :type => "list <string>" + publish :variable => :write_only, :type => "boolean" + publish :variable => :use_pam_krb, :type => "boolean" + publish :variable => :pam_unix_present, :type => "boolean", :private => true + publish :variable => :default_realm, :type => "string" + publish :variable => :default_domain, :type => "string" + publish :variable => :dns_default_realm, :type => "string" + publish :variable => :dns_kdc, :type => "string" + publish :variable => :kdc, :type => "string" + publish :variable => :admin_server, :type => "string", :private => true + publish :variable => :trusted_servers, :type => "string" + publish :variable => :clockskew, :type => "string" + publish :variable => :pam_modified, :type => "boolean" + publish :variable => :ssh_modified, :type => "boolean" + publish :variable => :modified, :type => "boolean" + publish :variable => :ticket_lifetime, :type => "string" + publish :variable => :renew_lifetime, :type => "string" + publish :variable => :forwardable, :type => "string" + publish :variable => :proxiable, :type => "string" + publish :variable => :retain_after_close, :type => "string" + publish :variable => :ssh_support, :type => "boolean" + publish :variable => :minimum_uid, :type => "string" + publish :variable => :use_shmem, :type => "string" + publish :variable => :mappings, :type => "string" + publish :variable => :ignore_unknown, :type => "boolean" + publish :variable => :ssh_section, :type => "string", :private => true + publish :variable => :packages, :type => "list <string>" + publish :variable => :dns_available, :type => "boolean" + publish :variable => :dns_used, :type => "boolean" + publish :variable => :sssd, :type => "boolean" + publish :variable => :ExpertSettings, :type => "map <string, any>" + publish :variable => :OrigExpertSettings, :type => "map <string, any>", :private => true + publish :function => :Modified, :type => "boolean ()" + publish :function => :Import, :type => "boolean (map)" + publish :function => :Export, :type => "map ()" + publish :function => :ReadKrb5ConfValues, :type => "list <string> (path, string)" + publish :function => :ReadKrb5ConfValue, :type => "string (path, string)" + publish :function => :ReadFile, :type => "string (path, string)" + publish :function => :WriteKrb5ConfValues, :type => "boolean (path, list <string>)" + publish :function => :WriteKrb5ConfValuesAsString, :type => "boolean (path, string)" + publish :function => :WriteKrb5ConfValue, :type => "boolean (path, string)" + publish :function => :WriteFile, :type => "boolean (path, string)" + publish :function => :ReadSSSDValue, :type => "string (string, string)", :private => true + publish :function => :Read, :type => "boolean ()" + publish :function => :WriteSSSD, :type => "boolean ()", :private => true + publish :function => :Write, :type => "boolean ()" + publish :function => :Summary, :type => "list ()" + publish :function => :ShortSummary, :type => "string ()" + publish :function => :RequiredPackages, :type => "list <string> ()" + publish :function => :AutoPackages, :type => "map ()" + publish :function => :ValidateTimeEntries, :type => "boolean (string, string)" + end + + Kerberos = KerberosClass.new + Kerberos.main +end continue with "q"... Checked in at Tue Feb 4 15:04:23 CET 2014 by ro Remember to have fun... -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] Request 31582 changed to accepted (submit SUSE:SLE-12:GA/yast2-samba-client)
by Ruediger Oertel 04 Feb '14

04 Feb '14

Visit https://build.suse.de/request/show/31582 State of request 31582 was changed by oertel: new -> accepted Comment: Accepted submit request 31582 from user leonardocf Actions: - submit Devel:YaST:Head/yast2-samba-client => SUSE:SLE-12:GA/yast2-samba-client -- Configure notifications at https://build.suse.de/user/notifications SUSE Internal OBS Instance (https://build.suse.de/) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] [ci_new_pac] JFYI yast2-s390 -> sle12
by ro 04 Feb '14

04 Feb '14

Script 'mail_helper' called by ro Hello packager, This is just FYI. Your package was checked in in distribution "sle12" by autobuild-member: ro. Here comes the log... ---------------------------%<------------------------------ Hi, here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-s390 -> sle12 ## BNC# 853929 : "dasd not presented in initial disk configuration selection screen" (RESOLVED/FIXED) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-s390/yast2-s390.changes 2014-01-27 12:30:01.000000000 +0100 +++ /mounts/work_src_done/SLE12/yast2-s390/yast2-s390.changes 2014-01-31 17:11:16.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Jan 31 17:06:14 CET 2014 - aschnell(a)suse.de + +- fixed initialisation during installation (bnc#853929) +- 3.1.3 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-s390 (Old) and /mounts/work_src_done/SLE12/yast2-s390 (BS:build ID:31480 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-s390", Maintainer is "yast-commit(a)opensuse.org" Old: ---- yast2-s390-3.1.2.tar.bz2 New: ---- yast2-s390-3.1.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-s390.spec ++++++ --- /var/tmp/diff_new_pack.vsFn3I/_old 2014-02-04 15:03:37.000000000 +0100 +++ /var/tmp/diff_new_pack.vsFn3I/_new 2014-02-04 15:03:37.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-s390 -Version: 3.1.2 +Version: 3.1.3 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-s390-3.1.2.tar.bz2 -> yast2-s390-3.1.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-s390-3.1.2/package/yast2-s390.changes new/yast2-s390-3.1.3/package/yast2-s390.changes --- old/yast2-s390-3.1.2/package/yast2-s390.changes 2014-01-24 10:00:53.000000000 +0100 +++ new/yast2-s390-3.1.3/package/yast2-s390.changes 2014-01-31 17:20:46.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jan 31 17:06:14 CET 2014 - aschnell(a)suse.de + +- fixed initialisation during installation (bnc#853929) +- 3.1.3 + +------------------------------------------------------------------- Thu Jan 23 11:17:15 UTC 2014 - jsrain(a)suse.cz - enhanced handling of large amount of disks (fate#313402, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-s390-3.1.2/package/yast2-s390.spec new/yast2-s390-3.1.3/package/yast2-s390.spec --- old/yast2-s390-3.1.2/package/yast2-s390.spec 2014-01-24 10:00:53.000000000 +0100 +++ new/yast2-s390-3.1.3/package/yast2-s390.spec 2014-01-31 17:20:46.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-s390 -Version: 3.1.2 +Version: 3.1.3 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-s390-3.1.2/src/include/s390/dasd/wizards.rb new/yast2-s390-3.1.3/src/include/s390/dasd/wizards.rb --- old/yast2-s390-3.1.2/src/include/s390/dasd/wizards.rb 2014-01-24 10:00:53.000000000 +0100 +++ new/yast2-s390-3.1.3/src/include/s390/dasd/wizards.rb 2014-01-31 17:20:46.000000000 +0100 @@ -1,6 +1,6 @@ # encoding: utf-8 -# Copyright (c) 2012 Novell, Inc. +# Copyright (c) [2012-2014] Novell, Inc. # # All Rights Reserved. # @@ -27,25 +27,28 @@ # $Id$ module Yast module S390DasdWizardsInclude + + def initialize_s390_dasd_wizards(include_target) Yast.import "UI" textdomain "s390" Yast.import "Sequencer" Yast.import "Wizard" + Yast.import "DASDController" Yast.include include_target, "s390/dasd/dialogs.rb" end + # Whole configuration of controller # @return [Symbol] MainDASDSequence def MainDASDSequence - aliases = { "main" => lambda { DASDDialog() }, "add" => lambda do - AddDASDDiskDialog() - end, "delete" => lambda( - ) do - DeleteDASDDiskDialog() - end } + aliases = { + "main" => lambda { DASDDialog() }, + "add" => lambda { AddDASDDiskDialog() }, + "delete" => lambda() { DeleteDASDDiskDialog() } + } sequence = { "ws_start" => "main", @@ -59,6 +62,7 @@ "delete" => { :abort => :abort, :next => "main" } } + DASDController.Read() Sequencer.Run(aliases, sequence) end @@ -115,5 +119,7 @@ ret end + + end end continue with "q"... Checked in at Tue Feb 4 15:03:52 CET 2014 by ro Remember to have fun... -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] Request 31480 changed to accepted (submit SUSE:SLE-12:GA/yast2-s390)
by Ruediger Oertel 04 Feb '14

04 Feb '14

Visit https://build.suse.de/request/show/31480 State of request 31480 was changed by oertel: new -> accepted Comment: Accepted submit request 31480 from user leonardocf Actions: - submit Devel:YaST:Head/yast2-s390 => SUSE:SLE-12:GA/yast2-s390 -- Configure notifications at https://build.suse.de/user/notifications SUSE Internal OBS Instance (https://build.suse.de/) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0