Hello community, here is the log from the commit of package yast2-nfs-client for openSUSE:Factory checked in at 2012-06-25 12:47:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-nfs-client (Old) and /work/SRC/openSUSE:Factory/.yast2-nfs-client.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-nfs-client", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-nfs-client/yast2-nfs-client.changes 2012-02-25 07:32:04.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-nfs-client.new/yast2-nfs-client.changes 2012-06-25 12:47:41.000000000 +0200 @@ -1,0 +2,11 @@ +Thu May 3 06:45:39 UTC 2012 - [email protected] + +- added option for enabling NFS4 GSS - bnc#681190 +- 2.21.6 + +------------------------------------------------------------------- +Thu Mar 29 15:28:12 CEST 2012 - [email protected] + +- merged proofread texts + +------------------------------------------------------------------- Old: ---- yast2-nfs-client-2.21.5.tar.bz2 New: ---- yast2-nfs-client-2.21.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-nfs-client.spec ++++++ --- /var/tmp/diff_new_pack.AXZtzL/_old 2012-06-25 12:47:42.000000000 +0200 +++ /var/tmp/diff_new_pack.AXZtzL/_new 2012-06-25 12:47:42.000000000 +0200 @@ -15,19 +15,19 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: yast2-nfs-client -Version: 2.21.5 +Version: 2.21.6 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-nfs-client-%{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 #ag_showexports moved to yast2 base #Wizard::SetDesktopTitleAndIcon Requires: yast2 >= 2.21.22 @@ -36,8 +36,10 @@ # showmount, #150382, #286300 Recommends: nfs-client -Provides: yast2-config-nfs yast2-config-nfs-devel -Obsoletes: yast2-config-nfs yast2-config-nfs-devel +Provides: yast2-config-nfs +Provides: yast2-config-nfs-devel +Obsoletes: yast2-config-nfs +Obsoletes: yast2-config-nfs-devel Provides: yast2-trans-nfs Obsoletes: yast2-trans-nfs Provides: yast2-config-network:/usr/lib/YaST2/clients/lan_nfs_client.ycp @@ -45,6 +47,8 @@ BuildArch: noarch Summary: YaST2 - NFS Configuration +License: GPL-2.0+ +Group: System/YaST Url: http://en.opensuse.org/Portal:YaST %description @@ -62,7 +66,6 @@ export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" -%{?suse_update_config:%{suse_update_config -f}} ./configure --libdir=%{_libdir} --prefix=%{_prefix} --mandir=%{_mandir} # V=1: verbose build in case we used AM_SILENT_RULES(yes) # so that RPM_OPT_FLAGS check works ++++++ yast2-nfs-client-2.21.5.tar.bz2 -> yast2-nfs-client-2.21.6.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-2.21.5/COPYING new/yast2-nfs-client-2.21.6/COPYING --- old/yast2-nfs-client-2.21.5/COPYING 2012-02-24 13:17:56.000000000 +0100 +++ new/yast2-nfs-client-2.21.6/COPYING 2012-06-20 13:31:01.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-client-2.21.5/Makefile.am.common new/yast2-nfs-client-2.21.6/Makefile.am.common --- old/yast2-nfs-client-2.21.5/Makefile.am.common 2012-02-08 09:15:49.000000000 +0100 +++ new/yast2-nfs-client-2.21.6/Makefile.am.common 2012-06-20 13:30: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-client-2.21.5/VERSION new/yast2-nfs-client-2.21.6/VERSION --- old/yast2-nfs-client-2.21.5/VERSION 2012-02-17 09:40:41.000000000 +0100 +++ new/yast2-nfs-client-2.21.6/VERSION 2012-06-20 13:28:44.000000000 +0200 @@ -1 +1 @@ -2.21.5 +2.21.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-2.21.5/agents/Makefile.am new/yast2-nfs-client-2.21.6/agents/Makefile.am --- old/yast2-nfs-client-2.21.5/agents/Makefile.am 2012-02-06 08:04:38.000000000 +0100 +++ new/yast2-nfs-client-2.21.6/agents/Makefile.am 2012-06-20 13:28:44.000000000 +0200 @@ -1,5 +1,5 @@ # # Makefile.am for nfs-client/agents # -# $Id: Makefile.am 52361 2008-10-20 10:49:20Z kmachalkova $ +# $Id$ # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-2.21.5/agents/Makefile.in new/yast2-nfs-client-2.21.6/agents/Makefile.in --- old/yast2-nfs-client-2.21.5/agents/Makefile.in 2012-02-08 09:15:53.000000000 +0100 +++ new/yast2-nfs-client-2.21.6/agents/Makefile.in 2012-06-20 13:30:24.000000000 +0200 @@ -346,7 +346,7 @@ # # Makefile.am for nfs-client/agents # -# $Id: Makefile.am 52361 2008-10-20 10:49:20Z kmachalkova $ +# $Id$ # # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-2.21.5/configure new/yast2-nfs-client-2.21.6/configure --- old/yast2-nfs-client-2.21.5/configure 2012-02-08 09:15:52.000000000 +0100 +++ new/yast2-nfs-client-2.21.6/configure 2012-06-20 13:30: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-client 2.21.2. +# Generated by GNU Autoconf 2.68 for yast2-nfs-client 2.21.6. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='yast2-nfs-client' PACKAGE_TARNAME='yast2-nfs-client' -PACKAGE_VERSION='2.21.2' -PACKAGE_STRING='yast2-nfs-client 2.21.2' +PACKAGE_VERSION='2.21.6' +PACKAGE_STRING='yast2-nfs-client 2.21.6' 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-client 2.21.2 to adapt to many kinds of systems. +\`configure' configures yast2-nfs-client 2.21.6 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-client 2.21.2:";; + short | recursive ) echo "Configuration of yast2-nfs-client 2.21.6:";; esac cat <<\_ACEOF @@ -1383,7 +1383,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-nfs-client configure 2.21.2 +yast2-nfs-client configure 2.21.6 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-client $as_me 2.21.2, which was +It was created by yast2-nfs-client $as_me 2.21.6, 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-client' - VERSION='2.21.2' + VERSION='2.21.6' cat >>confdefs.h <<_ACEOF @@ -2452,7 +2452,7 @@ -VERSION="2.21.2" +VERSION="2.21.6" RPMNAME="yast2-nfs-client" MAINTAINER="Martin Vidner <[email protected]>" @@ -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-client $as_me 2.21.2, which was +This file was extended by yast2-nfs-client $as_me 2.21.6, 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-client config.status 2.21.2 +yast2-nfs-client config.status 2.21.6 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-client-2.21.5/configure.in new/yast2-nfs-client-2.21.6/configure.in --- old/yast2-nfs-client-2.21.5/configure.in 2012-02-08 09:15:49.000000000 +0100 +++ new/yast2-nfs-client-2.21.6/configure.in 2012-06-20 13:30:21.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-nfs-client dnl -dnl -- This file is generated by y2autoconf 2.21.6 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.21.9 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-nfs-client, 2.21.2, http://bugs.opensuse.org/, yast2-nfs-client) +AC_INIT(yast2-nfs-client, 2.21.6, http://bugs.opensuse.org/, yast2-nfs-client) 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.6" RPMNAME="yast2-nfs-client" MAINTAINER="Martin Vidner <[email protected]>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-2.21.5/doc/Makefile.am new/yast2-nfs-client-2.21.6/doc/Makefile.am --- old/yast2-nfs-client-2.21.5/doc/Makefile.am 2012-02-06 08:04:38.000000000 +0100 +++ new/yast2-nfs-client-2.21.6/doc/Makefile.am 2012-06-20 13:28:44.000000000 +0200 @@ -1,7 +1,7 @@ # # Makefile.am for nfs-client/doc # -# $Id: Makefile.am 3733 2002-07-18 12:57:21Z mvidner $ +# $Id$ # SUBDIRS = autodocs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-2.21.5/doc/Makefile.in new/yast2-nfs-client-2.21.6/doc/Makefile.in --- old/yast2-nfs-client-2.21.5/doc/Makefile.in 2012-02-08 09:15:53.000000000 +0100 +++ new/yast2-nfs-client-2.21.6/doc/Makefile.in 2012-06-20 13:30:24.000000000 +0200 @@ -18,7 +18,7 @@ # # Makefile.am for nfs-client/doc # -# $Id: Makefile.am 3733 2002-07-18 12:57:21Z mvidner $ +# $Id$ # VPATH = @srcdir@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-2.21.5/doc/index.html new/yast2-nfs-client-2.21.6/doc/index.html --- old/yast2-nfs-client-2.21.5/doc/index.html 2012-02-06 08:04:38.000000000 +0100 +++ new/yast2-nfs-client-2.21.6/doc/index.html 2012-06-20 13:28:44.000000000 +0200 @@ -7,7 +7,7 @@ <body bgcolor="white"> <h1>Network Filesystem (NFS) - YaST2 configuration module</h1> -<p>$Id: index.html 3708 2002-07-17 12:12:50Z mvidner $ +<p>$Id$ <address><a href="mailto:[email protected]";>Martin Vidner</a></address> <h2>Features</h2> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-2.21.5/src/Makefile.in new/yast2-nfs-client-2.21.6/src/Makefile.in --- old/yast2-nfs-client-2.21.5/src/Makefile.in 2012-02-08 09:15:53.000000000 +0100 +++ new/yast2-nfs-client-2.21.6/src/Makefile.in 2012-06-20 13:30:24.000000000 +0200 @@ -563,7 +563,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-client-2.21.5/src/Nfs.ycp new/yast2-nfs-client-2.21.6/src/Nfs.ycp --- old/yast2-nfs-client-2.21.5/src/Nfs.ycp 2012-02-16 14:22:26.000000000 +0100 +++ new/yast2-nfs-client-2.21.6/src/Nfs.ycp 2012-06-20 13:28:44.000000000 +0200 @@ -13,7 +13,7 @@ * Dan Vesely <[email protected]> * Martin Vidner <[email protected]> * - * $Id: Nfs.ycp 67465 2012-02-16 13:22:19Z mfilka $ + * $Id$ */ { @@ -74,6 +74,8 @@ global boolean nfs4_enabled = nil; + global boolean nfs_gss_enabled = nil; + global string idmapd_domain = ""; string portmapper = ""; @@ -85,6 +87,10 @@ return (SCR::Read(.sysconfig.nfs.NFS4_SUPPORT)=="yes"); } + boolean ReadNfsGss () { + return (SCR::Read(.sysconfig.nfs.NFS_SECURITY_GSS)=="yes"); + } + string ReadIdmapd() { return (string) SCR::Read(.etc.idmapd_conf, "Domain"); } @@ -101,6 +107,12 @@ else nfs4_enabled = ReadNfs4(); + if ( haskey(settings, "enable_nfs_gss") ) { + nfs_gss_enabled = settings["enable_nfs_gss"]:false; + } + else + nfs_gss_enabled = ReadNfsGss(); + if ( haskey(settings, "idmapd_domain") ) { idmapd_domain = settings["idmapd_domain"]:"localdomain"; } @@ -171,6 +183,7 @@ map <string, any> settings = $[]; settings["enable_nfs4"] = nfs4_enabled; + settings["enable_nfs_gss"] = nfs_gss_enabled; settings["idmapd_domain"] = idmapd_domain; list entries = maplist(map entry, nfs_entries, ``{ @@ -299,6 +312,7 @@ } nfs4_enabled = (SCR::Read(.sysconfig.nfs.NFS4_SUPPORT)=="yes"); + nfs_gss_enabled = (SCR::Read(.sysconfig.nfs.NFS_SECURITY_GSS)=="yes"); idmapd_domain = (string) SCR::Read(.etc.idmapd_conf, "Domain"); boolean progress_orig = Progress::set(false); @@ -394,6 +408,8 @@ { SCR::Write(.sysconfig.nfs.NFS4_SUPPORT,"no"); } + SCR::Write( .sysconfig.nfs.NFS_SECURITY_GSS, nfs_gss_enabled ? "yes" : "no"); + boolean progress_orig = Progress::set (false); SuSEFirewall::WriteOnly (); Progress::set (progress_orig); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-2.21.5/src/nfs-client.ycp new/yast2-nfs-client-2.21.6/src/nfs-client.ycp --- old/yast2-nfs-client-2.21.5/src/nfs-client.ycp 2012-02-06 08:04:39.000000000 +0100 +++ new/yast2-nfs-client-2.21.6/src/nfs-client.ycp 2012-06-20 13:28:44.000000000 +0200 @@ -1,7 +1,7 @@ /** * Author: Martin Vidner <[email protected]> * Summary: Just a redirection - * $Id: nfs-client.ycp 5307 2002-08-26 13:46:24Z mvidner $ + * $Id$ */ { string target = "nfs"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-2.21.5/src/nfs.ycp new/yast2-nfs-client-2.21.6/src/nfs.ycp --- old/yast2-nfs-client-2.21.5/src/nfs.ycp 2012-02-06 08:04:39.000000000 +0100 +++ new/yast2-nfs-client-2.21.6/src/nfs.ycp 2012-06-20 13:28:44.000000000 +0200 @@ -7,7 +7,7 @@ * Dan Vesely <[email protected]> * Martin Vidner <[email protected]> * - * $Id: nfs.ycp 64548 2011-06-22 12:49:17Z jreidinger $ + * $Id$ * * Main file for nfs configuration. Uses all other files. */ @@ -284,7 +284,7 @@ "type" : "string", // nfs or nfs4 // command line option help // fstab(5): fs_type - "help" : _("File system id, supported nfs and nfs4. Default value is nfs."), + "help" : _("File system ID, supported nfs and nfs4. Default value is nfs."), ], ], "mappings" : $[ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-2.21.5/src/nfs_auto.ycp new/yast2-nfs-client-2.21.6/src/nfs_auto.ycp --- old/yast2-nfs-client-2.21.5/src/nfs_auto.ycp 2012-02-06 08:04:39.000000000 +0100 +++ new/yast2-nfs-client-2.21.6/src/nfs_auto.ycp 2012-06-20 13:28:44.000000000 +0200 @@ -11,7 +11,7 @@ * Authors: * Martin Vidner <[email protected]> * - * $Id: nfs_auto.ycp 60697 2010-02-04 14:04:09Z kmachalkova $ + * $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-client-2.21.5/src/routines.ycp new/yast2-nfs-client-2.21.6/src/routines.ycp --- old/yast2-nfs-client-2.21.5/src/routines.ycp 2012-02-17 14:18:58.000000000 +0100 +++ new/yast2-nfs-client-2.21.6/src/routines.ycp 2012-06-20 13:28:44.000000000 +0200 @@ -12,7 +12,7 @@ * Jan Holesovsky <[email protected]> * Dan Vesely <[email protected]> * - * $Id: routines.ycp 67469 2012-02-17 13:18:54Z mfilka $ + * $Id$ * * Network NFS routines * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-2.21.5/src/ui.ycp new/yast2-nfs-client-2.21.6/src/ui.ycp --- old/yast2-nfs-client-2.21.5/src/ui.ycp 2012-02-16 14:22:26.000000000 +0100 +++ new/yast2-nfs-client-2.21.6/src/ui.ycp 2012-06-20 13:28:44.000000000 +0200 @@ -13,7 +13,7 @@ * Dan Vesely <[email protected]> * Martin Vidner <[email protected]> * - * $Id: ui.ycp 67465 2012-02-16 13:22:19Z mfilka $ + * $Id$ * * Network NFS client dialogs * @@ -239,28 +239,28 @@ `VBox( `VSpacing(0.2), `HBox( - TextAndButton ( - `ComboBox( - `id(`serverent),`opt(`editable), - // text entry label - _("&NFS Server Hostname"), servers ), - // pushbutton label - // choose a host from a list - // appears in help text too - `PushButton (`id (`choose), _("Choo&se")) - ), + TextAndButton ( + `ComboBox( + `id(`serverent),`opt(`editable), + // text entry label + _("&NFS Server Hostname"), servers ), + // pushbutton label + // choose a host from a list + // appears in help text too + `PushButton (`id (`choose), _("Choo&se")) + ), `HSpacing(0.5), - TextAndButton ( + TextAndButton ( `InputField( `id(`pathent), - `opt(`hstretch), - // textentry label - _("&Remote Directory"), pth), - // pushbutton label, + `opt(`hstretch), + // textentry label + _("&Remote Directory"), pth), + // pushbutton label, // select from a list of remote filesystems // make it short // appears in help text too `PushButton (`id (`pathent_list), _("&Select")) - ) + ) ), `Left( `CheckBox(`id(`nfs4), _("NFS&v4 Share"), nfs4)), `Left( @@ -502,15 +502,17 @@ about mounting NFS and mount options, refer to <tt>man nfs.</tt></p>") + // Help, part 3 of 3 -_("<p>To mount a new NFS share, use <B>Add</B> button. To change the configuration of -currently mounted share, use <B>Edit</B> button. Remove and unmount selected share by -<B>Delete</B> button.</p>"); +_("<p>To mount a new NFS share, click <B>Add</B>. To change the configuration of +a currently mounted share, click <B>Edit</B>. Remove and unmount a selected +share with <B>Delete</B>.</p> +"); - string help_text2 = _("<p>If you need to access NFSv4 shares (NFSv4 is a newer version -of NFS protocol), check <b>Enable NFSv4</b> option. In that case, you might need to supply -specific <b>NFSv4 Domain Name</b>, required for correct setting of file/directory access -rights.</p>") + fw_cwm_widget["help"]:""; + string help_text2 = _("<p>If you need to access NFSv4 shares (NFSv4 is a newer version of the NFS +protocol), check the <b>Enable NFSv4</b> option. In that case, you might need +to supply specific a <b>NFSv4 Domain Name</b> required for the correct setting +of file/directory access rights.</p> +") + fw_cwm_widget["help"]:""; void EnableDisableButtons() { @@ -559,6 +561,8 @@ `HStretch() ), `VSpacing (1), + `Left(`CheckBox(`id(`enable_nfs_gss), `opt( `notify), _("Enable &GSS Security"))), + `VSpacing (1), fw_cwm_widget["custom_widget"]:`Empty (), `VStretch() ); @@ -593,6 +597,7 @@ UI::ChangeWidget(`id(`enable_nfs4), `Value, Nfs::nfs4_enabled != false); UI::ChangeWidget( `id(`nfs4_domain), `Enabled, Nfs::nfs4_enabled != false); UI::ChangeWidget(`id(`nfs4_domain), `Value, Nfs::idmapd_domain); + UI::ChangeWidget(`id(`enable_nfs_gss), `Value, Nfs::nfs_gss_enabled != false); } void SaveFstabEntries( ) @@ -604,6 +609,7 @@ { CWMFirewallInterfaces::OpenFirewallStore (fw_cwm_widget, "", event); Nfs::nfs4_enabled = (boolean) UI::QueryWidget(`id(`enable_nfs4),`Value); + Nfs::nfs_gss_enabled = (boolean) UI::QueryWidget(`id(`enable_nfs_gss),`Value); Nfs::idmapd_domain = (string) UI::QueryWidget(`id(`nfs4_domain),`Value); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-2.21.5/src/wizards.ycp new/yast2-nfs-client-2.21.6/src/wizards.ycp --- old/yast2-nfs-client-2.21.5/src/wizards.ycp 2012-02-06 08:04:39.000000000 +0100 +++ new/yast2-nfs-client-2.21.6/src/wizards.ycp 2012-06-20 13:28:44.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Wizards definitions * Authors: Martin Vidner <[email protected]> * - * $Id: wizards.ycp 65872 2011-09-21 08:54:23Z visnov $ + * $Id$ */ { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-2.21.5/testsuite/tests/escape.ycp new/yast2-nfs-client-2.21.6/testsuite/tests/escape.ycp --- old/yast2-nfs-client-2.21.5/testsuite/tests/escape.ycp 2012-02-06 08:04:39.000000000 +0100 +++ new/yast2-nfs-client-2.21.6/testsuite/tests/escape.ycp 2012-06-20 13:28:44.000000000 +0200 @@ -8,7 +8,7 @@ * Authors: * Martin Vidner <[email protected]> * - * $Id: escape.ycp 19330 2004-09-14 07:15:18Z jsrain $ + * $Id$ */ { // testedfiles: Nfs.ycp Testsuite.ycp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-2.21.5/testsuite/tests/r-check.ycp new/yast2-nfs-client-2.21.6/testsuite/tests/r-check.ycp --- old/yast2-nfs-client-2.21.5/testsuite/tests/r-check.ycp 2012-02-17 14:18:58.000000000 +0100 +++ new/yast2-nfs-client-2.21.6/testsuite/tests/r-check.ycp 2012-06-20 13:28:44.000000000 +0200 @@ -8,7 +8,7 @@ * Authors: * Martin Vidner <[email protected]> * - * $Id: r-check.ycp 67469 2012-02-17 13:18:54Z mfilka $ + * $Id$ */ { // testedfiles: routines.ycp Testsuite.ycp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-2.21.5/testsuite/tests/r-fstab.ycp new/yast2-nfs-client-2.21.6/testsuite/tests/r-fstab.ycp --- old/yast2-nfs-client-2.21.5/testsuite/tests/r-fstab.ycp 2012-02-06 08:04:39.000000000 +0100 +++ new/yast2-nfs-client-2.21.6/testsuite/tests/r-fstab.ycp 2012-06-20 13:28:44.000000000 +0200 @@ -8,7 +8,7 @@ * Authors: * Martin Vidner <[email protected]> * - * $Id: r-fstab.ycp 46616 2008-04-14 17:03:50Z kmachalkova $ + * $Id$ */ { // testedfiles: routines.ycp Testsuite.ycp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-2.21.5/testsuite/tests/r-spec.ycp new/yast2-nfs-client-2.21.6/testsuite/tests/r-spec.ycp --- old/yast2-nfs-client-2.21.5/testsuite/tests/r-spec.ycp 2012-02-17 14:18:58.000000000 +0100 +++ new/yast2-nfs-client-2.21.6/testsuite/tests/r-spec.ycp 2012-06-20 13:28:44.000000000 +0200 @@ -8,7 +8,7 @@ * Authors: * Martin Vidner <[email protected]> * - * $Id: r-spec.ycp 67469 2012-02-17 13:18:54Z mfilka $ + * $Id$ */ { // testedfiles: routines.ycp Testsuite.ycp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-2.21.5/testsuite/tests/r-strip.ycp new/yast2-nfs-client-2.21.6/testsuite/tests/r-strip.ycp --- old/yast2-nfs-client-2.21.5/testsuite/tests/r-strip.ycp 2012-02-06 08:04:39.000000000 +0100 +++ new/yast2-nfs-client-2.21.6/testsuite/tests/r-strip.ycp 2012-06-20 13:28:44.000000000 +0200 @@ -8,7 +8,7 @@ * Authors: * Martin Vidner <[email protected]> * - * $Id: r-strip.ycp 17937 2004-06-21 08:59:23Z mvidner $ + * $Id$ */ { // testedfiles: routines.ycp Testsuite.ycp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-2.21.5/testsuite/tests/readwrite.out new/yast2-nfs-client-2.21.6/testsuite/tests/readwrite.out --- old/yast2-nfs-client-2.21.5/testsuite/tests/readwrite.out 2012-02-06 08:04:39.000000000 +0100 +++ new/yast2-nfs-client-2.21.6/testsuite/tests/readwrite.out 2012-06-20 13:28:44.000000000 +0200 @@ -1,6 +1,7 @@ Dump Read Read .etc.fstab [$["file":"/", "freq":1, "mntops":"defaults", "passno":2, "spec":"/dev/hda6", "vfstype":"reiserfs"], $["file":"/home", "freq":0, "mntops":"defaults", "passno":0, "spec":"foo.bar.com:/home", "vfstype":"nfs"], $["file":"/var/spool/mail", "freq":0, "mntops":"defaults", "passno":0, "spec":"foo.bar.com:/var/spool/mail", "vfstype":"nfs"], $["file":"/a\\040space", "freq":1, "mntops":"defaults", "passno":3, "spec":"/dev/hda7", "vfstype":"reiserfs"], $["file":"/b\\040space", "freq":0, "mntops":"defaults", "passno":0, "spec":"foo.bar.com:/space\\040dir", "vfstype":"nfs"]] Read .sysconfig.nfs.NFS4_SUPPORT "yes" +Read .sysconfig.nfs.NFS_SECURITY_GSS "yes" Read .etc.idmapd_conf "Domain" "localhost" Execute .target.bash "/sbin/chkconfig -l SuSEfirewall2_init | /usr/bin/grep -q '[0-6]:on'" 0 Execute .target.bash "/sbin/chkconfig -l SuSEfirewall2_setup | /usr/bin/grep -q '[0-6]:on'" 0 @@ -21,6 +22,7 @@ Execute .target.bash_output "/sbin/chkconfig -a nfsboot" $["exit":0, "stderr":"", "stdout":""] Write .sysconfig.nfs.NFS4_SUPPORT "yes" true Write .etc.idmapd_conf ["Domain", "localhost"] true +Write .sysconfig.nfs.NFS_SECURITY_GSS "yes" true Execute .target.bash_output "/sbin/service nfs stop" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""] Execute .target.bash "/sbin/service portmap status" $["TERM":"raw"] 0 Execute .target.bash_output "/sbin/service nfs start" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-2.21.5/testsuite/tests/readwrite.ycp new/yast2-nfs-client-2.21.6/testsuite/tests/readwrite.ycp --- old/yast2-nfs-client-2.21.5/testsuite/tests/readwrite.ycp 2012-02-24 13:12:27.000000000 +0100 +++ new/yast2-nfs-client-2.21.6/testsuite/tests/readwrite.ycp 2012-06-20 13:28:44.000000000 +0200 @@ -8,7 +8,7 @@ * Authors: * Martin Vidner <[email protected]> * - * $Id: readwrite.ycp 67540 2012-02-24 12:12:22Z mfilka $ + * $Id$ */ { // testedfiles: Nfs.ycp Service.ycp Report.ycp Testsuite.ycp @@ -118,6 +118,7 @@ "sysconfig": $[ "nfs" : $[ "NFS4_SUPPORT": "yes", + "NFS_SECURITY_GSS": "yes", ], ], "target" : $[ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-2.21.5/testsuite/tests/readwrite2.out new/yast2-nfs-client-2.21.6/testsuite/tests/readwrite2.out --- old/yast2-nfs-client-2.21.5/testsuite/tests/readwrite2.out 2012-02-06 08:04:39.000000000 +0100 +++ new/yast2-nfs-client-2.21.6/testsuite/tests/readwrite2.out 2012-06-20 13:28:44.000000000 +0200 @@ -3,6 +3,7 @@ Dump Read .etc.fstab [$["file":"/", "freq":1, "mntops":"defaults", "passno":2, "spec":"/dev/hda6", "vfstype":"reiserfs"], $["file":"/home", "freq":0, "mntops":"defaults", "passno":0, "spec":"foo.bar.com:/home", "vfstype":"nfs"], $["file":"/var/spool/mail", "freq":0, "mntops":"defaults", "passno":0, "spec":"foo.bar.com:/var/spool/mail", "vfstype":"nfs"], $["file":"/a\\040space", "freq":1, "mntops":"defaults", "passno":3, "spec":"/dev/hda7", "vfstype":"reiserfs"], $["file":"/b\\040space", "freq":0, "mntops":"defaults", "passno":0, "spec":"foo.bar.com:/space\\040dir", "vfstype":"nfs"]] Read .sysconfig.nfs.NFS4_SUPPORT "no" +Read .sysconfig.nfs.NFS_SECURITY_GSS "no" Read .etc.idmapd_conf "Domain" "localhost" Execute .target.bash "/sbin/chkconfig -l SuSEfirewall2_init | /usr/bin/grep -q '[0-6]:on'" 0 Execute .target.bash "/sbin/chkconfig -l SuSEfirewall2_setup | /usr/bin/grep -q '[0-6]:on'" 0 @@ -24,6 +25,7 @@ Read .init.scripts.comment "nfsboot" $["nfs":$[], "portmap":$[]] Execute .target.bash_output "/sbin/chkconfig -a nfsboot" $["exit":0, "stderr":"", "stdout":""] Write .sysconfig.nfs.NFS4_SUPPORT "no" true +Write .sysconfig.nfs.NFS_SECURITY_GSS "no" true Execute .target.bash_output "/sbin/service nfs stop" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""] Execute .target.bash "/sbin/service portmap status" $["TERM":"raw"] 0 Execute .target.bash_output "/sbin/service nfs start" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""] @@ -34,6 +36,7 @@ Dump Read .etc.fstab [$["file":"/", "freq":1, "mntops":"defaults", "passno":2, "spec":"/dev/hda6", "vfstype":"reiserfs"], $["file":"/home", "freq":0, "mntops":"defaults", "passno":0, "spec":"foo.bar.com:/home", "vfstype":"nfs"], $["file":"/var/spool/mail", "freq":0, "mntops":"defaults", "passno":0, "spec":"foo.bar.com:/var/spool/mail", "vfstype":"nfs"], $["file":"/a\\040space", "freq":1, "mntops":"defaults", "passno":3, "spec":"/dev/hda7", "vfstype":"reiserfs"], $["file":"/b\\040space", "freq":0, "mntops":"defaults", "passno":0, "spec":"foo.bar.com:/space\\040dir", "vfstype":"nfs"]] Read .sysconfig.nfs.NFS4_SUPPORT "no" +Read .sysconfig.nfs.NFS_SECURITY_GSS "no" Read .etc.idmapd_conf "Domain" "localhost" Return true Dump @@ -55,6 +58,7 @@ Read .init.scripts.comment "nfsboot" $["nfs":$[], "portmap":$[]] Execute .target.bash_output "/sbin/chkconfig -a nfsboot" $["exit":0, "stderr":"", "stdout":""] Write .sysconfig.nfs.NFS4_SUPPORT "no" true +Write .sysconfig.nfs.NFS_SECURITY_GSS "no" true Execute .target.bash_output "/sbin/service nfs stop" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""] Execute .target.bash "/sbin/service portmap status" $["TERM":"raw"] 0 Execute .target.bash_output "/sbin/service nfs start" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""] @@ -65,6 +69,7 @@ Dump Read .etc.fstab [$["file":"/", "freq":1, "mntops":"defaults", "passno":2, "spec":"/dev/hda6", "vfstype":"ext3"]] Read .sysconfig.nfs.NFS4_SUPPORT "no" +Read .sysconfig.nfs.NFS_SECURITY_GSS "no" Read .etc.idmapd_conf "Domain" "localhost" Return true Dump @@ -74,6 +79,7 @@ Execute .target.bash "/bin/cp $ORIG $BACKUP" $["BACKUP":"/etc/fstab.YaST2.save", "ORIG":"/etc/fstab"] 0 Write .etc.fstab [$["file":"/", "freq":1, "mntops":"defaults", "passno":2, "spec":"/dev/hda6", "vfstype":"ext3"]] true Write .sysconfig.nfs.NFS4_SUPPORT "no" true +Write .sysconfig.nfs.NFS_SECURITY_GSS "no" true Execute .target.bash_output "/sbin/service nfs stop" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""] Return true Dump @@ -81,6 +87,7 @@ Dump Read .etc.fstab [$["file":"/", "freq":1, "mntops":"defaults", "passno":2, "spec":"/dev/hda6", "vfstype":"ext3"]] Read .sysconfig.nfs.NFS4_SUPPORT "no" +Read .sysconfig.nfs.NFS_SECURITY_GSS "no" Read .etc.idmapd_conf "Domain" "localhost" Return true Dump @@ -90,5 +97,6 @@ Execute .target.bash "/bin/cp $ORIG $BACKUP" $["BACKUP":"/etc/fstab.YaST2.save", "ORIG":"/etc/fstab"] 0 Write .etc.fstab [$["file":"/", "freq":1, "mntops":"defaults", "passno":2, "spec":"/dev/hda6", "vfstype":"ext3"]] true Write .sysconfig.nfs.NFS4_SUPPORT "no" true +Write .sysconfig.nfs.NFS_SECURITY_GSS "no" true Execute .target.bash_output "/sbin/service nfs stop" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""] Return true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-2.21.5/testsuite/tests/readwrite2.ycp new/yast2-nfs-client-2.21.6/testsuite/tests/readwrite2.ycp --- old/yast2-nfs-client-2.21.5/testsuite/tests/readwrite2.ycp 2012-02-24 13:12:27.000000000 +0100 +++ new/yast2-nfs-client-2.21.6/testsuite/tests/readwrite2.ycp 2012-06-20 13:28:44.000000000 +0200 @@ -8,7 +8,7 @@ * Authors: * Martin Vidner <[email protected]> * - * $Id: readwrite2.ycp 67540 2012-02-24 12:12:22Z mfilka $ + * $Id$ */ { // testedfiles: Nfs.ycp Service.ycp Report.ycp Testsuite.ycp @@ -115,6 +115,7 @@ "sysconfig": $[ "nfs" : $[ "NFS4_SUPPORT": "no", + "NFS_SECURITY_GSS": "no", ], ], "target" : $[ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
