Hello community,
here is the log from the commit of package yast2-samba-client for openSUSE:Factory checked in at 2014-04-05 14:42:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-samba-client (Old)
and /work/SRC/openSUSE:Factory/.yast2-samba-client.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-samba-client"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-samba-client/yast2-samba-client.changes 2014-03-21 12:14:33.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-samba-client.new/yast2-samba-client.changes 2014-04-05 14:42:45.000000000 +0200
@@ -1,0 +2,15 @@
+Thu Mar 27 13:48:04 UTC 2014 - ddiss@suse.com
+
+- Fix handling of CTDB primitives containing hyphens
+- Remove CTDB crm resource hierarchy assumption; (bnc#813462).
+- Add SUSE Samba Team as MAINTAINER
+- 3.1.7
+
+-------------------------------------------------------------------
+Wed Mar 26 15:26:51 UTC 2014 - nopower@suse.com
+
+- Add needed scr agent /usr/share/YaST2/scrconf/etc_ssh_ssh_config.scr;
+ (bnc#870230)
+- 3.1.6
+
+-------------------------------------------------------------------
Old:
----
yast2-samba-client-3.1.5.tar.bz2
New:
----
yast2-samba-client-3.1.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-samba-client.spec ++++++
--- /var/tmp/diff_new_pack.1PnnFl/_old 2014-04-05 14:42:46.000000000 +0200
+++ /var/tmp/diff_new_pack.1PnnFl/_new 2014-04-05 14:42:46.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-samba-client
-Version: 3.1.5
+Version: 3.1.7
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-samba-client-3.1.5.tar.bz2 -> yast2-samba-client-3.1.7.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-3.1.5/MAINTAINER new/yast2-samba-client-3.1.7/MAINTAINER
--- old/yast2-samba-client-3.1.5/MAINTAINER 2014-03-19 17:17:39.000000000 +0100
+++ new/yast2-samba-client-3.1.7/MAINTAINER 2014-03-27 15:33:05.000000000 +0100
@@ -1 +1 @@
-Jiri Suchomel
+SUSE Samba Team
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-3.1.5/package/yast2-samba-client.changes new/yast2-samba-client-3.1.7/package/yast2-samba-client.changes
--- old/yast2-samba-client-3.1.5/package/yast2-samba-client.changes 2014-03-19 17:17:39.000000000 +0100
+++ new/yast2-samba-client-3.1.7/package/yast2-samba-client.changes 2014-03-27 15:33:05.000000000 +0100
@@ -1,4 +1,19 @@
-------------------------------------------------------------------
+Thu Mar 27 13:48:04 UTC 2014 - ddiss@suse.com
+
+- Fix handling of CTDB primitives containing hyphens
+- Remove CTDB crm resource hierarchy assumption; (bnc#813462).
+- Add SUSE Samba Team as MAINTAINER
+- 3.1.7
+
+-------------------------------------------------------------------
+Wed Mar 26 15:26:51 UTC 2014 - nopower@suse.com
+
+- Add needed scr agent /usr/share/YaST2/scrconf/etc_ssh_ssh_config.scr;
+ (bnc#870230)
+- 3.1.6
+
+-------------------------------------------------------------------
Wed Mar 19 14:00:02 UTC 2014 - ddiss@suse.com
- Fix standalone AD join from a HA cluster; (bnc#865445).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-3.1.5/package/yast2-samba-client.spec new/yast2-samba-client-3.1.7/package/yast2-samba-client.spec
--- old/yast2-samba-client-3.1.5/package/yast2-samba-client.spec 2014-03-19 17:17:39.000000000 +0100
+++ new/yast2-samba-client-3.1.7/package/yast2-samba-client.spec 2014-03-27 15:33:05.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-samba-client
-Version: 3.1.5
+Version: 3.1.7
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-3.1.5/src/Makefile.am new/yast2-samba-client-3.1.7/src/Makefile.am
--- old/yast2-samba-client-3.1.5/src/Makefile.am 2014-03-19 17:17:39.000000000 +0100
+++ new/yast2-samba-client-3.1.7/src/Makefile.am 2014-03-27 15:33:05.000000000 +0100
@@ -24,7 +24,8 @@
scrconf_DATA = \
scrconf/cfg_smbconf.scr \
scrconf/pam_mount.scr \
- scrconf/etc_security_winbind.scr
+ scrconf/etc_security_winbind.scr \
+ scrconf/etc_ssh_ssh_config.scr
agent_SCRIPTS = \
servers_non_y2/ag_pam_mount
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-3.1.5/src/modules/SambaNetJoin.pm new/yast2-samba-client-3.1.7/src/modules/SambaNetJoin.pm
--- old/yast2-samba-client-3.1.5/src/modules/SambaNetJoin.pm 2014-03-19 17:17:39.000000000 +0100
+++ new/yast2-samba-client-3.1.7/src/modules/SambaNetJoin.pm 2014-03-27 15:33:05.000000000 +0100
@@ -44,9 +44,6 @@
# name of base resource
my $rsc_id = "";
-# name of clone resource
-my $clone_id = "";
-
# Helper function to execute crm binary (internal only, not part of API).
# Takes all arguments in one string.
sub CRMCall {
@@ -112,11 +109,8 @@
# find out resource and clone ids, to do later crm operations with
my $show = CRMCall ("configure save -");
- if ($show =~ /primitive (\w+) ocf:heartbeat:CTDB/) {
+ if ($show =~ /primitive (\S+) ocf:heartbeat:CTDB/) {
$rsc_id = $1;
- if ($show =~ /clone (.+) $rsc_id/) {
- $clone_id = $1;
- }
}
else {
return FALSE;
@@ -186,7 +180,7 @@
# 6. Create the Kerberbos configuration file /etc/krb5.conf (the tmp one from Join is enough)
# 7. Cleanup CTDB:
- CRMCall ("resource cleanup $clone_id");
+ CRMCall ("resource cleanup $rsc_id");
# 8. Wait until the unhealty status disappears.
my $start = time;
@@ -216,13 +210,13 @@
# 10. Change the ctdb_manages_winbind option:
# a. Stop the ctdb resource:
- CRMCall ("resource stop $clone_id");
+ 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 $clone_id");
+ CRMCall ("resource start $rsc_id");
$cleanup_needed = FALSE;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-3.1.5/src/scrconf/etc_ssh_ssh_config.scr new/yast2-samba-client-3.1.7/src/scrconf/etc_ssh_ssh_config.scr
--- old/yast2-samba-client-3.1.5/src/scrconf/etc_ssh_ssh_config.scr 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-samba-client-3.1.7/src/scrconf/etc_ssh_ssh_config.scr 2014-03-27 15:33:05.000000000 +0100
@@ -0,0 +1,33 @@
+/**
+ * File:
+ * etc_ssh_ssh_config.scr
+ * Summary:
+ * SCR Agent for reading/writing /etc/ssh/ssh_config using the ini-agent
+ * For the config file format, see man ssh (1).
+ *
+ * $Id$
+ *
+ * Read/Sets the values defined in <tt>/etc/ssh/ssh_config</tt>.
+ */
+.etc.ssh.ssh_config
+
+`ag_ini(
+ `IniAgent(
+ "/etc/ssh/ssh_config",
+ $[
+ "options" : [ "global_values"],
+ "comments": [ "^[ \t]*#.*", "#.*", "^[ \t]*$" ],
+ "sections" : [
+ $[
+ "begin" : [ "^[ \t]*Host[ \t]*(.+)[ \t]*$", "Host %s" ],
+ ],
+ ],
+ "params" : [
+ $[
+ "match" : [ "^[ \t]*([a-zA-Z0-9_]+)[ \t]*[=]*[ \t]*(.+)[ \t]*$",
+ "%s %s" ]
+ ]
+ ]
+ ]
+ )
+)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
