Hello community, here is the log from the commit of package yast2-dhcp-server for openSUSE:Leap:15.2 checked in at 2020-04-14 14:20:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/yast2-dhcp-server (Old) and /work/SRC/openSUSE:Leap:15.2/.yast2-dhcp-server.new.3248 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-dhcp-server" Tue Apr 14 14:20:26 2020 rev:23 rq:792547 version:4.2.3 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/yast2-dhcp-server/yast2-dhcp-server.changes 2020-02-21 23:49:54.564632978 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.yast2-dhcp-server.new.3248/yast2-dhcp-server.changes 2020-04-14 14:20:34.733256476 +0200 @@ -1,0 +2,7 @@ +Sat Apr 4 17:06:50 UTC 2020 - Michal Filka <[email protected]> + +- bsc#1167474 + - removed token ring support +- 4.2.3 + +------------------------------------------------------------------- Old: ---- yast2-dhcp-server-4.2.2.tar.bz2 New: ---- yast2-dhcp-server-4.2.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-dhcp-server.spec ++++++ --- /var/tmp/diff_new_pack.jMdpLb/_old 2020-04-14 14:20:35.065256723 +0200 +++ /var/tmp/diff_new_pack.jMdpLb/_new 2020-04-14 14:20:35.069256727 +0200 @@ -17,7 +17,7 @@ Name: yast2-dhcp-server -Version: 4.2.2 +Version: 4.2.3 Release: 0 Summary: YaST2 - DHCP Server Configuration License: GPL-2.0-only ++++++ yast2-dhcp-server-4.2.2.tar.bz2 -> yast2-dhcp-server-4.2.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dhcp-server-4.2.2/.travis.yml new/yast2-dhcp-server-4.2.3/.travis.yml --- old/yast2-dhcp-server-4.2.2/.travis.yml 2020-02-17 18:24:21.000000000 +0100 +++ new/yast2-dhcp-server-4.2.3/.travis.yml 2020-04-07 15:35:02.000000000 +0200 @@ -8,4 +8,4 @@ script: # the "yast-travis-ruby" script is included in the base yastdevel/ruby image # see https://github.com/yast/docker-yast-ruby/blob/master/yast-travis-ruby - - docker run -it -e TRAVIS=1 -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" yast-dhcp-server-image yast-travis-ruby + - docker run -it -e TRAVIS=1 -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" --privileged yast-dhcp-server-image yast-travis-ruby diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dhcp-server-4.2.2/CONTRIBUTING.md new/yast2-dhcp-server-4.2.3/CONTRIBUTING.md --- old/yast2-dhcp-server-4.2.2/CONTRIBUTING.md 2020-02-17 18:24:21.000000000 +0100 +++ new/yast2-dhcp-server-4.2.3/CONTRIBUTING.md 1970-01-01 01:00:00.000000000 +0100 @@ -1,89 +0,0 @@ -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 the 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.suse.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.) - -When creating a bug report, please follow our [bug reporting -guidelines](http://en.opensuse.org/openSUSE:Report_a_YaST_bug). - -We can't guarantee that every bug will be fixed, but we'll try. - -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. Update the package version (in `packages/*.spec`, usually by - `rake version:bump`) and add a new entry to the `package/*.changes` file - (by `osc vc package`). - For bigger changes or changes which need longer discussion it is advised to - add this as a separate last commit so it can be easily updated when another - change is merged in the meantime. - - 5. Make sure your change didn't break anything by building the RPM package - (`rake osc:build`). The build process includes running the full testsuite. - - 6. Publish the branch and create a pull request. - - 7. YaST developers will review your change and possibly point out issues. - Adapt the code under their guidance until they are all resolved. - - 8. 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. - -### 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 Bugzilla 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-dhcp-server-4.2.2/package/yast2-dhcp-server.changes new/yast2-dhcp-server-4.2.3/package/yast2-dhcp-server.changes --- old/yast2-dhcp-server-4.2.2/package/yast2-dhcp-server.changes 2020-02-17 18:24:21.000000000 +0100 +++ new/yast2-dhcp-server-4.2.3/package/yast2-dhcp-server.changes 2020-04-07 15:35:02.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Sat Apr 4 17:06:50 UTC 2020 - Michal Filka <[email protected]> + +- bsc#1167474 + - removed token ring support +- 4.2.3 + +------------------------------------------------------------------- Mon Feb 17 17:18:49 UTC 2020 - Stefan Hundhammer <[email protected]> - Fixed user-visible messages (bsc#1084015) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dhcp-server-4.2.2/package/yast2-dhcp-server.spec new/yast2-dhcp-server-4.2.3/package/yast2-dhcp-server.spec --- old/yast2-dhcp-server-4.2.2/package/yast2-dhcp-server.spec 2020-02-17 18:24:21.000000000 +0100 +++ new/yast2-dhcp-server-4.2.3/package/yast2-dhcp-server.spec 2020-04-07 15:35:02.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-dhcp-server -Version: 4.2.2 +Version: 4.2.3 Release: 0 Summary: YaST2 - DHCP Server Configuration Group: System/YaST diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dhcp-server-4.2.2/src/include/dhcp-server/commandline.rb new/yast2-dhcp-server-4.2.3/src/include/dhcp-server/commandline.rb --- old/yast2-dhcp-server-4.2.2/src/include/dhcp-server/commandline.rb 2020-02-17 18:24:21.000000000 +0100 +++ new/yast2-dhcp-server-4.2.3/src/include/dhcp-server/commandline.rb 2020-04-07 15:35:02.000000000 +0200 @@ -124,7 +124,7 @@ "The hardware type of the host with a fixed address" ), "type" => "enum", - "typespec" => ["ethernet", "token-ring"] + "typespec" => ["ethernet"] }, "ip-address" => { # command line help text for an option diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dhcp-server-4.2.2/src/include/dhcp-server/dialogs2.rb new/yast2-dhcp-server-4.2.3/src/include/dhcp-server/dialogs2.rb --- old/yast2-dhcp-server-4.2.2/src/include/dhcp-server/dialogs2.rb 2020-02-17 18:24:21.000000000 +0100 +++ new/yast2-dhcp-server-4.2.3/src/include/dhcp-server/dialogs2.rb 2020-04-07 15:35:02.000000000 +0200 @@ -1578,9 +1578,7 @@ # Table header item - IP of the host _("IP"), # MAC address of the host - _("Hardware Address"), - # Network type of the host - _("Type") + _("Hardware Address") ) ) ), @@ -1610,16 +1608,6 @@ Left( TextEntry(Id("hosthwaddress"), _("&Hardware Address")) ), - # Radiobutton label - network type of the host - RadioButtonGroup( - Id("network_type"), - HBox( - Left( - RadioButton(Id("ethernet"), _("&Ethernet"), true) - ), - Left(RadioButton(Id("token-ring"), _("&Token Ring"))) - ) - ) ) ) ) @@ -1670,11 +1658,6 @@ :Value, Ops.get(opts, "hardware", "") ) - UI.ChangeWidget( - Id("network_type"), - :CurrentButton, - Ops.get(opts, "type", "ethernet") - ) nil end @@ -1733,11 +1716,8 @@ Item( Id(id2), id2, - Ops.get(opts, "ip", ""), - Ops.get(opts, "hardware", ""), - Ops.get(opts, "type", "ethernet") == "ethernet" ? - _("Ethernet") : - _("Token Ring") + opts.fetch("ip", ""), + opts.fetch("hardware", "") ) end @@ -1783,18 +1763,7 @@ end value = Convert.to_string(UI.QueryWidget(Id("hosthwaddress"), :Value)) - if Ops.greater_than(Builtins.size(value), 0) - # FIXME: validation - type = Convert.to_string( - UI.QueryWidget(Id("network_type"), :CurrentButton) - ) - directives = Builtins.add( - directives, - { "key" => "hardware", "value" => Ops.add(Ops.add(type, " "), value) } - ) - end - - deep_copy(directives) + directives << { "key" => "hardware", "value" => "ethernet #{value}" } end def CheckMacAddrFormat @@ -1802,22 +1771,18 @@ UI.QueryWidget(Id("hosthwaddress"), :Value) ) - addr_type = Convert.to_string( - UI.QueryWidget(Id("network_type"), :CurrentButton) - ) - if addr_type == "ethernet" || addr_type == "token-ring" - if !Address.CheckMAC(hosthwaddress) - UI.SetFocus(Id("hosthwaddress")) - Report.Error( - Ops.add( - # error popup - _("The hardware address is invalid.\n"), - Address.ValidMAC - ) + if !Address.CheckMAC(hosthwaddress) + UI.SetFocus(Id("hosthwaddress")) + Report.Error( + Ops.add( + # error popup + _("The hardware address is invalid.\n"), + Address.ValidMAC ) - return false - end + ) + return false end + true end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dhcp-server-4.2.2/src/include/dhcp-server/options.rb new/yast2-dhcp-server-4.2.3/src/include/dhcp-server/options.rb --- old/yast2-dhcp-server-4.2.2/src/include/dhcp-server/options.rb 2020-02-17 18:24:21.000000000 +0100 +++ new/yast2-dhcp-server-4.2.3/src/include/dhcp-server/options.rb 2020-04-07 15:35:02.000000000 +0200 @@ -892,7 +892,6 @@ value = Convert.to_string(fetchValue(opt_id, opt_key)) l = Builtins.splitstring(value, " ") l = Builtins.filter(l) { |i| i != "" } - UI.ChangeWidget(Id(:hw), :Value, Ops.get(l, 0, "ethernet")) UI.ChangeWidget(Id(:addr), :Value, Ops.get(l, 1, "")) nil @@ -907,11 +906,7 @@ storeValue( opt_id, opt_key, - Builtins.sformat( - "%1 %2", - Convert.to_string(UI.QueryWidget(Id(:hw), :Value)), - Convert.to_string(UI.QueryWidget(Id(:addr), :Value)) - ) + "ethernet #{UI.QueryWidget(Id(:addr), :Value)}" ) nil @@ -1029,17 +1024,6 @@ "popup" => { "widget" => :custom, "custom_widget" => VBox( - # combo box - ComboBox( - Id(:hw), - _("&Hardware Type"), - [ - # combo box entry, networking technology name - Item(Id("ethernet"), _("Ethernet")), - # combo box entry, networking technology name - Item(Id("token-ring"), _("Token Ring")) - ] - ), # test entry, MAC better not to be translated, # translation would decrease the understandability TextEntry(Id(:addr), _("&MAC Address"))
