Script 'mail_helper' called by kukuk Hello packager, This is just FYI. Your package was checked in in distribution "sle12" by autobuild-member: kukuk. Here comes the log... ---------------------------%<------------------------------ Hi, here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-tftp-server -> sle12 Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-tftp-server/yast2-tftp-server.changes 2014-01-17 14:16:34.000000000 +0100 +++ /mounts/work_src_done/SLE12/yast2-tftp-server/yast2-tftp-server.changes 2014-04-01 10:10:10.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Apr 1 09:46:19 CEST 2014 - locilka@suse.com + +- Testsuite adjusted to the new Systemd/Service library +- 3.1.1 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2-schema - yast2-tftp-server ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-tftp-server (Old) and /mounts/work_src_done/SLE12/yast2-tftp-server (BS:build ID:35293 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-tftp-server", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-tftp-server-3.1.0.tar.bz2 New: ---- yast2-tftp-server-3.1.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-tftp-server.spec ++++++ --- /var/tmp/diff_new_pack.D3XzSJ/_old 2014-04-01 10:22:09.000000000 +0200 +++ /var/tmp/diff_new_pack.D3XzSJ/_new 2014-04-01 10:22:09.000000000 +0200 @@ -17,30 +17,29 @@ Name: yast2-tftp-server -Version: 3.1.0 +Version: 3.1.1 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-testsuite +Group: System/YaST +License: GPL-2.0+ + +BuildRequires: perl-XML-Writer update-desktop-files yast2-testsuite +BuildRequires: yast2-devtools >= 3.1.10 # SuSEfirewall2_* scripts merget into one in yast2-2.23.17 BuildRequires: yast2 >= 2.23.17 # Wizard::SetDesktopTitleAndIcon -Requires: lsof Requires: yast2 >= 2.21.22 +Requires: lsof -BuildArch: noarch +BuildArchitectures: noarch Requires: yast2-ruby-bindings >= 1.0.0 Summary: YaST2 - TFTP Server Configuration -License: GPL-2.0+ -Group: System/YaST %description The YaST2 component for configuring a TFTP server. TFTP stands for @@ -56,6 +55,7 @@ %install %yast_install + %files %defattr(-,root,root) %dir %{yast_yncludedir}/tftp-server @@ -65,5 +65,3 @@ %{yast_desktopdir}/tftp-server.desktop %{yast_scrconfdir}/etc_xinetd_d_tftp.scr %doc %{yast_docdir} - -%changelog ++++++ yast2-tftp-server-3.1.0.tar.bz2 -> yast2-tftp-server-3.1.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-tftp-server-3.1.0/CONTRIBUTING.md new/yast2-tftp-server-3.1.1/CONTRIBUTING.md --- old/yast2-tftp-server-3.1.0/CONTRIBUTING.md 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-tftp-server-3.1.1/CONTRIBUTING.md 2014-04-01 10:08:25.000000000 +0200 @@ -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_...). + +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-tftp-server-3.1.0/VERSION new/yast2-tftp-server-3.1.1/VERSION --- old/yast2-tftp-server-3.1.0/VERSION 2013-10-16 10:16:36.000000000 +0200 +++ new/yast2-tftp-server-3.1.1/VERSION 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -3.1.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-tftp-server-3.1.0/package/yast2-tftp-server.changes new/yast2-tftp-server-3.1.1/package/yast2-tftp-server.changes --- old/yast2-tftp-server-3.1.0/package/yast2-tftp-server.changes 2013-10-16 10:16:36.000000000 +0200 +++ new/yast2-tftp-server-3.1.1/package/yast2-tftp-server.changes 2014-04-01 10:08:25.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Apr 1 09:46:19 CEST 2014 - locilka@suse.com + +- Testsuite adjusted to the new Systemd/Service library +- 3.1.1 + +------------------------------------------------------------------- Thu Sep 19 17:36:10 UTC 2013 - lslezak@suse.cz - do not use *.spec.in template, use *.spec file with RPM macros diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-tftp-server-3.1.0/package/yast2-tftp-server.spec new/yast2-tftp-server-3.1.1/package/yast2-tftp-server.spec --- old/yast2-tftp-server-3.1.0/package/yast2-tftp-server.spec 2013-10-16 10:16:36.000000000 +0200 +++ new/yast2-tftp-server-3.1.1/package/yast2-tftp-server.spec 2014-04-01 10:08:25.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-tftp-server -Version: 3.1.0 +Version: 3.1.1 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -27,7 +27,7 @@ License: GPL-2.0+ BuildRequires: perl-XML-Writer update-desktop-files yast2-testsuite -BuildRequires: yast2-devtools >= 3.0.6 +BuildRequires: yast2-devtools >= 3.1.10 # SuSEfirewall2_* scripts merget into one in yast2-2.23.17 BuildRequires: yast2 >= 2.23.17 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-tftp-server-3.1.0/src/modules/TftpServer.rb new/yast2-tftp-server-3.1.1/src/modules/TftpServer.rb --- old/yast2-tftp-server-3.1.0/src/modules/TftpServer.rb 2013-10-16 10:16:36.000000000 +0200 +++ new/yast2-tftp-server-3.1.1/src/modules/TftpServer.rb 2014-04-01 10:08:25.000000000 +0200 @@ -13,6 +13,11 @@ module Yast class TftpServerClass < Module + + SERVICE_NAME = "xinetd" + + include Yast::Logger + def main textdomain "tftp-server" @@ -102,7 +107,7 @@ lines = Builtins.filter(lines) { |l| l != "xinetd" && l != "in.tftpd" } @foreign_servers = Builtins.mergestring(lines, ", ") - xinetd_start = Service.Enabled("xinetd") + xinetd_start = Service.Enabled(SERVICE_NAME) # is the config file there at all? sections = SCR.Dir(path(".etc.xinetd_d.tftp.section")) @@ -197,7 +202,7 @@ # firewall?? # enable and (re)start xinetd - Service.Enable("xinetd") if @start + Service.Enable(SERVICE_NAME) if @start # TODO only when we have our own Progress #boolean progress_orig = Progress::set (false); @@ -224,12 +229,17 @@ SCR.Execute(path(".target.bash"), "/usr/bin/killall in.tftpd") if @start - Service.Restart("xinetd") + Service.Restart(SERVICE_NAME) else # xinetd may be needed for other services so we never turn it # off. It will exit anyway if no services are configured. # If it is running, restart it. - Service.RunInitScript("xinetd", "try-restart") + service = SystemdService.find(SERVICE_NAME) + if service.nil? + log.error("Could not find service #{SERVICE_NAME}") + Report.Error(_("Cannot reload service %{name}") % { :name => SERVICE_NAME }) + end + service.try_restart end # TODO only when we have our own Progress diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-tftp-server-3.1.0/testsuite/tests/readwrite.out new/yast2-tftp-server-3.1.1/testsuite/tests/readwrite.out --- old/yast2-tftp-server-3.1.0/testsuite/tests/readwrite.out 2013-10-16 10:16:36.000000000 +0200 +++ new/yast2-tftp-server-3.1.1/testsuite/tests/readwrite.out 2014-04-01 10:08:25.000000000 +0200 @@ -1,22 +1,12 @@ Execute .target.bash_output "/usr/bin/lsof -i :tftp -Fc" $["exit":0, "stderr":"", "stdout":"p3316\ncxinetd\n"] -Execute .target.bash "/bin/systemctl is-enabled xinetd.service" 0 Dir .etc.xinetd_d.tftp.section: ["tftp"] Read .etc.xinetd_d.tftp.value.tftp.disable nil Read .etc.xinetd_d.tftp.value.tftp.server_args "-s -v /srv/boot" -Execute .target.bash "/bin/systemctl is-enabled SuSEfirewall2.service" 0 Return true Write .etc.xinetd_d.tftp.value.tftp."{" "" true Write .etc.xinetd_d.tftp.value_type.tftp."{" 1 true -Write .etc.xinetd_d.tftp.value.tftp.disable "no" true -Write .etc.xinetd_d.tftp.value.tftp.socket_type "dgram" true -Write .etc.xinetd_d.tftp.value.tftp.protocol "udp" true -Write .etc.xinetd_d.tftp.value.tftp.wait "yes" true -Write .etc.xinetd_d.tftp.value.tftp.user "root" true -Write .etc.xinetd_d.tftp.value.tftp.server "/usr/sbin/in.tftpd" true -Write .etc.xinetd_d.tftp.value.tftp.server_args "-v -s /srv/boot" true +Write .etc.xinetd_d.tftp.value.tftp.disable "yes" true Write .etc.xinetd_d.tftp nil true Execute .target.mkdir "/srv/boot" 0 -Execute .target.bash "/bin/systemctl is-enabled xinetd.service" 0 Execute .target.bash "/usr/bin/killall in.tftpd" 0 -Execute .target.bash_output "/bin/systemctl restart xinetd.service" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":"p3316\ncxinetd\n"] Return true continue with "q"... Checked in at Tue Apr 1 10:23:59 CEST 2014 by kukuk Remember to have fun... -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org