August 2014 - YaST Commits - openSUSE Mailing Lists

[yast-commit] Request 43089 changed to accepted (submit SUSE:SLE-12:GA/yast2-samba-client)
by Berthold Gunreben 25 Aug '14

25 Aug '14

Visit https://build.suse.de/request/show/43089 State of request 43089 was changed by azouhr: new -> accepted Comment: Accepted submit request 43089 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-samba-client -> sle12
by bg 25 Aug '14

25 Aug '14

Script 'mail_helper' called by bg Hello packager, This is just FYI. Your package was checked in in distribution "sle12" by autobuild-member: bg. Here comes the log... ---------------------------%<------------------------------ Hi, here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-samba-client -> sle12 ## BNC# 892982 : "clustered AD domain join unconditionally sets ctdb_manages_winbind="true"" (NEW/) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-samba-client/yast2-samba-client.changes 2014-08-22 15:44:36.000000000 +0200 +++ /mounts/work_src_done/SLE12/yast2-samba-client/yast2-samba-client.changes 2014-08-25 11:48:27.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Aug 22 17:48:20 UTC 2014 - ddiss(a)suse.com + +- Support separately defined Samba resources; don't manipulate the + ctdb_manages_winbind parameter during join; (bnc#892982). +- 3.1.11 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2-samba-client - yast2-samba-server - yast2-schema ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-samba-client (Old) and /mounts/work_src_done/SLE12/yast2-samba-client (BS:build ID:43089 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-samba-client", Maintainer is "yast-commit(a)opensuse.org" Old: ---- yast2-samba-client-3.1.10.tar.bz2 New: ---- yast2-samba-client-3.1.11.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-samba-client.spec ++++++ --- /var/tmp/diff_new_pack.ywMemo/_old 2014-08-25 15:39:22.000000000 +0200 +++ /var/tmp/diff_new_pack.ywMemo/_new 2014-08-25 15:39:22.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-samba-client -Version: 3.1.10 +Version: 3.1.11 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-samba-client-3.1.10.tar.bz2 -> yast2-samba-client-3.1.11.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-3.1.10/package/yast2-samba-client.changes new/yast2-samba-client-3.1.11/package/yast2-samba-client.changes --- old/yast2-samba-client-3.1.10/package/yast2-samba-client.changes 2014-08-22 10:59:51.000000000 +0200 +++ new/yast2-samba-client-3.1.11/package/yast2-samba-client.changes 2014-08-25 11:44:34.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Aug 22 17:48:20 UTC 2014 - ddiss(a)suse.com + +- Support separately defined Samba resources; don't manipulate the + ctdb_manages_winbind parameter during join; (bnc#892982). +- 3.1.11 + +------------------------------------------------------------------- Thu Aug 21 17:12:19 UTC 2014 - ddiss(a)suse.com - Fix CTDB resource primitive path regular expression; (bnc#892975). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-3.1.10/package/yast2-samba-client.spec new/yast2-samba-client-3.1.11/package/yast2-samba-client.spec --- old/yast2-samba-client-3.1.10/package/yast2-samba-client.spec 2014-08-22 10:59:51.000000000 +0200 +++ new/yast2-samba-client-3.1.11/package/yast2-samba-client.spec 2014-08-25 11:44:34.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-samba-client -Version: 3.1.10 +Version: 3.1.11 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-3.1.10/src/modules/SambaNetJoin.pm new/yast2-samba-client-3.1.11/src/modules/SambaNetJoin.pm --- old/yast2-samba-client-3.1.10/src/modules/SambaNetJoin.pm 2014-08-22 10:59:51.000000000 +0200 +++ new/yast2-samba-client-3.1.11/src/modules/SambaNetJoin.pm 2014-08-25 11:44:34.000000000 +0200 @@ -169,11 +169,6 @@ return FALSE unless $self->ClusterPresent (0); - # 3. Run crm configure edit and search for the ctdb resource. Add the following line: - # ctdb_manages_winbind="false" - - CRMCall ("resource param $rsc_id set ctdb_manages_winbind no"); - # 4. save winbind into /etc/nsswitch.conf # 5. Restart the NSC daemon: SambaWinbind->AdjustNsswitch (TRUE, TRUE); @@ -207,16 +202,8 @@ return TRUE unless $cleanup_needed; - # 10. Change the ctdb_manages_winbind option: - - # a. Stop the ctdb resource: - CRMCall ("resource stop $rsc_id"); - - # b. Change the value from false to true: ctdb_manages_winbind="true" - CRMCall ("resource param $rsc_id set ctdb_manages_winbind yes"); - - # c. Restart the ctdb resource: - CRMCall ("resource start $rsc_id"); + # Restart the ctdb resource, winbind will also be restarted with grouping: + CRMCall ("resource restart $rsc_id"); $cleanup_needed = FALSE; continue with "q"... Checked in at Mon Aug 25 15:40:08 CEST 2014 by bg 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 43088 changed to accepted (submit SUSE:SLE-12:GA/yast2-registration)
by Berthold Gunreben 25 Aug '14

25 Aug '14

Visit https://build.suse.de/request/show/43088 State of request 43088 was changed by azouhr: new -> accepted Comment: Accepted submit request 43088 from user leonardocf Actions: - submit Devel:YaST:Head/yast2-registration => SUSE:SLE-12:GA/yast2-registration -- 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-registration -> sle12
by bg 25 Aug '14

25 Aug '14

Script 'mail_helper' called by bg Hello packager, This is just FYI. Your package was checked in in distribution "sle12" by autobuild-member: bg. Here comes the log... ---------------------------%<------------------------------ Hi, here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-registration -> sle12 ## BNC# 891891 : "Installed addons/modules/extensions not visible in AddOn yast module" (RESOLVED/FIXED) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-registration/yast2-registration.changes 2014-08-22 15:44:10.000000000 +0200 +++ /mounts/work_src_done/SLE12/yast2-registration/yast2-registration.changes 2014-08-25 11:18:46.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Aug 25 08:21:18 UTC 2014 - lslezak(a)suse.cz + +- select and install extension/module products also in installed + system (bnc#891891) +- 3.1.109 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2-registration ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-registration (Old) and /mounts/work_src_done/SLE12/yast2-registration (BS:build ID:43088 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-registration", Maintainer is "yast-commit(a)opensuse.org" Old: ---- yast2-registration-3.1.108.tar.bz2 New: ---- yast2-registration-3.1.109.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-registration.spec ++++++ --- /var/tmp/diff_new_pack.j3o76P/_old 2014-08-25 15:38:40.000000000 +0200 +++ /var/tmp/diff_new_pack.j3o76P/_new 2014-08-25 15:38:40.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-registration -Version: 3.1.108 +Version: 3.1.109 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-registration-3.1.108.tar.bz2 -> yast2-registration-3.1.109.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.108/package/yast2-registration.changes new/yast2-registration-3.1.109/package/yast2-registration.changes --- old/yast2-registration-3.1.108/package/yast2-registration.changes 2014-08-22 11:29:46.000000000 +0200 +++ new/yast2-registration-3.1.109/package/yast2-registration.changes 2014-08-25 11:14:34.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Aug 25 08:21:18 UTC 2014 - lslezak(a)suse.cz + +- select and install extension/module products also in installed + system (bnc#891891) +- 3.1.109 + +------------------------------------------------------------------- Thu Aug 21 09:41:10 UTC 2014 - lslezak(a)suse.cz - save the registration settings to autoinst.xml at the end of diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.108/package/yast2-registration.spec new/yast2-registration-3.1.109/package/yast2-registration.spec --- old/yast2-registration-3.1.108/package/yast2-registration.spec 2014-08-22 11:29:46.000000000 +0200 +++ new/yast2-registration-3.1.109/package/yast2-registration.spec 2014-08-25 11:14:34.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-registration -Version: 3.1.108 +Version: 3.1.109 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.108/src/clients/inst_scc.rb new/yast2-registration-3.1.109/src/clients/inst_scc.rb --- old/yast2-registration-3.1.108/src/clients/inst_scc.rb 2014-08-22 11:29:46.000000000 +0200 +++ new/yast2-registration-3.1.109/src/clients/inst_scc.rb 2014-08-25 11:14:34.000000000 +0200 @@ -441,6 +441,9 @@ # select repositories to use in installation (e.g. enable/disable Updates) select_repositories(product_service) if Mode.installation || Mode.update + # remember the added service + ::Registration::Storage::Cache.instance.addon_services << product_service + # move from selected to registered product.registered @selected_addons.reject!{|selected| selected.identifier == product.identifier} @@ -589,6 +592,16 @@ :next end + def pkg_manager + # during installation the products are installed together with the base + # product, run the package manager only in installed system + return :next unless Mode.normal + + ::Registration::SwMgmt.select_addon_products + + WFM.call("sw_single") + end + # UI workflow definition def start_workflow aliases = { @@ -599,7 +612,8 @@ "update" => [ lambda { update_registration() }, true ], "addon_eula" => lambda { addon_eula() }, "register_addons" => lambda { register_addons() }, - "update_autoyast_config" => lambda { update_autoyast_config() } + "update_autoyast_config" => lambda { update_autoyast_config() }, + "pkg_manager" => lambda { pkg_manager() } } sequence = { @@ -639,6 +653,11 @@ :next => "update_autoyast_config" }, "update_autoyast_config" => { + :abort => :abort, + :next => "pkg_manager" + }, + "pkg_manager" => { + :abort => :abort, :next => :next } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.108/src/lib/registration/storage.rb new/yast2-registration-3.1.109/src/lib/registration/storage.rb --- old/yast2-registration-3.1.108/src/lib/registration/storage.rb 2014-08-22 11:29:47.000000000 +0200 +++ new/yast2-registration-3.1.109/src/lib/registration/storage.rb 2014-08-25 11:14:34.000000000 +0200 @@ -50,13 +50,13 @@ end end - class Cache < Struct.new(:available_addons, :first_run, :registered_addons, + class Cache < Struct.new(:available_addons, :first_run, :addon_services, :reg_url, :reg_url_cached) include Singleton def initialize - self.registered_addons = [] + self.addon_services = [] self.first_run = true end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.108/src/lib/registration/sw_mgmt.rb new/yast2-registration-3.1.109/src/lib/registration/sw_mgmt.rb --- old/yast2-registration-3.1.108/src/lib/registration/sw_mgmt.rb 2014-08-22 11:29:47.000000000 +0200 +++ new/yast2-registration-3.1.109/src/lib/registration/sw_mgmt.rb 2014-08-25 11:14:34.000000000 +0200 @@ -348,6 +348,32 @@ end end + # select products for new added extensions/modules + def self.select_addon_products + addon_services = ::Registration::Storage::Cache.instance.addon_services + log.info "New addon services: #{addon_services}" + + new_repos = addon_services.reduce([]) do |acc, service| + acc.concat(::Registration::SwMgmt.service_repos(service)) + end + + return if new_repos.empty? + + products = Pkg.ResolvableProperties("", :product, "") + products.select! do |product| + product["status"] == :available && + new_repos.any?{|new_repo| product["source"] == new_repo["SrcId"]} + end + products.map!{|product| product["name"]} + + log.info "Products to install: #{products}" + + products.each do |product| + Pkg.ResolvableInstall(product, :product) + end + end + + private_class_method :each_repo end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.108/test/fixtures/legacy_module_repositories.yml new/yast2-registration-3.1.109/test/fixtures/legacy_module_repositories.yml --- old/yast2-registration-3.1.108/test/fixtures/legacy_module_repositories.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-registration-3.1.109/test/fixtures/legacy_module_repositories.yml 2014-08-25 11:14:34.000000000 +0200 @@ -0,0 +1,16 @@ +--- +- alias: Legacy_Module_12_x86_64:SLE-MODULE-LEGACY12-Pool + autorefresh: false + base_urls: + - https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-module-lega… + enabled: true + is_update_repo: false + keeppackages: false + mirror_list: '' + name: SLE-MODULE-LEGACY12-Pool + priority: 99 + product_dir: '' + service: Legacy_Module_12_x86_64 + type: YUM + url: https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-module-lega… + SrcId: 5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.108/test/fixtures/legacy_module_services.yml new/yast2-registration-3.1.109/test/fixtures/legacy_module_services.yml --- old/yast2-registration-3.1.108/test/fixtures/legacy_module_services.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-registration-3.1.109/test/fixtures/legacy_module_services.yml 2014-08-25 11:14:34.000000000 +0200 @@ -0,0 +1,41 @@ +--- +- !ruby/object:SUSE::Connect::Remote::Service + table: + :id: 1140 + :name: Legacy_Module_12_x86_64 + :url: https://scc.suse.com/access/services/1140?credentials=Legacy_Module_12_x86_… + :product: !ruby/object:SUSE::Connect::Remote::Product + table: + :id: 1150 + :name: Legacy Module + :identifier: sle-module-legacy + :former_identifier: sle-module-legacy + :version: '12' + :release_type: + :arch: x86_64 + :friendly_name: Legacy Module 12 x86_64 + :product_class: + :cpe: cpe:/o:suse:sle-module-legacy:12.0 + :free: true + :description: " The Legacy Module supports your migration from SUSE Linux + Enterprise 10 and 11 and other systems to SUSE Linux Enterprise 12, by providing + packages which are discontinued on SUSE Linux Enterprise Server, but which + you may rely on, such as: CyrusIMAP, BSD like ftp client, sendmail, IBM + Java6. Access to the Legacy Module is included in your SUSE Linux + Enterprise Server subscription. The module has a different lifecycle than + SUSE Linux Enterprise Server itself; please check the Release Notes for + further details. " + :eula_url: https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-module-lega… + :enabled_repositories: + - 1491 + :extensions: [] + :repositories: + - id: 1491 + name: SLE-MODULE-LEGACY12-Pool + distro_target: sle-12-x86_64 + description: SLE-MODULE-LEGACY12-Pool for sle-12-x86_64 + url: https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-module-lega… + enabled: true + autorefresh: false + modifiable: true + modifiable: true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.108/test/fixtures/products_legacy_installation.yml new/yast2-registration-3.1.109/test/fixtures/products_legacy_installation.yml --- old/yast2-registration-3.1.108/test/fixtures/products_legacy_installation.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-registration-3.1.109/test/fixtures/products_legacy_installation.yml 2014-08-25 11:14:34.000000000 +0200 @@ -0,0 +1,108 @@ +--- +- arch: x86_64 + category: addon + description: "\n The Legacy Module supports your migration from SUSE Linux + Enterprise 10\n and 11 and other systems to SUSE Linux Enterprise 12, by + providing\n packages which are discontinued on SUSE Linux Enterprise Server, + but\n which you may rely on, such as: CyrusIMAP, BSD like ftp client, sendmail,\n + \ IBM Java6.\n\t\n\t\n Access to the Legacy Module is included + in your SUSE Linux Enterprise\n Server subscription. The module has a different + lifecycle than SUSE Linux\n Enterprise Server itself; please check the Release + Notes for further\n details.\n\t" + display_name: Legacy Module + download_size: 0 + eol: 1420070400 + flags: [] + flavor: POOL + inst_size: 0 + locked: false + medium_nr: 0 + name: sle-module-legacy + product_file: sle-module-legacy.prod + product_package: sle-module-legacy-release + register_release: '' + register_target: sle-12-x86_64 + relnotes_url: '' + short_name: Legacy-module + source: 5 + status: :available + summary: Legacy Module + transact_by: :solver + type: addon + update_urls: [] + vendor: SUSE LLC <https://www.suse.com/> + version: 12-0 +- arch: x86_64 + category: base + description: |- + SUSE Linux Enterprise offers a comprehensive + suite of products built on a single code base. + The platform addresses business needs from + the smallest thin-client devices to the world's + most powerful high-performance computing + and mainframe servers. SUSE Linux Enterprise + offers common management tools and technology + certifications across the platform, and + each product is enterprise-class. + display_name: SUSE Linux Enterprise Server 12 + download_size: 0 + eol: 1420070400 + flags: [] + flavor: DVD + inst_size: 0 + locked: false + medium_nr: 0 + name: SLES + product_file: "/etc/products.d/SLES.prod" + register_release: '' + register_target: sle-12-x86_64 + relnotes_url: https://www.suse.com/releasenotes/x86_64/SUSE-SLES/12/release-notes-sles.rpm + relnotes_urls: + - https://www.suse.com/releasenotes/x86_64/SUSE-SLES/12/release-notes-sles.rpm + short_name: SLES12 + source: -1 + status: :installed + summary: SUSE Linux Enterprise Server 12 + transact_by: :solver + type: base + update_urls: [] + upgrades: [] + vendor: SUSE + version: 12-0 +- arch: x86_64 + category: addon + description: |- + SUSE Linux Enterprise offers a comprehensive + suite of products built on a single code base. + The platform addresses business needs from + the smallest thin-client devices to the world's + most powerful high-performance computing + and mainframe servers. SUSE Linux Enterprise + offers common management tools and technology + certifications across the platform, and + each product is enterprise-class. + display_name: SUSE Linux Enterprise Server 12 (RC2) + download_size: 0 + eol: 1420070400 + flags: [] + flavor: DVD + inst_size: 0 + locked: false + medium_nr: 0 + name: SLES + product_file: SLES.prod + product_package: sles-release + register_release: '' + register_target: sle-12-x86_64 + relnotes_url: https://www.suse.com/releasenotes/x86_64/SUSE-SLES/12/release-notes-sles.rpm + relnotes_urls: + - https://www.suse.com/releasenotes/x86_64/SUSE-SLES/12/release-notes-sles.rpm + short_name: SLES12 + source: 3 + status: :available + summary: SUSE Linux Enterprise Server 12 (RC2) + transact_by: :solver + type: addon + update_urls: [] + vendor: SUSE LLC <https://www.suse.com/> + version: 12-0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.108/test/sw_mgmt_spec.rb new/yast2-registration-3.1.109/test/sw_mgmt_spec.rb --- old/yast2-registration-3.1.108/test/sw_mgmt_spec.rb 2014-08-22 11:29:47.000000000 +0200 +++ new/yast2-registration-3.1.109/test/sw_mgmt_spec.rb 2014-08-25 11:14:35.000000000 +0200 @@ -4,6 +4,7 @@ require_relative "yast_stubs" require "suse/connect" +require "yaml" describe "Registration::SwMgmt" do let(:yast_pkg) { double("Yast::Pkg") } @@ -190,4 +191,20 @@ end end + describe ".select_addon_products" do + it "selects new addon products for installation" do + legacy_services = YAML.load_file(fixtures_file("legacy_module_services.yml")) + + expect(::Registration::Storage::Cache).to receive(:instance). + and_return(double("addon_services" => legacy_services)) + expect(::Registration::SwMgmt).to receive(:service_repos).with(legacy_services.first). + and_return(YAML.load_file(fixtures_file("legacy_module_repositories.yml"))) + expect(yast_pkg).to receive(:ResolvableProperties). + and_return(YAML.load_file(fixtures_file("products_legacy_installation.yml"))) + expect(yast_pkg).to receive(:ResolvableInstall).with("sle-module-legacy", :product) + + Registration::SwMgmt.select_addon_products + end + end + end continue with "q"... Checked in at Mon Aug 25 15:39:11 CEST 2014 by bg 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 43064 changed to accepted (submit SUSE:SLE-12:GA/yast2-network)
by Berthold Gunreben 25 Aug '14

25 Aug '14

Visit https://build.suse.de/request/show/43064 State of request 43064 was changed by azouhr: new -> accepted Comment: Accepted submit request 43064 from user leonardocf Actions: - submit Devel:YaST:Head/yast2-network => SUSE:SLE-12:GA/yast2-network -- 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-network -> sle12
by bg 25 Aug '14

25 Aug '14

Script 'mail_helper' called by bg Hello packager, This is just FYI. Your package was checked in in distribution "sle12" by autobuild-member: bg. Here comes the log... ---------------------------%<------------------------------ Hi, here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-network -> sle12 ## BNC# 893126 : "Default FW/SSHD config + Minimal SW selection = No SSHD installed and running" (RESOLVED/FIXED) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-network/yast2-network.changes 2014-08-21 15:10:35.000000000 +0200 +++ /mounts/work_src_done/SLE12/yast2-network/yast2-network.changes 2014-08-22 17:10:00.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Aug 22 16:43:24 CEST 2014 - locilka(a)suse.com + +- Fixed requesting sshd/firewall packages in case of the default + configuration together with minimal installation (bnc#893126) +- 3.1.86 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2-network - at least 15 other packages ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-network (Old) and /mounts/work_src_done/SLE12/yast2-network (BS:build ID:43064 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-network", Maintainer is "yast-commit(a)opensuse.org" Old: ---- yast2-network-3.1.85.tar.bz2 New: ---- yast2-network-3.1.86.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-network.spec ++++++ --- /var/tmp/diff_new_pack.KzukUG/_old 2014-08-25 15:38:02.000000000 +0200 +++ /var/tmp/diff_new_pack.KzukUG/_new 2014-08-25 15:38:02.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-network -Version: 3.1.85 +Version: 3.1.86 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-network-3.1.85.tar.bz2 -> yast2-network-3.1.86.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.85/package/yast2-network.changes new/yast2-network-3.1.86/package/yast2-network.changes --- old/yast2-network-3.1.85/package/yast2-network.changes 2014-08-21 14:24:45.000000000 +0200 +++ new/yast2-network-3.1.86/package/yast2-network.changes 2014-08-22 17:04:36.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Aug 22 16:43:24 CEST 2014 - locilka(a)suse.com + +- Fixed requesting sshd/firewall packages in case of the default + configuration together with minimal installation (bnc#893126) +- 3.1.86 + +------------------------------------------------------------------- Thu Aug 21 14:20:20 CEST 2014 - locilka(a)suse.com - Fixed firewall proposal in case of VNC installation: using diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.85/package/yast2-network.spec new/yast2-network-3.1.86/package/yast2-network.spec --- old/yast2-network-3.1.85/package/yast2-network.spec 2014-08-21 14:24:45.000000000 +0200 +++ new/yast2-network-3.1.86/package/yast2-network.spec 2014-08-22 17:04:36.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-network -Version: 3.1.85 +Version: 3.1.86 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.85/src/clients/firewall_stage1_proposal.rb new/yast2-network-3.1.86/src/clients/firewall_stage1_proposal.rb --- old/yast2-network-3.1.85/src/clients/firewall_stage1_proposal.rb 2014-08-21 14:24:45.000000000 +0200 +++ new/yast2-network-3.1.86/src/clients/firewall_stage1_proposal.rb 2014-08-22 17:04:36.000000000 +0200 @@ -42,6 +42,13 @@ LINK_DISABLE_VNC = "firewall--disable_vnc_in_proposal" LINK_FIREWALL_DIALOG = "firewall_stage1" + module ID + SSH_PORT = "open_ssh_port" + VNC_PORT = "open_vnc_port" + ENABLE_FW = "enable_fw" + ENABLE_SSHD = "enable_sshd" + end + include Yast::Logger def main @@ -58,15 +65,18 @@ Yast.import "SuSEFirewallProposal" Yast.import "Wizard" - @func = Convert.to_string(WFM.Args(0)) - @param = Convert.to_map(WFM.Args(1)) - @ret = {} + script_command = WFM.Args(0) + params = WFM.Args(1) || {} + script_return = {} - if @func == "MakeProposal" + case script_command + when "MakeProposal" # Don't override users settings SuSEFirewall4Network.prepare_proposal unless SuSEFirewallProposal.GetChangedByUser - @ret = { + adjust_configuration + + script_return = { "preformatted_proposal" => preformatted_proposal, "warning_level" => :warning, "links" => [ @@ -80,66 +90,62 @@ LINK_DISABLE_VNC ] } + when "AskUser" + chosen_link = params["chosen_id"] + result = :next + log.info "User clicked #{chosen_link}" - adjust_configuration - elsif @func == "AskUser" - @chosen_link = Ops.get(@param, "chosen_id") - @result = :next - Builtins.y2milestone("User clicked %1", @chosen_link) - - case @chosen_link + case chosen_link when LINK_ENABLE_FIREWALL - Builtins.y2milestone("Enabling FW") + log.info "Enabling FW" SuSEFirewall4Network.SetEnabled1stStage(true) - PackagesProposal.AddResolvables(PROPOSAL_ID, :package, [SuSEFirewall.FIREWALL_PACKAGE]) when LINK_DISABLE_FIREWALL - Builtins.y2milestone("Disabling FW") + log.info "Disabling FW" SuSEFirewall4Network.SetEnabled1stStage(false) - PackagesProposal.RemoveResolvables(PROPOSAL_ID, :package, [SuSEFirewall.FIREWALL_PACKAGE]) when LINK_OPEN_SSH_PORT - Builtins.y2milestone("Opening SSH port") + log.info "Opening SSH port" SuSEFirewall4Network.SetSshEnabled1stStage(true) when LINK_BLOCK_SSH_PORT - Builtins.y2milestone("Blocking SSH port") + log.info "Blocking SSH port" SuSEFirewall4Network.SetSshEnabled1stStage(false) when LINK_ENABLE_SSHD - Builtins.y2milestone("Enabling SSHD") - PackagesProposal.AddResolvables(PROPOSAL_ID, :package, ["openssh"]) + log.info "Enabling SSHD" SuSEFirewall4Network.SetSshdEnabled(true) when LINK_DISABLE_SSHD - Builtins.y2milestone("Disabling SSHD") + log.info "Disabling SSHD" SuSEFirewall4Network.SetSshdEnabled(false) - PackagesProposal.RemoveResolvables(PROPOSAL_ID, :package, ["openssh"]) when LINK_ENABLE_VNC - Builtins.y2milestone("Enabling VNC") + log.info "Enabling VNC" SuSEFirewall4Network.SetVncEnabled1stStage(true) when LINK_DISABLE_VNC - Builtins.y2milestone("Disabling VNC") + log.info "Disabling VNC" SuSEFirewall4Network.SetVncEnabled1stStage(false) when LINK_FIREWALL_DIALOG - @result = FirewallDialogSimple() + result = FirewallDialogSimple() else raise "INTERNAL ERROR: unknown action '#{@chosen_link}' for proposal client" end SuSEFirewallProposal.SetChangedByUser(true) - @ret = { "workflow_sequence" => @result } - adjust_configuration - elsif @func == "Description" - @ret = { + + script_return = { "workflow_sequence" => result } + when "Description" + script_return = { # Proposal title "rich_text_title" => _("Firewall and SSH"), # Menu entry label "menu_title" => _("&Firewall and SSH"), "id" => LINK_FIREWALL_DIALOG } - elsif @func == "Write" - @ret = { "success" => true } + when "Write" + script_return = { "success" => true } + else + log.error "Unknown command #{script_command}" end - deep_copy(@ret) + deep_copy(script_return) end def FirewallDialogSimple @@ -147,7 +153,7 @@ vnc_support = Left( CheckBox( - Id("open_vnc_port"), + Id(ID::VNC_PORT), # TRANSLATORS: check-box label _("Open &VNC Ports"), SuSEFirewall4Network.EnabledVnc1stStage @@ -165,7 +171,7 @@ VBox( Left( CheckBox( - Id("enable_fw"), + Id(ID::ENABLE_FW), Opt(:notify), # TRANSLATORS: check-box label _("Enable Firewall"), @@ -174,7 +180,7 @@ ), Left( CheckBox( - Id("open_ssh_port"), + Id(ID::SSH_PORT), # TRANSLATORS: check-box label _("Open SSH Port"), SuSEFirewall4Network.EnabledSsh1stStage @@ -182,7 +188,7 @@ ), Left( CheckBox( - Id("enable_sshd"), + Id(ID::ENABLE_SSHD), # TRANSLATORS: check-box label _("Enable SSH Service"), SuSEFirewall4Network.EnabledSshd @@ -233,12 +239,12 @@ Wizard.HideBackButton UI.ChangeWidget( - Id("open_ssh_port"), + Id(ID::SSH_PORT), :Enabled, SuSEFirewall4Network.Enabled1stStage ) UI.ChangeWidget( - Id("open_vnc_port"), + Id(ID::VNC_PORT), :Enabled, SuSEFirewall4Network.Enabled1stStage ) @@ -247,21 +253,15 @@ while true dialog_ret = UI.UserInput - enable_firewall = Convert.to_boolean( - UI.QueryWidget(Id("enable_fw"), :Value) - ) + enable_firewall = UI.QueryWidget(Id(ID::ENABLE_FW), :Value) - if dialog_ret == "enable_fw" - UI.ChangeWidget(Id("open_ssh_port"), :Enabled, enable_firewall) - UI.ChangeWidget(Id("open_vnc_port"), :Enabled, enable_firewall) + if dialog_ret == ID::ENABLE_FW + UI.ChangeWidget(Id(ID::SSH_PORT), :Enabled, enable_firewall) + UI.ChangeWidget(Id(ID::VNC_PORT), :Enabled, enable_firewall) next elsif dialog_ret == :next || dialog_ret == :ok - open_ssh_port = Convert.to_boolean( - UI.QueryWidget(Id("open_ssh_port"), :Value) - ) - open_vnc_port = Convert.to_boolean( - UI.QueryWidget(Id("open_vnc_port"), :Value) - ) + open_ssh_port = UI.QueryWidget(Id(ID::SSH_PORT), :Value) + open_vnc_port = UI.QueryWidget(Id(ID::VNC_PORT), :Value) SuSEFirewall4Network.SetEnabled1stStage(enable_firewall) @@ -271,7 +271,7 @@ end SuSEFirewall4Network.SetSshdEnabled( - UI::QueryWidget(Id("enable_sshd"), :Value) + UI::QueryWidget(Id(ID::ENABLE_SSHD), :Value) ) end @@ -340,11 +340,13 @@ # to AutoYast profile. def adjust_configuration enable_fw = SuSEFirewall4Network.Enabled1stStage + enable_sshd = SuSEFirewall4Network.EnabledSshd open_ssh_port = SuSEFirewall4Network.EnabledSsh1stStage open_vnc_port = SuSEFirewall4Network.EnabledVnc1stStage log.info "After installation, firewall will be #{enable_fw ? 'enabled':'disabled'}, " << - "SSH port will be #{open_ssh_port ? 'open':'closed'} " << + "SSHD will be #{enable_sshd ? 'enabled':'disabled'}, " << + "SSH port will be #{open_ssh_port ? 'open':'closed'}, " << "VNC port will be #{open_vnc_port ? 'open':'closed'}" # Read the configuration from sysconfig @@ -356,24 +358,35 @@ SuSEFirewall.SetEnableService(enable_fw) SuSEFirewall.SetStartService(enable_fw) - # only if we have openssh package - proposal takes care - # it gets installed if the user wants to open ssh port - if open_ssh_port - SuSEFirewall.SetServicesForZones( - ["service:sshd"], - SuSEFirewall.GetKnownFirewallZones, - true - ) + # Request needed packages to be installed + # bnc#893126 + if enable_fw + PackagesProposal.AddResolvables(PROPOSAL_ID, :package, [SuSEFirewall.FIREWALL_PACKAGE]) + else + PackagesProposal.RemoveResolvables(PROPOSAL_ID, :package, [SuSEFirewall.FIREWALL_PACKAGE]) end - if open_vnc_port - SuSEFirewall.SetServicesForZones( - ["service:vnc-httpd", "service:vnc-server"], - SuSEFirewall.GetKnownFirewallZones, - true - ) + if enable_sshd + PackagesProposal.AddResolvables(PROPOSAL_ID, :package, [SuSEFirewall4NetworkClass::SSH_PACKAGE]) + else + PackagesProposal.RemoveResolvables(PROPOSAL_ID, :package, [SuSEFirewall4NetworkClass::SSH_PACKAGE]) end + # Open or close FW ports depending on user decision + # This can raise an exception if requested service-files are not part of the current system + # For that reason, these files have to be part of the inst-sys + SuSEFirewall.SetServicesForZones( + SuSEFirewall4NetworkClass::SSH_SERVICES, + SuSEFirewall.GetKnownFirewallZones, + open_ssh_port + ) + + SuSEFirewall.SetServicesForZones( + SuSEFirewall4NetworkClass::VNC_SERVICES, + SuSEFirewall.GetKnownFirewallZones, + open_vnc_port + ) + # Writing the configuration including adjusting services # is done in firewall_stage1_finish end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.85/src/modules/SuSEFirewall4Network.rb new/yast2-network-3.1.86/src/modules/SuSEFirewall4Network.rb --- old/yast2-network-3.1.85/src/modules/SuSEFirewall4Network.rb 2014-08-21 14:24:45.000000000 +0200 +++ new/yast2-network-3.1.86/src/modules/SuSEFirewall4Network.rb 2014-08-22 17:04:37.000000000 +0200 @@ -38,6 +38,10 @@ include Yast::Logger + SSH_PACKAGE = "openssh" + SSH_SERVICES = ["service:sshd"] + VNC_SERVICES = ["service:vnc-httpd", "service:vnc-server"] + def main textdomain "network" continue with "q"... Checked in at Mon Aug 25 15:38:29 CEST 2014 by bg 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 43082 changed to accepted (submit SUSE:SLE-12:GA/yast2-installation)
by Berthold Gunreben 25 Aug '14

25 Aug '14

Visit https://build.suse.de/request/show/43082 State of request 43082 was changed by azouhr: new -> accepted Comment: Accepted submit request 43082 from user licensedigger Actions: - submit Devel:YaST:Head/yast2-installation => SUSE:SLE-12:GA/yast2-installation -- 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-installation -> sle12
by bg 25 Aug '14

25 Aug '14

Script 'mail_helper' called by bg Hello packager, This is just FYI. Your package was checked in in distribution "sle12" by autobuild-member: bg. Here comes the log... ---------------------------%<------------------------------ Hi, here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-installation -> sle12 ## BNC# 886464 : "FATE313149: in autoinst.xml "minimal-configuration" does not at all work (causes corruption of data)" (RESOLVED/FIXED) ## BNC# 892091 : "AutoYaST runs 2nd stage unconditionally" (NEW/) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-installation/yast2-installation.changes 2014-08-18 16:26:57.000000000 +0200 +++ /mounts/work_src_done/SLE12/yast2-installation/yast2-installation.changes 2014-08-25 10:36:24.000000000 +0200 @@ -1,0 +2,11 @@ +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 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2-installation - at least 19 other packages ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-installation (Old) and /mounts/work_src_done/SLE12/yast2-installation (BS:build ID:43082 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-installation", Maintainer is "yast-commit(a)opensuse.org" Old: ---- yast2-installation-3.1.109.tar.bz2 New: ---- yast2-installation-3.1.110.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.EFtypT/_old 2014-08-25 15:37:29.000000000 +0200 +++ /var/tmp/diff_new_pack.EFtypT/_new 2014-08-25 15:37:29.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 3.1.109 +Version: 3.1.110 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-installation-3.1.109.tar.bz2 -> yast2-installation-3.1.110.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.110/package/yast2-installation.changes --- old/yast2-installation-3.1.109/package/yast2-installation.changes 2014-08-18 15:49:49.000000000 +0200 +++ new/yast2-installation-3.1.110/package/yast2-installation.changes 2014-08-25 10:29:33.000000000 +0200 @@ -1,4 +1,15 @@ ------------------------------------------------------------------- +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.110/package/yast2-installation.spec --- old/yast2-installation-3.1.109/package/yast2-installation.spec 2014-08-18 15:49:49.000000000 +0200 +++ new/yast2-installation-3.1.110/package/yast2-installation.spec 2014-08-25 10:29:33.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 3.1.109 +Version: 3.1.110 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.110/src/clients/desktop_finish.rb --- old/yast2-installation-3.1.109/src/clients/desktop_finish.rb 2014-08-18 15:49:49.000000000 +0200 +++ new/yast2-installation-3.1.110/src/clients/desktop_finish.rb 2014-08-25 10:29:33.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_finish.rb new/yast2-installation-3.1.110/src/clients/inst_finish.rb --- old/yast2-installation-3.1.109/src/clients/inst_finish.rb 2014-08-18 15:49:49.000000000 +0200 +++ new/yast2-installation-3.1.110/src/clients/inst_finish.rb 2014-08-25 10:29:33.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/save_hw_status_finish.rb new/yast2-installation-3.1.110/src/clients/save_hw_status_finish.rb --- old/yast2-installation-3.1.109/src/clients/save_hw_status_finish.rb 2014-08-18 15:49:49.000000000 +0200 +++ new/yast2-installation-3.1.110/src/clients/save_hw_status_finish.rb 2014-08-25 10:29:36.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.110/src/include/installation/inst_inc_first.rb --- old/yast2-installation-3.1.109/src/include/installation/inst_inc_first.rb 2014-08-18 15:49:49.000000000 +0200 +++ new/yast2-installation-3.1.110/src/include/installation/inst_inc_first.rb 2014-08-25 10:29:36.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,34 @@ 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) continue with "q"... Checked in at Mon Aug 25 15:37:50 CEST 2014 by bg 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-ftp-server -> sle12
by bg 25 Aug '14

25 Aug '14

Script 'mail_helper' called by bg Hello packager, This is just FYI. Your package was checked in in distribution "sle12" by autobuild-member: bg. Here comes the log... ---------------------------%<------------------------------ Hi, here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-ftp-server -> sle12 ## BNC# 888287 : "yast2 ftp-server sets syslog_enable=NO by default" (ASSIGNED/) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-ftp-server/yast2-ftp-server.changes 2014-07-30 14:48:57.000000000 +0200 +++ /mounts/work_src_done/SLE12/yast2-ftp-server/yast2-ftp-server.changes 2014-08-22 16:34:53.000000000 +0200 @@ -1,0 +2,12 @@ +Wed Aug 20 09:25:51 UTC 2014 - cwh(a)suse.com + +- Using different defaults about logging for vsftpd/pure-ftpd (bnc#888287) +- Setting xferlog_enable = YES instead of syslog_enable +- 3.1.3 + +------------------------------------------------------------------- +Fri Aug 1 12:51:37 UTC 2014 - mvidner(a)suse.com + +- Enabled YARD docs, documented the basics of FtpServer. + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2-ftp-server - yast2-schema ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-ftp-server (Old) and /mounts/work_src_done/SLE12/yast2-ftp-server (BS:build ID:43062 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-ftp-server", Maintainer is "yast-commit(a)opensuse.org" Old: ---- yast2-ftp-server-3.1.2.tar.bz2 New: ---- yast2-ftp-server-3.1.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ftp-server.spec ++++++ --- /var/tmp/diff_new_pack.M86W4x/_old 2014-08-25 15:36:32.000000000 +0200 +++ /var/tmp/diff_new_pack.M86W4x/_new 2014-08-25 15:36:32.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-ftp-server -Version: 3.1.2 +Version: 3.1.3 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-ftp-server-3.1.2.tar.bz2 -> yast2-ftp-server-3.1.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ftp-server-3.1.2/package/yast2-ftp-server.changes new/yast2-ftp-server-3.1.3/package/yast2-ftp-server.changes --- old/yast2-ftp-server-3.1.2/package/yast2-ftp-server.changes 2014-07-30 11:24:53.000000000 +0200 +++ new/yast2-ftp-server-3.1.3/package/yast2-ftp-server.changes 2014-08-22 16:31:01.000000000 +0200 @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Wed Aug 20 09:25:51 UTC 2014 - cwh(a)suse.com + +- Using different defaults about logging for vsftpd/pure-ftpd (bnc#888287) +- Setting xferlog_enable = YES instead of syslog_enable +- 3.1.3 + +------------------------------------------------------------------- +Fri Aug 1 12:51:37 UTC 2014 - mvidner(a)suse.com + +- Enabled YARD docs, documented the basics of FtpServer. + +------------------------------------------------------------------- Wed Jul 30 09:35:28 CEST 2014 - schubi(a)suse.de - Taking vsftpd ftp-server default in autoyast configuration module diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ftp-server-3.1.2/package/yast2-ftp-server.spec new/yast2-ftp-server-3.1.3/package/yast2-ftp-server.spec --- old/yast2-ftp-server-3.1.2/package/yast2-ftp-server.spec 2014-07-30 11:24:53.000000000 +0200 +++ new/yast2-ftp-server-3.1.3/package/yast2-ftp-server.spec 2014-08-22 16:31:01.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-ftp-server -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-ftp-server-3.1.2/src/include/ftp-server/complex.rb new/yast2-ftp-server-3.1.3/src/include/ftp-server/complex.rb --- old/yast2-ftp-server-3.1.2/src/include/ftp-server/complex.rb 2014-07-30 11:24:53.000000000 +0200 +++ new/yast2-ftp-server-3.1.3/src/include/ftp-server/complex.rb 2014-08-22 16:31:01.000000000 +0200 @@ -254,7 +254,6 @@ # @return `abort if aborted and `next otherwise def ReadDialog Wizard.RestoreHelp(Ops.get_string(@HELPS, "read", "")) - # FtpServer::AbortFunction = PollAbort; result = ReadFTPService() return :abort if !result return :abort if !Confirm.MustBeRoot @@ -272,7 +271,6 @@ # @return `abort if aborted and `next otherwise def WriteDialog Wizard.RestoreHelp(Ops.get_string(@HELPS, "write", "")) - # FtpServer::AbortFunction = PollAbort; ret = FtpServer.Write ret ? :next : :abort end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ftp-server-3.1.2/src/include/ftp-server/write_load.rb new/yast2-ftp-server-3.1.3/src/include/ftp-server/write_load.rb --- old/yast2-ftp-server-3.1.2/src/include/ftp-server/write_load.rb 2014-07-30 11:24:53.000000000 +0200 +++ new/yast2-ftp-server-3.1.3/src/include/ftp-server/write_load.rb 2014-08-22 16:31:01.000000000 +0200 @@ -471,11 +471,20 @@ port_range != nil ? Builtins.splitstring(port_range, ":") : nil end - # Function return init value for UI widgets - # and prepare internal data structure for writing - # to config file - # Example: ValueUI("ChrootEnabled") => "yes"/"no" - + # Convert between the UI (yast), and system (vsftpd, pure_ftpd) settings. + # + # The system settings are multiplexed by + # {FtpServerClass#vsftpd_edit vsftpd_edit}: + # {FtpServerClass#VS_SETTINGS VS_SETTINGS} (for vsftpd_edit == true) or + # {FtpServerClass#PURE_SETTINGS PURE_SETTINGS} (for vsftpd_edit == false). + # + # @param [String] key + # in the {FtpServerClass#EDIT_SETTINGS EDIT_SETTINGS} vocabulary + # @param write + # - true: write to system settings from UI settings + # ({FtpServerClass#EDIT_SETTINGS EDIT_SETTINGS}) + # - false: read the UI settings from the system settings + # @return [String] the UI value (for read) or nil (for write) def ValueUI(key, write) ports = [] authentic = 0 @@ -510,32 +519,16 @@ when "VerboseLogging" if @vsftpd_edit if write - Ops.set( - @VS_SETTINGS, - "log_ftp_protocol", - Ops.get(@EDIT_SETTINGS, "VerboseLogging") - ) - Ops.set( - @VS_SETTINGS, - "syslog_enable", - Ops.get(@EDIT_SETTINGS, "VerboseLogging") - ) + @VS_SETTINGS["log_ftp_protocol"] = @EDIT_SETTINGS["VerboseLogging"] + @VS_SETTINGS["xferlog_enable"] = @EDIT_SETTINGS["VerboseLogging"] else - return Builtins.haskey(@VS_SETTINGS, "log_ftp_protocol") ? - Builtins.toupper(Ops.get(@VS_SETTINGS, "log_ftp_protocol")) : - Ops.get(@DEFAULT_CONFIG, "VerboseLogging") + return (@VS_SETTINGS["log_ftp_protocol"] || @DEFAULT_CONFIG["log_ftp_protocol"]).upcase end else if write - Ops.set( - @PURE_SETTINGS, - "VerboseLog", - Ops.get(@EDIT_SETTINGS, "VerboseLogging") - ) + @PURE_SETTINGS["VerboseLog"] = @EDIT_SETTINGS["VerboseLogging"] else - return Builtins.haskey(@PURE_SETTINGS, "VerboseLog") ? - Builtins.toupper(Ops.get(@PURE_SETTINGS, "VerboseLog")) : - Ops.get(@DEFAULT_CONFIG, "VerboseLogging") + return (@PURE_SETTINGS["VerboseLog"] || @DEFAULT_CONFIG["VerboseLogging"]).upcase end end when "FtpDirLocal" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ftp-server-3.1.2/src/modules/FtpServer.rb new/yast2-ftp-server-3.1.3/src/modules/FtpServer.rb --- old/yast2-ftp-server-3.1.2/src/modules/FtpServer.rb 2014-07-30 11:24:53.000000000 +0200 +++ new/yast2-ftp-server-3.1.3/src/modules/FtpServer.rb 2014-08-22 16:31:01.000000000 +0200 @@ -1,17 +1,20 @@ # encoding: utf-8 -# File: modules/FtpServer.ycp -# Package: Configuration of FtpServer -# Summary: FtpServer settings, input and output functions -# Authors: Jozef Uhliarik <juhliarik(a)suse.cz> -# -# $Id: FtpServer.ycp 27914 2006-02-13 14:32:08Z juhliarik $ -# -# Representation of the configuration of FtpServer. -# Input and output routines. require "yast" module Yast + # Configure **both** [vsftpd][v] and [pure-ftpd][p] in a single class. + # + # [v]: https://security.appspot.com/vsftpd.html + # [p]: http://www.pureftpd.org/ + # + # For the configuration we have 3 vocabularies, + # mapped by {FtpServerWriteLoadInclude#ValueUI}. + # + # - pure-ftpd uses CamelCase keys + # - vsftpd uses snake_case keys + # - yast uses CamelCase keys which are almost(!!1!) + # the same as for pure-ftpd. class FtpServerClass < Module def main Yast.import "UI" @@ -155,11 +158,6 @@ @pure_ftpd_xinet_conf = [] - - # list of keys from map DEFAULT_CONFIG - # - # global list <string> - @UI_keys = [ "ChrootEnable", "VerboseLogging", @@ -194,13 +192,10 @@ "EnableUpload" ] - # map of deafult values for options in UI - # - # global map <string, string > - @DEFAULT_CONFIG = { "ChrootEnable" => "NO", - "VerboseLogging" => "NO", + "VerboseLogging" => "NO", # Default value for pure-ftpd. + "log_ftp_protocol" => "YES", # Default value for vsftp (bnc#888287). "FtpDirLocal" => "", #if empty doesn't write this options via SCR "FtpDirAnon" => "", #if empty doesn't write this options via SCR "Umask" => "", @@ -233,35 +228,17 @@ "EnableUpload" => "NO" } - # map <string, string > of pure-ftpd settings - # @PURE_SETTINGS = {} - - - # map <string, string > of vsftpd settings - # @VS_SETTINGS = {} - - # map <string, string > of vsftpd settings - # @EDIT_SETTINGS = {} - - Yast.include self, "ftp-server/write_load.rb" - - - @ftps = true # Write only, used during autoinstallation. # Don't run services and SuSEconfig, it's all done at one place. @write_only = false - - # Abort function - # return boolean return true if abort - @AbortFunction = fun_ref(method(:Modified), "boolean ()") end # Read current pure-ftpd configuration @@ -270,7 +247,6 @@ def ReadPUREFTPDSettings Builtins.foreach(SCR.Dir(path(".pure-ftpd"))) do |key| val = Convert.to_string(SCR.Read(Builtins.add(path(".pure-ftpd"), key))) - #string val = (string) select((list <string>) SCR::Read(add(.pure-ftpd, key)), 0, ""); Ops.set(@PURE_SETTINGS, key, val) if val != nil end @@ -281,18 +257,15 @@ ) Builtins.y2milestone("---------------------------------------------") - true end # Read current vsftpd configuration # # @return [Boolean] successfull - def ReadVSFTPDSettings Builtins.foreach(SCR.Dir(path(".vsftpd"))) do |key| val = Convert.to_string(SCR.Read(Builtins.add(path(".vsftpd"), key))) - #string val = (string) select((list <string>) SCR::Read(add(.pure-ftpd, key)), 0, ""); Ops.set(@VS_SETTINGS, key, val) if val != nil end Builtins.y2milestone("-------------VS_SETTINGS-------------------") @@ -302,7 +275,6 @@ ) Builtins.y2milestone("---------------------------------------------") - true end @@ -311,8 +283,6 @@ # existing upload file and permissions # # @return [Boolean] successfull - - def ReadVSFTPDUpload result = false command = "" @@ -334,7 +304,6 @@ result = false end if result - #Popup::Message("Work ReadVSFTPDUpload"); @create_upload_dir = true permissions = Builtins.substring( Builtins.tostring(Ops.get(options, "stdout")), @@ -346,10 +315,8 @@ if Ops.less_than(Builtins.size(w), 3) || Ops.less_than(Builtins.size(r), 3) @upload_good_permission = false - #Popup::Message("good permissions"); else @upload_good_permission = true - #Popup::Message("wrong permissions"); end end end @@ -362,8 +329,6 @@ # checking permissions for upload # # @return [Boolean] successfull - - def ReadPermisionUplaod result = false command = "" @@ -388,7 +353,6 @@ Ops.subtract(Builtins.size(directories), 1), "" ) - #Popup::Message(upload_dir); directory = Ops.add( "/", Builtins.mergestring( @@ -399,7 +363,6 @@ "/" ) ) - #Popup::Message(directory); else @pure_ftp_allowed_permissios_upload = -1 end @@ -435,13 +398,10 @@ if Ops.less_than(Builtins.size(w), 3) || Ops.less_than(Builtins.size(r), 3) @pure_ftp_allowed_permissios_upload = 0 - #Popup::Message("good permissions"); else @pure_ftp_allowed_permissios_upload = 1 - #Popup::Message("wrong permissions"); end end - #Popup::Message(tostring(pure_ftp_allowed_permissios_upload)); end result end @@ -450,11 +410,10 @@ # to temporary structure # # @return [Boolean] successfull - def InitEDIT_SETTINGS Builtins.foreach(@UI_keys) do |key| val = ValueUI(key, false) - Ops.set(@EDIT_SETTINGS, key, val) if val != nil #if (val == nil) Popup::Message(key);; + Ops.set(@EDIT_SETTINGS, key, val) if val != nil end Builtins.y2milestone("-------------EDIT_SETTINGS-------------------") @@ -553,12 +512,10 @@ end - # Remap UI pure-ftpd or vsftpd configuration # to write structure for SCR # # @return [Boolean] successfull - def WriteToSETTINGS Builtins.foreach(@UI_keys) { |key| ValueUI(key, true) } @@ -575,23 +532,9 @@ true end - - # Restart daemon apply changes - # only if daemon running... - # - # @return [Boolean] successfull - #boolean ApplyChanges () { - - - - - #} - - # Write firewall configuration # # @return [Boolean] successfull - def WriteFirewallSettings port_range = "" active_port = "" @@ -635,7 +578,6 @@ # @param [String] key of EDIT_SETTINGS map # @param [String] value of "key" EDIT_SETTINGS map # @return [Boolean] successfull - def WriteToEditMap(key, value) Ops.set(@EDIT_SETTINGS, key, value) true @@ -782,8 +724,6 @@ else result = false end - - #Popup::Message(command); else result = true end @@ -819,26 +759,15 @@ result end + # read value from PURE_EDIT_SETTINGS # # @param [String] key for edit map (ID of option) # @return [String] value of key from edit map - def ValueUIEdit(key) Ops.get(@EDIT_SETTINGS, key) end - # * Abort function - # * @return boolean return true if abort - # * - # global define boolean Abort() ``{ - # if(AbortFunction != nil) - # { - # return AbortFunction () == true; - # } - # return false; - # } - # Returns whether the configuration has been modified. # # @return [Boolean] modified @@ -846,17 +775,15 @@ @modified end - # Function set modified variable. + # Function set {#modified} variable. # - # @param boolean modified + # @param [Boolean] set_modified def SetModified(set_modified) @modified = set_modified nil end - - # Returns a confirmation popup dialog whether user wants to really abort. # # @return [Boolean] result of Popup::ReallyAbort(GetModified() @@ -875,8 +802,6 @@ false end - - # Data was modified? # @return true if modified def Modified @@ -884,8 +809,6 @@ @modified end - - # Read all FtpServer settings # @return true on success def Read @@ -1096,8 +1019,6 @@ result end - - # Dump the FtpServer settings to a single map # (For use by autoinstallation.) # @return [Hash] Dumped settings (later acceptable by Import ()) @@ -1151,8 +1072,6 @@ _S end - - # Create a textual summary and a list of unconfigured cards # @return summary of the current configuration def Summary @@ -1174,12 +1093,6 @@ _S end - # Create an overview table with all configured cards - # @return table items - def Overview - [] - end - #zzz # Return packages needed to be installed and removed during # Autoinstallation to insure module has all needed software @@ -1193,42 +1106,79 @@ end end + # This helper allows YARD to extract DSL-defined attributes. + # Unfortunately YARD has problems with the Capitalized ones, + # so those must be done manually. + # @!macro [attach] publish_variable + # @!attribute $1 + # @return [$2] + def self.publish_variable(name, type) + publish :variable => name, :type => type + end + publish :function => :SetModified, :type => "void (boolean)" publish :function => :Modified, :type => "boolean ()" publish :function => :WriteToEditMap, :type => "boolean (string, string)" publish :function => :WriteSettings, :type => "boolean ()" publish :function => :WriteUpload, :type => "boolean ()" publish :function => :WriteXinetd, :type => "boolean ()" - publish :variable => :modified, :type => "boolean" - publish :variable => :proposal_valid, :type => "boolean" - publish :variable => :vsftpd_edit, :type => "boolean" - publish :variable => :vsftpd_installed, :type => "boolean" - publish :variable => :pureftpd_installed, :type => "boolean" - publish :variable => :vsftpd_xined_id, :type => "integer" - publish :variable => :pureftpd_xined_id, :type => "integer" - publish :variable => :start_xinetd, :type => "boolean" - publish :variable => :pure_ftp_xinetd_running, :type => "boolean" - publish :variable => :vsftp_xinetd_running, :type => "boolean" - publish :variable => :stop_daemon_xinetd, :type => "boolean" - publish :variable => :create_upload_dir, :type => "boolean" - publish :variable => :upload_good_permission, :type => "boolean" - publish :variable => :pure_ftp_allowed_permissios_upload, :type => "integer" - publish :variable => :change_permissions, :type => "boolean" - publish :variable => :anon_homedir, :type => "string" - publish :variable => :anon_uid, :type => "integer" - publish :variable => :pure_ftpd_xinet_conf, :type => "list <string>" + publish_variable :modified, "boolean" + publish_variable :proposal_valid, "boolean" + publish_variable :vsftpd_edit, "boolean" + publish_variable :vsftpd_installed, "boolean" + publish_variable :pureftpd_installed, "boolean" + publish_variable :vsftpd_xined_id, "integer" + publish_variable :pureftpd_xined_id, "integer" + publish_variable :start_xinetd, "boolean" + publish_variable :pure_ftp_xinetd_running, "boolean" + publish_variable :vsftp_xinetd_running, "boolean" + publish_variable :stop_daemon_xinetd, "boolean" + publish_variable :create_upload_dir, "boolean" + publish_variable :upload_good_permission, "boolean" + publish_variable :pure_ftp_allowed_permissios_upload, "integer" + publish_variable :change_permissions, "boolean" + publish_variable :anon_homedir, "string" + publish_variable :anon_uid, "integer" + publish_variable :pure_ftpd_xinet_conf, "list <string>" + + # @attribute [r] UI_keys + # @return [Array<String>] + # A list of setting keys yast cares about, + # in the {#EDIT_SETTINGS} vocabulary. + # It should be made a constant. publish :variable => :UI_keys, :type => "list <string>" + + # @attribute DEFAULT_CONFIG + # @return [Hash<String,String>] + # Defaults for {#EDIT_SETTINGS} in case the value is not found + # in the system settings. publish :variable => :DEFAULT_CONFIG, :type => "map <string, string>" + + # @attribute PURE_SETTINGS + # @return [Hash<String,String>] + # Uses CamelCase, {FtpServerWriteLoadInclude#ValueUI ValueUI} maps it + # to {#EDIT_SETTINGS} and {#DEFAULT_CONFIG}. publish :variable => :PURE_SETTINGS, :type => "map <string, string>" + + # @attribute VS_SETTINGS + # @return [Hash<String,String>] + # Uses snake_case, {FtpServerWriteLoadInclude#ValueUI ValueUI} maps it + # to {#EDIT_SETTINGS} and {#DEFAULT_CONFIG}. publish :variable => :VS_SETTINGS, :type => "map <string, string>" + + # @attribute EDIT_SETTINGS + # @return [Hash<String,String>] + # Uses CamelCase with similar but not the same keys as {#PURE_SETTINGS}. + # {FtpServerWriteLoadInclude#ValueUI ValueUI} maps it to {#PURE_SETTINGS} + # and {#VS_SETTINGS}. publish :variable => :EDIT_SETTINGS, :type => "map <string, string>" + publish :function => :PureSettingsForXinetd, :type => "string ()" publish :function => :WriteStartViaXinetd, :type => "boolean (boolean, boolean)" publish :function => :ValueUI, :type => "string (string, boolean)" publish :function => :ValueUIEdit, :type => "string (string)" - publish :variable => :ftps, :type => "boolean" - publish :variable => :write_only, :type => "boolean" - publish :variable => :AbortFunction, :type => "boolean ()" + publish_variable :ftps, "boolean" + publish_variable :write_only, "boolean" publish :function => :GetModified, :type => "boolean ()" publish :function => :Abort, :type => "boolean ()" publish :function => :PollAbort, :type => "boolean ()" @@ -1239,7 +1189,6 @@ publish :function => :Export, :type => "map ()" publish :function => :OptionsSummary, :type => "string ()" publish :function => :Summary, :type => "string ()" - publish :function => :Overview, :type => "list ()" publish :function => :AutoPackages, :type => "map ()" end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ftp-server-3.1.2/test/verbose_logging_test.rb new/yast2-ftp-server-3.1.3/test/verbose_logging_test.rb --- old/yast2-ftp-server-3.1.2/test/verbose_logging_test.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-ftp-server-3.1.3/test/verbose_logging_test.rb 2014-08-22 16:31:01.000000000 +0200 @@ -0,0 +1,126 @@ +#! /usr/bin/env rspec + +ENV["Y2DIR"] = File.expand_path("../../src", __FILE__) + +require "yast" + +Yast.import "FtpServer" + +VS_CONFIG_PATH = Yast::Path.new(".vsftpd") +PURE_CONFIG_PATH = Yast::Path.new(".pure-ftpd") + +def mock_config(config_path, map) + allow(Yast::SCR).to receive(:Dir).with(config_path).and_return(map.keys) + map.each_pair do |key, value| + allow(Yast::SCR).to receive(:Read).with(config_path + key).and_return(value) + end +end + +VS_SETTINGS = { + "write_enable" => "NO", + "dirmessage_enable" => "YES", + "nopriv_user" => "ftpsecure", + "local_enable" => "YES", + "anonymous_enable" => "YES", + "anon_world_readable_only" => "YES", + "syslog_enable" => "YES", + "connect_from_port_20" => "YES", + "ascii_upload_enable" => "YES", + "pam_service_name" => "vsftpd", + "listen" => "NO", + "listen_ipv6" => "YES", + "ssl_enable" => "NO", + "pasv_min_port" => "30000", + "pasv_max_port" => "30100" +} + +PURE_SETTINGS = { + "AllowAnonymousFXP" => "no", + "AllowDotFiles" => "yes", + "AllowUserFXP" => "no", + "AnonymousCanCreateDirs" => "no", + "AnonymousCantUpload" => "yes", + "AnonymousOnly" => "yes", + "AntiWarez" => "yes", + "AutoRename" => "yes", + "BrokenClientsCompatibility" => "no", + "ChrootEveryone" => "yes", + "CustomerProof" => "yes", + "Daemonize" => "no", + "DisplayDotFiles" => "yes", + "DontResolve" => "yes", + "LimitRecursion" => "10000 8", + "MaxClientsNumber" => "10", + "MaxClientsPerIP" => "3", + "MaxDiskUsage" => "99", + "MaxIdleTime" => "15", + "MaxLoad" => "4", + "MinUID" => "40", + "NoAnonymous" => "no", + "NoRename" => "yes", + "PAMAuthentication" => "yes", + "PassivePortRange" => "30000 30100", + "ProhibitDotFilesRead" => "no", + "ProhibitDotFilesWrite" => "yes", + "SyslogFacility" => "ftp", + "VerboseLog" => "no" +} + +describe "Yast::FtpServer" do + describe "#ValueUI" do + context "'VerboseLogging' when getting vsftpd settings" do + before do + Yast::FtpServer.vsftpd_edit = true + end + + it "returns default value 'YES' if 'log_ftp_protocol' missing in config file" do + mock_config(VS_CONFIG_PATH, VS_SETTINGS) + Yast::FtpServer.ReadVSFTPDSettings() + + expect(Yast::FtpServer.ValueUI("VerboseLogging", false)).to eql "YES" + end + + it "returns value from config file 'NO' if 'log_ftp_protocol = NO' in config file" do + mock_config(VS_CONFIG_PATH, VS_SETTINGS.merge("log_ftp_protocol" => "NO")) + Yast::FtpServer.ReadVSFTPDSettings() + + expect(Yast::FtpServer.ValueUI("VerboseLogging", false)).to eql "NO" + end + + it "returns value from config file 'YES' if 'log_ftp_protocol = YES' in config file" do + mock_config(VS_CONFIG_PATH, VS_SETTINGS.merge("log_ftp_protocol" => "YES")) + Yast::FtpServer.ReadVSFTPDSettings() + + expect(Yast::FtpServer.ValueUI("VerboseLogging", false)).to eql "YES" + end + end + + context "'VerboseLogging' when getting pure-ftpd settings" do + before do + Yast::FtpServer.vsftpd_edit = false + end + + it "returns default value 'NO' if config file empty" do + mock_config(PURE_CONFIG_PATH, {}) + Yast::FtpServer.ReadPUREFTPDSettings() + + expect(Yast::FtpServer.ValueUI("VerboseLogging", false)).to eql "NO" + end + + it "returns value from config file 'NO' if 'VerboseLog = no' in config file" do + mock_config(PURE_CONFIG_PATH, PURE_SETTINGS) + Yast::FtpServer.ReadPUREFTPDSettings() + + expect(Yast::FtpServer.ValueUI("VerboseLogging", false)).to eql "NO" + end + + it "returns value from config file 'YES' if 'VerboseLog = yes' in config file" do + mock_config(PURE_CONFIG_PATH, PURE_SETTINGS.merge("VerboseLog" => "YES")) + Yast::FtpServer.ReadPUREFTPDSettings() + + expect(Yast::FtpServer.ValueUI("VerboseLogging", false)).to eql "YES" + end + end + + end +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ftp-server-3.1.2/.yardopts new/yast2-ftp-server-3.1.3/.yardopts --- old/yast2-ftp-server-3.1.2/.yardopts 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-ftp-server-3.1.3/.yardopts 2014-08-22 16:31:01.000000000 +0200 @@ -0,0 +1,6 @@ +--no-private +--protected +--markup markdown +--output-dir doc/autodocs +--readme README.md +src/**/*.rb continue with "q"... Checked in at Mon Aug 25 15:37:23 CEST 2014 by bg 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 43062 changed to accepted (submit SUSE:SLE-12:GA/yast2-ftp-server)
by Berthold Gunreben 25 Aug '14

25 Aug '14

Visit https://build.suse.de/request/show/43062 State of request 43062 was changed by azouhr: new -> accepted Comment: Accepted submit request 43062 from user leonardocf Actions: - submit Devel:YaST:Head/yast2-ftp-server => SUSE:SLE-12:GA/yast2-ftp-server -- 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