Hello community,
here is the log from the commit of package yast2-samba-server for
openSUSE:Factory checked in at 2013-09-23 11:26:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-samba-server (Old)
and /work/SRC/openSUSE:Factory/.yast2-samba-server.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-samba-server"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-samba-server/yast2-samba-server.changes
2013-09-14 19:09:17.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.yast2-samba-server.new/yast2-samba-server.changes
2013-09-23 11:26:06.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Sep 13 15:57:19 UTC 2013 - [email protected]
+
+- Add "Utilize Btrfs Features" checkbox for shares.
+- 3.0.3
+
+-------------------------------------------------------------------
Old:
----
yast2-samba-server-3.0.2.tar.bz2
New:
----
yast2-samba-server-3.0.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-samba-server.spec ++++++
--- /var/tmp/diff_new_pack.Z1kRdn/_old 2013-09-23 11:26:07.000000000 +0200
+++ /var/tmp/diff_new_pack.Z1kRdn/_new 2013-09-23 11:26:07.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-samba-server
-Version: 3.0.2
+Version: 3.0.3
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-samba-server-3.0.2.tar.bz2 -> yast2-samba-server-3.0.3.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-samba-server-3.0.2/VERSION
new/yast2-samba-server-3.0.3/VERSION
--- old/yast2-samba-server-3.0.2/VERSION 2013-09-13 16:46:52.000000000
+0200
+++ new/yast2-samba-server-3.0.3/VERSION 2013-09-17 17:41:54.000000000
+0200
@@ -1 +1 @@
-3.0.2
+3.0.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-samba-server-3.0.2/configure
new/yast2-samba-server-3.0.3/configure
--- old/yast2-samba-server-3.0.2/configure 2013-09-13 16:52:53.000000000
+0200
+++ new/yast2-samba-server-3.0.3/configure 2013-09-17 17:42:08.000000000
+0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for yast2-samba-server 3.0.2.
+# Generated by GNU Autoconf 2.69 for yast2-samba-server 3.0.3.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -579,8 +579,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-samba-server'
PACKAGE_TARNAME='yast2-samba-server'
-PACKAGE_VERSION='3.0.2'
-PACKAGE_STRING='yast2-samba-server 3.0.2'
+PACKAGE_VERSION='3.0.3'
+PACKAGE_STRING='yast2-samba-server 3.0.3'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
PACKAGE_URL=''
@@ -1249,7 +1249,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-samba-server 3.0.2 to adapt to many kinds of
systems.
+\`configure' configures yast2-samba-server 3.0.3 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1321,7 +1321,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-samba-server 3.0.2:";;
+ short | recursive ) echo "Configuration of yast2-samba-server 3.0.3:";;
esac
cat <<\_ACEOF
@@ -1401,7 +1401,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-samba-server configure 3.0.2
+yast2-samba-server configure 3.0.3
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1418,7 +1418,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-samba-server $as_me 3.0.2, which was
+It was created by yast2-samba-server $as_me 3.0.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2357,7 +2357,7 @@
# Define the identity of the package.
PACKAGE='yast2-samba-server'
- VERSION='3.0.2'
+ VERSION='3.0.3'
cat >>confdefs.h <<_ACEOF
@@ -2480,7 +2480,7 @@
-VERSION="3.0.2"
+VERSION="3.0.3"
RPMNAME="yast2-samba-server"
MAINTAINER="Jiří Suchomel <[email protected]>"
@@ -3433,7 +3433,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-samba-server $as_me 3.0.2, which was
+This file was extended by yast2-samba-server $as_me 3.0.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3486,7 +3486,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-yast2-samba-server config.status 3.0.2
+yast2-samba-server config.status 3.0.3
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-samba-server-3.0.2/configure.ac
new/yast2-samba-server-3.0.3/configure.ac
--- old/yast2-samba-server-3.0.2/configure.ac 2013-09-13 16:52:49.000000000
+0200
+++ new/yast2-samba-server-3.0.3/configure.ac 2013-09-17 17:42:04.000000000
+0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 3.0.5 - DO NOT EDIT! --
dnl (edit configure.ac.in or configure.in.in instead)
-AC_INIT(yast2-samba-server, 3.0.2, http://bugs.opensuse.org/,
yast2-samba-server)
+AC_INIT(yast2-samba-server, 3.0.3, http://bugs.opensuse.org/,
yast2-samba-server)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="3.0.2"
+VERSION="3.0.3"
RPMNAME="yast2-samba-server"
MAINTAINER="Jiří Suchomel <[email protected]>"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-samba-server-3.0.2/src/include/samba-server/dialogs.rb
new/yast2-samba-server-3.0.3/src/include/samba-server/dialogs.rb
--- old/yast2-samba-server-3.0.2/src/include/samba-server/dialogs.rb
2013-09-13 16:46:52.000000000 +0200
+++ new/yast2-samba-server-3.0.3/src/include/samba-server/dialogs.rb
2013-09-17 17:41:54.000000000 +0200
@@ -83,6 +83,7 @@
@autoyast_warning_done = false
@snapper_available = nil
+ @btrfs_available = nil
end
# routines
@@ -98,21 +99,38 @@
@snapper_available
end
+ # check if Btrfs support is available (initial check)
+ def btrfs_available?
+ if @btrfs_available.nil?
+ @btrfs_available =
+ # check for the presence of Samba's Btrfs VFS module
+ 0 == SCR.Execute(path(".target.bash"), "smbd --build-options | grep
vfs_btrfs_init")
+ end
+ @btrfs_available
+ end
+
# check if given path points to btrfs subvolume
def subvolume?(path)
return false unless path
stat = SCR.Read(path(".target.stat"), path)
- # 1. is btrfs subvolume
- if stat["inode"] == 256 &&
- # 2. has snapper config
- 0 == SCR.Execute(path(".target.bash"), "grep 'SUBVOLUME=\"#{path}\"'
/etc/snapper/configs/*")
+ if stat["inode"] == 256
return true
else
return false
end
end
+ # check if given path has a corresponding snapper configuration
+ def snapper_cfg?(path)
+ return false unless path
+
+ if 0 == SCR.Execute(path(".target.bash"), "grep 'SUBVOLUME=\"#{path}\"'
/etc/snapper/configs/*")
+ return true
+ else
+ return false
+ end
+ end
def sharesItems(filt)
shares = SambaConfig.GetShares
@@ -928,7 +946,9 @@
# checkbox label
Left(CheckBox(Id(:inherit_acls), _("&Inherit ACLs"), true)),
# checkbox label
- Left(CheckBox(Id(:snapper_support), _("Expose Snapshots"),
false))
+ Left(CheckBox(Id(:snapper_support), _("Expose Snapshots"),
false)),
+ # checkbox label
+ Left(CheckBox(Id(:btrfs_support), _("Utilize Btrfs Features"),
false))
),
HSpacing(1)
))
@@ -946,7 +966,8 @@
Wizard.HideAbortButton
UI.SetFocus(Id(:name))
- UI.ChangeWidget(Id(:snapper_support), :Enabled, snapper_available? &&
subvolume?(default_path))
+ UI.ChangeWidget(Id(:snapper_support), :Enabled, snapper_available? &&
subvolume?(default_path) && snapper_cfg?(default_path))
+ UI.ChangeWidget(Id(:btrfs_support), :Enabled, btrfs_available? &&
subvolume?(default_path))
ret = nil
begin
@@ -974,7 +995,10 @@
if ret == :path
if snapper_available?
- UI.ChangeWidget(Id(:snapper_support), :Enabled,
subvolume?(pathvalue))
+ UI.ChangeWidget(Id(:snapper_support), :Enabled,
subvolume?(pathvalue) && snapper_cfg?(pathvalue))
+ end
+ if btrfs_available?
+ UI.ChangeWidget(Id(:btrfs_support), :Enabled,
subvolume?(pathvalue))
end
ret = nil
elsif ret == :browse
@@ -983,9 +1007,14 @@
if dir
UI.ChangeWidget(Id(:path), :Value, dir)
if snapper_available?
+ subvolume_cfg = subvolume?(dir) && snapper_cfg?(dir)
+ UI.ChangeWidget(Id(:snapper_support), :Enabled, subvolume_cfg)
+ UI.ChangeWidget(Id(:snapper_support), :Value, false) unless
subvolume_cfg
+ end
+ if btrfs_available?
subvolume = subvolume?(dir)
- UI.ChangeWidget(Id(:snapper_support), :Enabled, subvolume)
- UI.ChangeWidget(Id(:snapper_support), :Value, false) unless
subvolume
+ UI.ChangeWidget(Id(:btrfs_support), :Enabled, subvolume)
+ UI.ChangeWidget(Id(:btrfs_support), :Value, false) unless
subvolume
end
end
ret = nil
@@ -1027,8 +1056,12 @@
res["read only"] = read_only ? "Yes" : "No"
res["inherit acls"] = inherit_acls ? "Yes" : "No"
res["path"] = pathvalue
+ res["vfs objects"] = ""
if snapper_available? && UI.QueryWidget(Id(:snapper_support),
:Value)
- res["vfs objects"] = "snapper"
+ res["vfs objects"] << "snapper "
+ end
+ if btrfs_available? && UI.QueryWidget(Id(:btrfs_support), :Value)
+ res["vfs objects"] << "btrfs "
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-samba-server-3.0.2/src/include/samba-server/helps.rb
new/yast2-samba-server-3.0.3/src/include/samba-server/helps.rb
--- old/yast2-samba-server-3.0.2/src/include/samba-server/helps.rb
2013-09-13 16:46:52.000000000 +0200
+++ new/yast2-samba-server-3.0.3/src/include/samba-server/helps.rb
2013-09-17 17:41:54.000000000 +0200
@@ -271,7 +271,9 @@
) +
# add new share dialog help
_("<p>With <b>Expose Snapshots</b> selected, Samba exposes snapshots
created by Snapper for access and manipulation by CIFS/SMB clients.
-This option is only available if Samba offers Snapper support, and the Share
Path corresponds to a Btrfs backed Snapper configuration subvolume.</p>"),
+This option is only available if Samba offers Snapper support, and the Share
Path corresponds to a Btrfs backed Snapper configuration subvolume.</p>") +
+ _("<p><b>Utilize Btrfs Features</b> instructs Samba to take
advantage of features specific to the Btrfs filesystem.
+This option is only available if Samba offers Btrfs support, and the Share
Path is a Btrfs subvolume.</p>"),
# help for LDAP Settings dialog
"samba_ldap_setting_auth_widget" => _(
"<p><b><big>LDAP Settings</big></b><br>\n" +
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
