Hello community,
here is the log from the commit of package yast2-nfs-server for openSUSE:12.2
checked in at 2012-08-22 14:38:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.2/yast2-nfs-server (Old)
and /work/SRC/openSUSE:12.2/.yast2-nfs-server.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-nfs-server", Maintainer is "mvid...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:12.2/yast2-nfs-server/yast2-nfs-server.changes
2012-07-30 02:38:26.000000000 +0200
+++ /work/SRC/openSUSE:12.2/.yast2-nfs-server.new/yast2-nfs-server.changes
2012-08-22 14:38:16.000000000 +0200
@@ -1,0 +2,12 @@
+Thu Aug 16 08:03:24 UTC 2012 - mfi...@suse.com
+
+- allow colon in export options, see man 5 exports (sec= option)
+- bnc#775814
+- 2.21.4
+
+-------------------------------------------------------------------
+Thu Mar 29 15:28:39 CEST 2012 - jsuch...@suse.cz
+
+- merged proofread texts
+
+-------------------------------------------------------------------
Old:
----
yast2-nfs-server-2.21.3.tar.bz2
New:
----
yast2-nfs-server-2.21.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-nfs-server.spec ++++++
--- /var/tmp/diff_new_pack.uftjdj/_old 2012-08-22 14:38:16.000000000 +0200
+++ /var/tmp/diff_new_pack.uftjdj/_new 2012-08-22 14:38:16.000000000 +0200
@@ -16,17 +16,18 @@
#
-
Name: yast2-nfs-server
-Version: 2.21.3
+Version: 2.21.4
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: yast2-nfs-server-%{version}.tar.bz2
-Group: System/YaST
-License: GPL-2.0+
-BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools
yast2-testsuite
+BuildRequires: perl-XML-Writer
+BuildRequires: update-desktop-files
+BuildRequires: yast2
+BuildRequires: yast2-devtools
+BuildRequires: yast2-testsuite
# Service::Find
# Wizard::SetDesktopTitleAndIcon
Requires: yast2 >= 2.21.22
@@ -36,6 +37,8 @@
BuildArch: noarch
Summary: YaST2 - NFS Server Configuration
+License: GPL-2.0+
+Group: System/YaST
%description
The YaST2 component for configuration of an NFS server. NFS stands for
++++++ yast2-nfs-server-2.21.3.tar.bz2 -> yast2-nfs-server-2.21.4.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-nfs-server-2.21.3/COPYING
new/yast2-nfs-server-2.21.4/COPYING
--- old/yast2-nfs-server-2.21.3/COPYING 2012-03-16 09:56:04.000000000 +0100
+++ new/yast2-nfs-server-2.21.4/COPYING 2012-08-17 08:40:27.000000000 +0200
@@ -1,12 +1,12 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
- Preamble
+ Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
@@ -15,7 +15,7 @@
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
+the GNU Lesser General Public License instead.) You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
@@ -55,8 +55,8 @@
The precise terms and conditions for copying, distribution and
modification follow.
-
- GNU GENERAL PUBLIC LICENSE
+
+ GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License applies to any program or other work which contains
@@ -110,7 +110,7 @@
License. (Exception: if the Program itself is interactive but
does not normally print such an announcement, your work based on
the Program is not required to print an announcement.)
-
+
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.
-
+
4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
-
+
8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
@@ -255,7 +255,7 @@
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.
- NO WARRANTY
+ NO WARRANTY
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
@@ -277,9 +277,9 @@
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
@@ -303,17 +303,16 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:
- Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision version 69, Copyright (C) year name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
@@ -336,5 +335,5 @@
This General Public License does not permit incorporating your program into
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
+library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-nfs-server-2.21.3/Makefile.am.common
new/yast2-nfs-server-2.21.4/Makefile.am.common
--- old/yast2-nfs-server-2.21.3/Makefile.am.common 2012-03-16
09:12:54.000000000 +0100
+++ new/yast2-nfs-server-2.21.4/Makefile.am.common 2012-08-17
08:39:21.000000000 +0200
@@ -30,7 +30,7 @@
dist-hook: check-syntax
CHECK_SYNTAX = true
-check-syntax: $(client_DATA) $(ycpchook)
+check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles)
@if test "$(client_DATA)"; then \
if $(CHECK_SYNTAX); then \
TO_CHECK="$(filter %.ycp,$^)"; \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-nfs-server-2.21.3/VERSION
new/yast2-nfs-server-2.21.4/VERSION
--- old/yast2-nfs-server-2.21.3/VERSION 2012-03-16 09:54:33.000000000 +0100
+++ new/yast2-nfs-server-2.21.4/VERSION 2012-08-17 08:39:09.000000000 +0200
@@ -1 +1 @@
-2.21.3
+2.21.4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-nfs-server-2.21.3/agents/Makefile.am
new/yast2-nfs-server-2.21.4/agents/Makefile.am
--- old/yast2-nfs-server-2.21.3/agents/Makefile.am 2012-02-06
08:05:20.000000000 +0100
+++ new/yast2-nfs-server-2.21.4/agents/Makefile.am 2012-08-17
08:39:09.000000000 +0200
@@ -1,7 +1,7 @@
#
# Makefile.am for nfs-server/agents
#
-# $Id: Makefile.am 36506 2007-02-26 15:36:26Z mvidner $
+# $Id$
#
agent_SCRIPTS = ag_exports\
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-nfs-server-2.21.3/agents/Makefile.in
new/yast2-nfs-server-2.21.4/agents/Makefile.in
--- old/yast2-nfs-server-2.21.3/agents/Makefile.in 2012-03-16
09:12:59.000000000 +0100
+++ new/yast2-nfs-server-2.21.4/agents/Makefile.in 2012-08-17
08:39:25.000000000 +0200
@@ -18,7 +18,7 @@
#
# Makefile.am for nfs-server/agents
#
-# $Id: Makefile.am 36506 2007-02-26 15:36:26Z mvidner $
+# $Id$
#
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-nfs-server-2.21.3/agents/ag_exports
new/yast2-nfs-server-2.21.4/agents/ag_exports
--- old/yast2-nfs-server-2.21.3/agents/ag_exports 2012-02-06
08:05:20.000000000 +0100
+++ new/yast2-nfs-server-2.21.4/agents/ag_exports 2012-08-17
08:39:09.000000000 +0200
@@ -1,6 +1,6 @@
#!/usr/bin/perl -w
#
-# $Id: ag_exports 33404 2006-10-13 13:01:27Z mvidner $
+# $Id$
# Author: Martin Vidner <mvid...@suse.cz>
#
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-nfs-server-2.21.3/agents/etc_exports.scr
new/yast2-nfs-server-2.21.4/agents/etc_exports.scr
--- old/yast2-nfs-server-2.21.3/agents/etc_exports.scr 2012-02-06
08:05:20.000000000 +0100
+++ new/yast2-nfs-server-2.21.4/agents/etc_exports.scr 2012-08-17
08:39:09.000000000 +0200
@@ -29,7 +29,7 @@
* "mountpoint":"/pub"]]))
* (true)
*
- * $Id: etc_exports.scr 13018 2003-12-11 12:52:53Z jhumpol $
+ * $Id$
*
* Returns/Takes a <b>list of maps</b> containing the mountpoints and
* their options.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-nfs-server-2.21.3/autodocs-ycp.ami
new/yast2-nfs-server-2.21.4/autodocs-ycp.ami
--- old/yast2-nfs-server-2.21.3/autodocs-ycp.ami 2012-03-16
09:12:54.000000000 +0100
+++ new/yast2-nfs-server-2.21.4/autodocs-ycp.ami 2012-08-17
08:39:21.000000000 +0200
@@ -1,5 +1,5 @@
# -*- makefile -*- Automake include file
-# $Id: autodocs-ycp.ami 57644 2009-06-19 08:38:11Z mvidner $
+# $Id$
# Builds source documentation for YCP sources
# Uses ycpdoc
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-nfs-server-2.21.3/configure
new/yast2-nfs-server-2.21.4/configure
--- old/yast2-nfs-server-2.21.3/configure 2012-03-16 09:12:58.000000000
+0100
+++ new/yast2-nfs-server-2.21.4/configure 2012-08-17 08:39:24.000000000
+0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for yast2-nfs-server 2.21.2.
+# Generated by GNU Autoconf 2.68 for yast2-nfs-server 2.21.4.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-nfs-server'
PACKAGE_TARNAME='yast2-nfs-server'
-PACKAGE_VERSION='2.21.2'
-PACKAGE_STRING='yast2-nfs-server 2.21.2'
+PACKAGE_VERSION='2.21.4'
+PACKAGE_STRING='yast2-nfs-server 2.21.4'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
PACKAGE_URL=''
@@ -1231,7 +1231,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-nfs-server 2.21.2 to adapt to many kinds of
systems.
+\`configure' configures yast2-nfs-server 2.21.4 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1303,7 +1303,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-nfs-server 2.21.2:";;
+ short | recursive ) echo "Configuration of yast2-nfs-server 2.21.4:";;
esac
cat <<\_ACEOF
@@ -1383,7 +1383,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-nfs-server configure 2.21.2
+yast2-nfs-server configure 2.21.4
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1400,7 +1400,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-nfs-server $as_me 2.21.2, which was
+It was created by yast2-nfs-server $as_me 2.21.4, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2330,7 +2330,7 @@
# Define the identity of the package.
PACKAGE='yast2-nfs-server'
- VERSION='2.21.2'
+ VERSION='2.21.4'
cat >>confdefs.h <<_ACEOF
@@ -2452,7 +2452,7 @@
-VERSION="2.21.2"
+VERSION="2.21.4"
RPMNAME="yast2-nfs-server"
MAINTAINER="Martin Vidner <mvid...@suse.cz>"
@@ -3471,7 +3471,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-nfs-server $as_me 2.21.2, which was
+This file was extended by yast2-nfs-server $as_me 2.21.4, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3524,7 +3524,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-nfs-server config.status 2.21.2
+yast2-nfs-server config.status 2.21.4
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-nfs-server-2.21.3/configure.in
new/yast2-nfs-server-2.21.4/configure.in
--- old/yast2-nfs-server-2.21.3/configure.in 2012-03-16 09:12:54.000000000
+0100
+++ new/yast2-nfs-server-2.21.4/configure.in 2012-08-17 08:39:21.000000000
+0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-nfs-server
dnl
-dnl -- This file is generated by y2autoconf 2.21.7 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.23.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-nfs-server, 2.21.2, http://bugs.opensuse.org/, yast2-nfs-server)
+AC_INIT(yast2-nfs-server, 2.21.4, http://bugs.opensuse.org/, yast2-nfs-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="2.21.2"
+VERSION="2.21.4"
RPMNAME="yast2-nfs-server"
MAINTAINER="Martin Vidner <mvid...@suse.cz>"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-nfs-server-2.21.3/doc/Makefile.am
new/yast2-nfs-server-2.21.4/doc/Makefile.am
--- old/yast2-nfs-server-2.21.3/doc/Makefile.am 2012-02-06 08:05:20.000000000
+0100
+++ new/yast2-nfs-server-2.21.4/doc/Makefile.am 2012-08-17 08:39:09.000000000
+0200
@@ -1,7 +1,7 @@
#
# Makefile.am for nfs-server/doc
#
-# $Id: Makefile.am 3714 2002-07-17 16:47:30Z mvidner $
+# $Id$
#
SUBDIRS = autodocs
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-nfs-server-2.21.3/doc/Makefile.in
new/yast2-nfs-server-2.21.4/doc/Makefile.in
--- old/yast2-nfs-server-2.21.3/doc/Makefile.in 2012-03-16 09:12:59.000000000
+0100
+++ new/yast2-nfs-server-2.21.4/doc/Makefile.in 2012-08-17 08:39:25.000000000
+0200
@@ -18,7 +18,7 @@
#
# Makefile.am for nfs-server/doc
#
-# $Id: Makefile.am 3714 2002-07-17 16:47:30Z mvidner $
+# $Id$
#
VPATH = @srcdir@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-nfs-server-2.21.3/doc/autodocs/Makefile.in
new/yast2-nfs-server-2.21.4/doc/autodocs/Makefile.in
--- old/yast2-nfs-server-2.21.3/doc/autodocs/Makefile.in 2012-03-16
09:12:59.000000000 +0100
+++ new/yast2-nfs-server-2.21.4/doc/autodocs/Makefile.in 2012-08-17
08:39:25.000000000 +0200
@@ -18,7 +18,7 @@
# Makefile.am for YCP module .../doc/autodocs
# -*- makefile -*- Automake include file
-# $Id: autodocs-ycp.ami 57644 2009-06-19 08:38:11Z mvidner $
+# $Id$
# Builds source documentation for YCP sources
# Uses ycpdoc
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-nfs-server-2.21.3/doc/index.html
new/yast2-nfs-server-2.21.4/doc/index.html
--- old/yast2-nfs-server-2.21.3/doc/index.html 2012-02-06 08:05:20.000000000
+0100
+++ new/yast2-nfs-server-2.21.4/doc/index.html 2012-08-17 08:39:09.000000000
+0200
@@ -1,7 +1,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
<html>
<head>
-<!-- $Id: index.html 3714 2002-07-17 16:47:30Z mvidner $ -->
+<!-- $Id$ -->
<meta name="generator" content="HTML Tidy, see www.w3.org">
<title>Network Filesystem Server (NFS) - YaST2 configuration module</title>
<style type="text/css">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-nfs-server-2.21.3/src/Makefile.in
new/yast2-nfs-server-2.21.4/src/Makefile.in
--- old/yast2-nfs-server-2.21.3/src/Makefile.in 2012-03-16 09:12:59.000000000
+0100
+++ new/yast2-nfs-server-2.21.4/src/Makefile.in 2012-08-17 08:39:25.000000000
+0200
@@ -560,7 +560,7 @@
rm ${NEWDEP}
dist-hook: check-syntax
-check-syntax: $(client_DATA) $(ycpchook)
+check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles)
@if test "$(client_DATA)"; then \
if $(CHECK_SYNTAX); then \
TO_CHECK="$(filter %.ycp,$^)"; \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-nfs-server-2.21.3/src/NfsServer.ycp
new/yast2-nfs-server-2.21.4/src/NfsServer.ycp
--- old/yast2-nfs-server-2.21.3/src/NfsServer.ycp 2012-02-06
08:05:21.000000000 +0100
+++ new/yast2-nfs-server-2.21.4/src/NfsServer.ycp 2012-08-17
08:39:09.000000000 +0200
@@ -11,7 +11,7 @@
* Authors:
* Martin Vidner <mvid...@suse.cz>
*
- * $Id: NfsServer.ycp 51773 2008-10-02 09:10:04Z mvidner $
+ * $Id$
*
*/
@@ -345,7 +345,7 @@
{
if (! Service::Start("idmapd"))
{
- Report::Error(_("Unable to start idmapd. Please
check your domain setting."));
+ Report::Error(_("Unable to start idmapd. Check
your domain setting."));
ok = false;
}
}
@@ -353,7 +353,7 @@
{
if (! Service::Restart("idmapd"))
{
- Report::Error(_("Unable to restart idmapd"));
+ Report::Error(_("Unable to restart idmapd."));
ok = false;
}
}
@@ -364,7 +364,7 @@
{
if(!Service::Stop("idmapd"))
{
- Report::Error(_("Unable to stop idmapd"));
+ Report::Error(_("Unable to stop idmapd."));
ok = false;
}
}
@@ -377,7 +377,7 @@
if (! Service::Start("svcgssd"))
{
// FIXME svcgssd is gone! (only nfsserver is left)
- Report::Error(_("Unable to start svcgssd.
Please ensure your kerberos and gssapi (nfs-utils) set up is correct."));
+ Report::Error(_("Unable to start svcgssd.
Ensure your kerberos and gssapi (nfs-utils) setup is correct."));
ok = false;
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-nfs-server-2.21.3/src/nfs-server.ycp
new/yast2-nfs-server-2.21.4/src/nfs-server.ycp
--- old/yast2-nfs-server-2.21.3/src/nfs-server.ycp 2012-02-06
08:05:21.000000000 +0100
+++ new/yast2-nfs-server-2.21.4/src/nfs-server.ycp 2012-08-17
08:39:09.000000000 +0200
@@ -1,7 +1,7 @@
/**
* Author: Martin Vidner <mvid...@suse.cz>
* Summary: Just a redirection
- * $Id: nfs-server.ycp 4399 2002-08-09 13:46:40Z mvidner $
+ * $Id$
*/
{
string target = "nfs_server";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-nfs-server-2.21.3/src/nfs_server.ycp
new/yast2-nfs-server-2.21.4/src/nfs_server.ycp
--- old/yast2-nfs-server-2.21.3/src/nfs_server.ycp 2012-02-06
08:05:21.000000000 +0100
+++ new/yast2-nfs-server-2.21.4/src/nfs_server.ycp 2012-08-17
08:39:09.000000000 +0200
@@ -13,7 +13,7 @@
* Dan Vesely <d...@suse.cz>
* Martin Vidner <mvid...@suse.cz>
*
- * $Id: nfs_server.ycp 65882 2011-09-21 09:43:46Z visnov $
+ * $Id$
*
* Module for the configuration of the nfs server
*/
@@ -254,14 +254,14 @@
if (v4domain != "") {
if (!NfsServer::enable_nfsv4) {
- CommandLine::Print(_("Domain cannot be set without enabling NFSv4.
Please use the 'set enablev4' command."));
+ CommandLine::Print(_("Domain cannot be set without enabling NFSv4.
Use the 'set enablev4' command."));
return false;
}
NfsServer::domain = v4domain;
}
if (nfs_sec == "" && enablev4 == "" && v4domain == "") {
- CommandLine::Print(_("Command set must be used as in 'set
option=value'. Please use 'set help' to get information about the options."));
+ CommandLine::Print(_("Command 'set' must be used in the form 'set
option=value'. Use 'set help' to get information about available options."));
return false;
}
@@ -300,7 +300,7 @@
],
"set" : $[
"handler" : NfsServerSetOptionHandler,
- "help" : _("Set the parameters for domain, security and
enablev4"),
+ "help" : _("Set the parameters for domain, security and
enablev4."),
]
],
"options" : $[
@@ -319,15 +319,15 @@
],
"domain" : $[
"type" : "string",
- "help" : _("Domain specification for NFSv4 Idmapping, such as
'localdomain' or 'abc.com' etc."),
+ "help" : _("Domain specification for NFSv4 ID mapping, such as
'localdomain' or 'abc.com' etc."),
],
"enablev4" : $[
"type" : "string",
- "help" : _("Yes/No option for enabling/disabling support for
NFSv4"),
+ "help" : _("Yes/No option for enabling/disabling support for
NFSv4."),
],
"security" : $[
"type" : "string",
- "help" : _("Yes/No option for enabling/disabling secure NFS"),
+ "help" : _("Yes/No option for enabling/disabling secure NFS."),
]
],
"mappings" : $[
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-nfs-server-2.21.3/src/nfs_server_auto.ycp
new/yast2-nfs-server-2.21.4/src/nfs_server_auto.ycp
--- old/yast2-nfs-server-2.21.3/src/nfs_server_auto.ycp 2012-02-06
08:05:21.000000000 +0100
+++ new/yast2-nfs-server-2.21.4/src/nfs_server_auto.ycp 2012-08-17
08:39:09.000000000 +0200
@@ -11,7 +11,7 @@
* Authors:
* Martin Vidner <mvid...@suse.cz>
*
- * $Id: nfs_server_auto.ycp 20633 2005-01-03 14:52:39Z mvidner $
+ * $Id$
*
* This is a client for autoinstallation. It takes its arguments,
* goes through the configuration and return the setting.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-nfs-server-2.21.3/src/routines.ycp
new/yast2-nfs-server-2.21.4/src/routines.ycp
--- old/yast2-nfs-server-2.21.3/src/routines.ycp 2012-02-06
08:05:21.000000000 +0100
+++ new/yast2-nfs-server-2.21.4/src/routines.ycp 2012-08-17
08:39:09.000000000 +0200
@@ -13,7 +13,7 @@
* Dan Vesely <d...@suse.cz>
* Martin Vidner <mvid...@suse.cz>
*
- * $Id: routines.ycp 56140 2009-03-16 13:46:35Z mvidner $
+ * $Id$
*
* Network NFS routines
*
@@ -375,17 +375,18 @@
/**
* Check for the validity of export options:
- * [A-Za-z0-9=/.,_-]*
+ * [A-Za-z0-9=/.:,_-]*
* If invalid, a message is displayed.
* @param options spaces and parentheses already removed
* @return whether valid
*/
define boolean CheckExportOptions (string options) ``{
- if (regexpmatch (options, "[^A-Za-z0-9=/.,_-]"))
+ // colon is allowed for sec= option, see man 5 exports
+ if (regexpmatch (options, "[^A-Za-z0-9=/.:,_-]"))
{
// error popup message
Report::Error (_("Invalid option.
-Only letters, digits, and the characters =/.,_- are allowed."));
+Only letters, digits, and the characters =/.:,_- are allowed."));
return false;
}
return true;
@@ -453,7 +454,8 @@
// %1 is a list of exported paths
Report::Warning (sformat (_("There are unbalanced parentheses in
export options
for %1.
-Probably there is spurious whitespace in the configuration file."),
+Likely, there is a spurious whitespace in the configuration file.
+"),
bad_shares_s));
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-nfs-server-2.21.3/src/ui.ycp
new/yast2-nfs-server-2.21.4/src/ui.ycp
--- old/yast2-nfs-server-2.21.3/src/ui.ycp 2012-02-06 08:05:21.000000000
+0100
+++ new/yast2-nfs-server-2.21.4/src/ui.ycp 2012-08-17 08:39:09.000000000
+0200
@@ -13,7 +13,7 @@
* Dan Vesely (d...@suse.cz)
* Martin Vidner <mvid...@suse.cz>
*
- * $Id: ui.ycp 65882 2011-09-21 09:43:46Z visnov $
+ * $Id$
*
* Network NFS server dialogs
*
@@ -246,8 +246,9 @@
if (ret == `ok && !NfsServer::enable_nfsv4)
{
if (issubstring (opts,"fsid=0")) {
- Popup::Message(_("'fsid=0'is not a valid option unless
-NFSv4 is enabled (previous page)"));
+ Popup::Message(_("'fsid=0' is not a valid option unless
+NFSv4 is enabled (previous page).
+"));
ret = nil;
}
}
@@ -330,15 +331,15 @@
help_text = help_text + fw_cwm_widget["help"]:"";
help_text = help_text +
-_("<P>If the server needs to handle NFSv4 clients, check <B>Enable NFSv4</B>,
-and fill in the NFSv4 domain name you want the id mapping daemon to use. Leave
+_("<P>If the server needs to handle NFSv4 clients, check <B>Enable NFSv4</B>
+and fill in the NFSv4 domain name you want the ID mapping daemon to use. Leave
it as localdomain or refer to the man page for idmapd and idmapd.conf if you
are not sure.</P>
");
help_text = help_text +
// FIXME: use %1 as nfs-utils.src.rpm produces nfs-kernel-server.rpm
-_("<P>If the server and client must authenticate using GSS library, please
enable the <B>Enable GSS Security</B>
-checkbox. For being able to use GSS API, currently you need to have Kerberos
and gssapi (nfs-utils > 1.0.7) on your system</P>
+_("<P>If the server and client must authenticate using GSS library, check the
+<B>Enable GSS Security</B> box. To use GSS API, you currently need to have
Kerberos and gssapi (nfs-utils > 1.0.7) on your system.</P>
");
/* The end of the definitions */
@@ -509,7 +510,7 @@
if (NfsServer::enable_nfsv4)
{
// Help, part 4 of 5, caution about fsid=0 in case NFSv4 is enabled.
- help_text = help_text + _("<p>The NFSv4 option is enabled in the
previous page. Make sure that only one exported filesystem is marked with the
fsid=0 option for a particular client.</p>");
+ help_text = help_text + _("<p>NFSv4 is enabled. Make sure that only
one exported filesystem is marked with the fsid=0 option for a particular
client.</p>");
// bnc#471874, NFS4 is complex and so is our UI :-/
// but let's fix the help at least
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-nfs-server-2.21.3/testsuite/run/runtest-epag.sh
new/yast2-nfs-server-2.21.4/testsuite/run/runtest-epag.sh
--- old/yast2-nfs-server-2.21.3/testsuite/run/runtest-epag.sh 2012-02-06
08:05:21.000000000 +0100
+++ new/yast2-nfs-server-2.21.4/testsuite/run/runtest-epag.sh 2012-08-17
08:39:09.000000000 +0200
@@ -1,5 +1,5 @@
#! /bin/bash
-# $Id: runtest-epag.sh 13701 2004-01-30 15:37:41Z mvidner $
+# $Id$
# params:
# $1 "read" or "write"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-nfs-server-2.21.3/testsuite/tests/readwrite-unfsd.ycp
new/yast2-nfs-server-2.21.4/testsuite/tests/readwrite-unfsd.ycp
--- old/yast2-nfs-server-2.21.3/testsuite/tests/readwrite-unfsd.ycp
2012-03-16 09:53:44.000000000 +0100
+++ new/yast2-nfs-server-2.21.4/testsuite/tests/readwrite-unfsd.ycp
2012-08-17 08:39:09.000000000 +0200
@@ -8,7 +8,7 @@
* Authors:
* Martin Vidner <mvid...@suse.cz>
*
- * $Id: readwrite-unfsd.ycp 67640 2012-03-16 08:53:05Z mfilka $
+ * $Id$
*/
{
// testedfiles: NfsServer.ycp Service.ycp Report.ycp Testsuite.ycp
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-nfs-server-2.21.3/testsuite/tests/readwrite.ycp
new/yast2-nfs-server-2.21.4/testsuite/tests/readwrite.ycp
--- old/yast2-nfs-server-2.21.3/testsuite/tests/readwrite.ycp 2012-03-16
09:53:44.000000000 +0100
+++ new/yast2-nfs-server-2.21.4/testsuite/tests/readwrite.ycp 2012-08-17
08:39:09.000000000 +0200
@@ -8,7 +8,7 @@
* Authors:
* Martin Vidner <mvid...@suse.cz>
*
- * $Id: readwrite.ycp 67640 2012-03-16 08:53:05Z mfilka $
+ * $Id$
*/
{
// testedfiles: NfsServer.ycp Service.ycp Report.ycp Testsuite.ycp
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-nfs-server-2.21.3/testsuite/tests/readwrite2.ycp
new/yast2-nfs-server-2.21.4/testsuite/tests/readwrite2.ycp
--- old/yast2-nfs-server-2.21.3/testsuite/tests/readwrite2.ycp 2012-03-16
09:53:44.000000000 +0100
+++ new/yast2-nfs-server-2.21.4/testsuite/tests/readwrite2.ycp 2012-08-17
08:39:09.000000000 +0200
@@ -8,7 +8,7 @@
* Authors:
* Martin Vidner <mvid...@suse.cz>
*
- * $Id: readwrite2.ycp 67640 2012-03-16 08:53:05Z mfilka $
+ * $Id$
*/
{
// testedfiles: NfsServer.ycp Service.ycp Report.ycp Testsuite.ycp
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-nfs-server-2.21.3/testsuite/tests/routines1.ycp
new/yast2-nfs-server-2.21.4/testsuite/tests/routines1.ycp
--- old/yast2-nfs-server-2.21.3/testsuite/tests/routines1.ycp 2012-02-06
08:05:21.000000000 +0100
+++ new/yast2-nfs-server-2.21.4/testsuite/tests/routines1.ycp 2012-08-17
08:39:09.000000000 +0200
@@ -8,7 +8,7 @@
* Authors:
* Martin Vidner <mvid...@suse.cz>
*
- * $Id: routines1.ycp 17885 2004-06-17 07:46:23Z mvidner $
+ * $Id$
*/
{
// testedfiles: routines.ycp Testsuite.ycp
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-nfs-server-2.21.3/testsuite/tests/routines2.out
new/yast2-nfs-server-2.21.4/testsuite/tests/routines2.out
--- old/yast2-nfs-server-2.21.3/testsuite/tests/routines2.out 2012-02-06
08:05:21.000000000 +0100
+++ new/yast2-nfs-server-2.21.4/testsuite/tests/routines2.out 2012-08-17
08:39:09.000000000 +0200
@@ -9,5 +9,6 @@
Return false
Return true
Return true
+Return true
Return false
Return false
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-nfs-server-2.21.3/testsuite/tests/routines2.ycp
new/yast2-nfs-server-2.21.4/testsuite/tests/routines2.ycp
--- old/yast2-nfs-server-2.21.3/testsuite/tests/routines2.ycp 2012-02-06
08:05:21.000000000 +0100
+++ new/yast2-nfs-server-2.21.4/testsuite/tests/routines2.ycp 2012-08-17
08:39:09.000000000 +0200
@@ -8,7 +8,7 @@
* Authors:
* Martin Vidner <mvid...@suse.cz>
*
- * $Id: routines2.ycp 17885 2004-06-17 07:46:23Z mvidner $
+ * $Id$
*/
{
// testedfiles: routines.ycp Testsuite.ycp
@@ -38,6 +38,8 @@
TEST (``(CheckExportOptions ("rw,all_squash")), [], nil);
TEST (``(CheckExportOptions ("invalid:\options <> ?")), [], nil);
+ // colon is valid
+ TEST (``(CheckExportOptions ("sec=none:kerb5")), [], nil);
TEST (``(CheckExportOptions_strict ("ro,insecure,all_squash")), [], nil);
TEST (``(CheckExportOptions_strict (test_options)), [], nil);
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
