Hello community,
here is the log from the commit of package yast2-samba-server for
openSUSE:Factory checked in at 2017-04-12 17:09:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-samba-server (Old)
and /work/SRC/openSUSE:Factory/.yast2-samba-server.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-samba-server"
Wed Apr 12 17:09:25 2017 rev:75 rq:485086 version:3.2.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-samba-server/yast2-samba-server.changes
2016-06-11 00:00:05.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.yast2-samba-server.new/yast2-samba-server.changes
2017-04-12 17:09:26.928741258 +0200
@@ -1,0 +2,15 @@
+Thu Apr 3 18:42:42 UTC 2017 - [email protected]
+
+- fix duplicated key warnings (bsc#1031613).
+- Don't require install of cups for yast samba-server
+ (bsc#1024670).
+- 3.2.1
+
+-------------------------------------------------------------------
+Thu Mar 16 15:51:19 UTC 2017 - [email protected]
+
+- Fix string comparisons in SambaBackendLDAP.pm and YaPI/Samba.pm
+ (bsc#1029528)
+- 3.2.0
+
+-------------------------------------------------------------------
Old:
----
yast2-samba-server-3.1.16.tar.bz2
New:
----
yast2-samba-server-3.2.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-samba-server.spec ++++++
--- /var/tmp/diff_new_pack.vMZOJg/_old 2017-04-12 17:09:27.632641613 +0200
+++ /var/tmp/diff_new_pack.vMZOJg/_new 2017-04-12 17:09:27.632641613 +0200
@@ -1,7 +1,7 @@
#
# spec file for package yast2-samba-server
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: yast2-samba-server
-Version: 3.1.16
+Version: 3.2.1
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-samba-server-3.1.16.tar.bz2 -> yast2-samba-server-3.2.1.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-samba-server-3.1.16/.travis.yml
new/yast2-samba-server-3.2.1/.travis.yml
--- old/yast2-samba-server-3.1.16/.travis.yml 2016-06-07 14:00:43.570214132
+0200
+++ new/yast2-samba-server-3.2.1/.travis.yml 2017-04-04 12:34:16.943904660
+0200
@@ -1,16 +1,11 @@
-language: cpp
-compiler:
- - gcc
+sudo: required
+language: bash
+services:
+ - docker
+
before_install:
- # disable rvm, use system Ruby
- - rvm reset
- - wget
https://raw.githubusercontent.com/yast/yast-devtools/master/travis-tools/travis_setup.sh
- - sh ./travis_setup.sh -p "rake yast2-devtools yast2-testsuite yast2
yast2-samba-client yast2-ldap" -g "yast-rake gettext"
+ - docker build -t yast-samba-server-image .
script:
- - rake check:syntax
- - rake check:pot
- - make -f Makefile.cvs
- - make
- - sudo make install
- - make check
-
+ # 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-samba-server-image yast-travis-ruby
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-samba-server-3.1.16/CONTRIBUTING.md
new/yast2-samba-server-3.2.1/CONTRIBUTING.md
--- old/yast2-samba-server-3.1.16/CONTRIBUTING.md 2016-06-07
14:00:43.586214132 +0200
+++ new/yast2-samba-server-3.2.1/CONTRIBUTING.md 2017-04-04
12:34:16.943904660 +0200
@@ -3,7 +3,7 @@
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.
+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.
@@ -17,13 +17,11 @@
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.suse.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).
+We can't guarantee that every bug will be fixed, but we'll try.
+
Code Changes
------------
@@ -44,15 +42,22 @@
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
+ 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.
- 5. Publish the branch and create a pull request.
+ 6. Publish the branch and create a pull request.
- 6. YaST developers will review your change and possibly point out issues.
+ 7. 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.
+ 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).
@@ -60,9 +65,6 @@
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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-samba-server-3.1.16/Dockerfile
new/yast2-samba-server-3.2.1/Dockerfile
--- old/yast2-samba-server-3.1.16/Dockerfile 1970-01-01 01:00:00.000000000
+0100
+++ new/yast2-samba-server-3.2.1/Dockerfile 2017-04-04 12:34:16.947904660
+0200
@@ -0,0 +1,3 @@
+FROM yastdevel/ruby
+COPY . /usr/src/app
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-samba-server-3.1.16/package/yast2-samba-server.changes
new/yast2-samba-server-3.2.1/package/yast2-samba-server.changes
--- old/yast2-samba-server-3.1.16/package/yast2-samba-server.changes
2016-06-07 14:00:43.614214132 +0200
+++ new/yast2-samba-server-3.2.1/package/yast2-samba-server.changes
2017-04-04 12:34:16.947904660 +0200
@@ -1,4 +1,19 @@
-------------------------------------------------------------------
+Thu Apr 3 18:42:42 UTC 2017 - [email protected]
+
+- fix duplicated key warnings (bsc#1031613).
+- Don't require install of cups for yast samba-server
+ (bsc#1024670).
+- 3.2.1
+
+-------------------------------------------------------------------
+Thu Mar 16 15:51:19 UTC 2017 - [email protected]
+
+- Fix string comparisons in SambaBackendLDAP.pm and YaPI/Samba.pm
+ (bsc#1029528)
+- 3.2.0
+
+-------------------------------------------------------------------
Tue Jun 7 11:08:42 UTC 2016 - [email protected]
- Stop generating autodocs (fate#320356)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-samba-server-3.1.16/package/yast2-samba-server.spec
new/yast2-samba-server-3.2.1/package/yast2-samba-server.spec
--- old/yast2-samba-server-3.1.16/package/yast2-samba-server.spec
2016-06-07 14:00:43.614214132 +0200
+++ new/yast2-samba-server-3.2.1/package/yast2-samba-server.spec
2017-04-04 12:34:16.947904660 +0200
@@ -17,7 +17,7 @@
Name: yast2-samba-server
-Version: 3.1.16
+Version: 3.2.1
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-samba-server-3.1.16/src/include/samba-server/samba-options-global.rb
new/yast2-samba-server-3.2.1/src/include/samba-server/samba-options-global.rb
---
old/yast2-samba-server-3.1.16/src/include/samba-server/samba-options-global.rb
2016-06-07 14:00:43.646214132 +0200
+++
new/yast2-samba-server-3.2.1/src/include/samba-server/samba-options-global.rb
2017-04-04 12:34:16.951904660 +0200
@@ -108,7 +108,6 @@
"table" => { "unique" => true },
"popup" => { "widget" => :checkbox }
},
- "" => { "table" => { "unique" => true } },
"client lanman auth" => {
"table" => { "unique" => true },
"popup" => { "widget" => :checkbox }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-samba-server-3.1.16/src/include/samba-server/samba-options-local.rb
new/yast2-samba-server-3.2.1/src/include/samba-server/samba-options-local.rb
---
old/yast2-samba-server-3.1.16/src/include/samba-server/samba-options-local.rb
2016-06-07 14:00:43.646214132 +0200
+++
new/yast2-samba-server-3.2.1/src/include/samba-server/samba-options-local.rb
2017-04-04 12:34:16.951904660 +0200
@@ -280,7 +280,6 @@
"table" => { "unique" => true },
"popup" => { "widget" => :checkbox }
},
- "" => { "table" => { "unique" => true } },
"copy" => { "table" => { "unique" => true } },
"include" => { "table" => { "unique" => true } },
"exec" => { "table" => { "unique" => true } },
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-samba-server-3.1.16/src/modules/SambaPrinters.pm
new/yast2-samba-server-3.2.1/src/modules/SambaPrinters.pm
--- old/yast2-samba-server-3.1.16/src/modules/SambaPrinters.pm 2016-06-07
14:00:43.654214132 +0200
+++ new/yast2-samba-server-3.2.1/src/modules/SambaPrinters.pm 2017-04-04
12:34:16.951904660 +0200
@@ -276,7 +276,7 @@
enableShare() {
...
// [printers] is coupled with "load printers"
- if( name == "printers" )
+ if( name eq "printers" )
global_config["load printers"] = on;
...
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-samba-server-3.1.16/src/modules/SambaServer.pm
new/yast2-samba-server-3.2.1/src/modules/SambaServer.pm
--- old/yast2-samba-server-3.1.16/src/modules/SambaServer.pm 2016-06-07
14:00:43.670214132 +0200
+++ new/yast2-samba-server-3.2.1/src/modules/SambaServer.pm 2017-04-04
12:34:16.951904660 +0200
@@ -60,6 +60,8 @@
YaST::YCP::Import("SambaTrustDom");
YaST::YCP::Import("SambaAccounts");
YaST::YCP::Import("Samba");
+YaST::YCP::Import ("Popup");
+
}
use constant {
@@ -111,19 +113,17 @@
}
BEGIN{ $TYPEINFO{GetModified} = ["function", "boolean"] }
-sub CheckAndInstallCupsPackages {
+sub CheckNeedToInstallCupsPackages {
my $printing = SambaConfig->GlobalGetStr("printing", "cups");
- unless ((lc $printing eq "cups") and SambaConfig->ShareExists("printers"))
{
- # not sharing cups printers, package not needed
- return 1;
+ unless ((lc $printing eq "cups") and SambaConfig->ShareExists("printers")
and SambaConfig->ShareEnabled("printers")) {
+ return 0;
}
-
if (PackageSystem->InstalledAll($CupsPackages)) {
- return 1;
+ return 0;
}
- return PackageSystem->CheckAndInstallPackagesInteractive($CupsPackages);
+ return 1;
}
# Read all samba-server settings
@@ -182,7 +182,15 @@
}
SambaConfig->Read();
unless (Mode->test()) {
- CheckAndInstallCupsPackages() or return 0;
+ if (CheckNeedToInstallCupsPackages()) {
+ my $answer = Popup->YesNo(__("Cups is required by samba for
printing to \nwork correctly. Do you wish to disable printing?\nNote: To
reenable printing you will need to \nmanually enable the \"printers\" share and
install cups."));
+ if ($answer) {
+ SambaConfig->ShareDisable("printers");
+ SambaConfig->ShareSetModified("printers");
+ } else {
+
PackageSystem->CheckAndInstallPackagesInteractive($CupsPackages) or return 0
+ }
+ }
}
Samba->ReadSharesSetting();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-samba-server-3.1.16/src/modules/YaPI/Samba.pm
new/yast2-samba-server-3.2.1/src/modules/YaPI/Samba.pm
--- old/yast2-samba-server-3.1.16/src/modules/YaPI/Samba.pm 2016-06-07
14:00:43.690214132 +0200
+++ new/yast2-samba-server-3.2.1/src/modules/YaPI/Samba.pm 2017-04-04
12:34:16.955904660 +0200
@@ -182,7 +182,7 @@
my $self = shift;
SambaConfig->Read();
my $role = SambaRole->GetRole();
- $role = "STANDALONE" if $role == "MEMBER";
+ $role = "STANDALONE" if $role eq "MEMBER";
return lc $role;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-samba-server-3.1.16/testsuite/YaPI/tests/YaPI-DetermineRole2.rb
new/yast2-samba-server-3.2.1/testsuite/YaPI/tests/YaPI-DetermineRole2.rb
--- old/yast2-samba-server-3.1.16/testsuite/YaPI/tests/YaPI-DetermineRole2.rb
2016-06-07 14:00:43.694214132 +0200
+++ new/yast2-samba-server-3.2.1/testsuite/YaPI/tests/YaPI-DetermineRole2.rb
2017-04-04 12:34:16.959904660 +0200
@@ -17,7 +17,7 @@
"global" => {
"workgroup" => "Test",
"domain master" => "yes",
- "security" => "user",
+ "security" => "share",
"preferred master" => "yes",
"domain logons" => "yes",
"local master" => "yes"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-samba-server-3.1.16/testsuite/YaPI/tests/YaPI-DetermineRole3.out
new/yast2-samba-server-3.2.1/testsuite/YaPI/tests/YaPI-DetermineRole3.out
--- old/yast2-samba-server-3.1.16/testsuite/YaPI/tests/YaPI-DetermineRole3.out
2016-06-07 14:00:43.694214132 +0200
+++ new/yast2-samba-server-3.2.1/testsuite/YaPI/tests/YaPI-DetermineRole3.out
2017-04-04 12:34:16.959904660 +0200
@@ -1 +1 @@
-Return standalone
+Return bdc
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-samba-server-3.1.16/testsuite/YaPI/tests/YaPI-DetermineRole3.rb
new/yast2-samba-server-3.2.1/testsuite/YaPI/tests/YaPI-DetermineRole3.rb
--- old/yast2-samba-server-3.1.16/testsuite/YaPI/tests/YaPI-DetermineRole3.rb
2016-06-07 14:00:43.694214132 +0200
+++ new/yast2-samba-server-3.2.1/testsuite/YaPI/tests/YaPI-DetermineRole3.rb
2017-04-04 12:34:16.959904660 +0200
@@ -17,7 +17,7 @@
"global" => {
"workgroup" => "Test",
"domain master" => "no",
- "security" => "user",
+ "security" => "domain",
"preferred master" => "yes",
"domain logons" => "yes",
"local master" => "yes"
