![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community, here is the log from the commit of package yast2-nfs-client checked in at Thu Oct 23 12:37:12 CEST 2008. -------- --- yast2-nfs-client/yast2-nfs-client.changes 2008-10-09 11:23:34.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-nfs-client/yast2-nfs-client.changes 2008-10-20 13:00:22.483419000 +0200 @@ -1,0 +2,8 @@ +Mon Oct 20 12:42:47 CEST 2008 - kmachalkova@suse.cz + +- Un-HTML-ize help text (bnc#432800) +- ag_showexports (+ related scrconf file) moved to yast2 base + package(bnc#257910) +- 2.17.6 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-nfs-client-2.17.5.tar.bz2 New: ---- yast2-nfs-client-2.17.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-nfs-client.spec ++++++ --- /var/tmp/diff_new_pack.zl6283/_old 2008-10-23 12:36:48.000000000 +0200 +++ /var/tmp/diff_new_pack.zl6283/_new 2008-10-23 12:36:48.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-nfs-client (Version 2.17.5) +# spec file for package yast2-nfs-client (Version 2.17.6) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,16 +19,16 @@ Name: yast2-nfs-client -Version: 2.17.5 +Version: 2.17.6 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-nfs-client-2.17.5.tar.bz2 +Source0: yast2-nfs-client-2.17.6.tar.bz2 Prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite -#Service::Find -Requires: yast2 >= 2.17.27 +#ag_showexports moved to yast2 base +Requires: yast2 >= 2.17.40 #idmapd_conf agent Requires: yast2-nfs-common # showmount, #150382, #286300 @@ -53,7 +53,7 @@ Martin Vidner <mvidner@suse.cz> %prep -%setup -n yast2-nfs-client-2.17.5 +%setup -n yast2-nfs-client-2.17.6 %build %{prefix}/bin/y2tool y2autoconf @@ -90,13 +90,15 @@ /usr/share/YaST2/modules/Nfs.ybc %dir %{prefix}/share/applications/YaST2 %{prefix}/share/applications/YaST2/nfs.desktop -%dir /usr/share/YaST2/scrconf -/usr/share/YaST2/scrconf/net_showexports.scr -%dir /usr/lib/YaST2/servers_non_y2 -/usr/lib/YaST2/servers_non_y2/ag_showexports %doc %{prefix}/share/doc/packages/yast2-nfs-client /usr/share/YaST2/schema/autoyast/rnc/nfs.rnc + %changelog +* Mon Oct 20 2008 kmachalkova@suse.cz +- Un-HTML-ize help text (bnc#432800) +- ag_showexports (+ related scrconf file) moved to yast2 base + package(bnc#257910) +- 2.17.6 * Thu Oct 09 2008 jsuchome@suse.cz - fixed failing testsuite (Service.ycp) - 2.17.5 ++++++ yast2-nfs-client-2.17.5.tar.bz2 -> yast2-nfs-client-2.17.6.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nfs-client-2.17.5/agents/ag_showexports new/yast2-nfs-client-2.17.6/agents/ag_showexports --- old/yast2-nfs-client-2.17.5/agents/ag_showexports 2007-09-19 13:53:31.000000000 +0200 +++ new/yast2-nfs-client-2.17.6/agents/ag_showexports 1970-01-01 01:00:00.000000000 +0100 @@ -1,117 +0,0 @@ -#!/bin/bash - -# File: ag_showexports -# Package: NFS client -# Summary: Agent for reading the exported directories of a NFS server -# Authors: Martin Vidner -# -# $Id: ag_showexports 40350 2007-08-20 11:21:11Z mvidner $ -# -# Read (., "homes.example.com") -# [ "/data/home" ] - -# showmount is in nfs-client.rpm - -if [ x$1 = x-d ]; then - set -x -else - exec 2>/dev/null -fi - -# We want to parse English output -export LC_ALL=C - -OUTFILE=`mktemp -q /tmp/ag_showexports.$$.XXXXXX` -if [ $? -ne 0 ]; then - # TODO y2log - echo "$0: Can't create temp file, exiting..." >&2 - exit 1 -fi -trap "rm $OUTFILE" EXIT TERM - -# this function is duplicated in ag_showexports and ag_hostnames -# after $1 seconds, kill $2 and all its children -# return $2's exit status -function kill_after() { - local TIMEOUT=$1 - local LONG_PID=$2 - - { - sleep $TIMEOUT - LONG_CHILDREN_PIDS=`ps --ppid $LONG_PID --no-headers -o pid` - kill $LONG_PID $LONG_CHILDREN_PIDS - } & - SLEEP_PID=$! - - # now wait until the long command finishes or is killed - wait $LONG_PID - local RET=$? - # if it did not exit because of a signal, - # then the killer is useless and we will kill him instead - if [ $RET -lt 128 ]; then - kill $SLEEP_PID - fi - return $RET -} - -# this function encapsulates a command that may take a long time -# so that it can be killed after a timeout -function showexports_long() { - local HOST="$1" - local SM=/usr/sbin/showmount - # showmounts passes whatever the server says, - # but it can say different things :( #91184 - # unfsd: - # /space\040dir <anon clnt> - # /back\134slash <anon clnt> - # knfsd: - # /space dir * - # /back\slash * - if test -x "$SM"; then - #sed: strip authorized hosts, double \ before nondigit, make a ycp item - "$SM" --no-headers --exports "$HOST" | \ - sed \ - -e 's/<anon clnt>$/<anon_clnt>/' \ - -e 's/[[:space:]]*[^[:space:]]*$//' \ - -e 's/\\\([^[:digit:]]\)/\\\\\1/' \ - -e 's/\(.*\)/"\1",/' - else - echo '"Install nfs-client.rpm"' - fi -} - -# showexports host -# echoes the output -function showexports() { - local HOST="$1" - - # in parallel run: - # 1) the command that may take a long time - # 2) a shell that will kill (1) after a delay - showexports_long "$HOST" >"$OUTFILE" & - kill_after 5 $! - - echo "[" - cat "$OUTFILE" - echo "]" -} - -while true ; do - IFS= - read COMMAND || exit - unset IFS - - case "$COMMAND" in - '`result ('*) - exit - ;; - '`Read (.,'*) - HOST=$(echo "$COMMAND" | sed 's/^`Read (., *"\(.*\)")/\1/') - showexports "$HOST" - ;; - *) - echo nil - esac -done - -# EOF diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nfs-client-2.17.5/agents/Makefile.am new/yast2-nfs-client-2.17.6/agents/Makefile.am --- old/yast2-nfs-client-2.17.5/agents/Makefile.am 2005-09-08 10:36:46.000000000 +0200 +++ new/yast2-nfs-client-2.17.6/agents/Makefile.am 2008-10-20 12:51:32.000000000 +0200 @@ -1,11 +1,5 @@ # # Makefile.am for nfs-client/agents # -# $Id: Makefile.am 9664 2003-03-28 13:27:56Z mvidner $ +# $Id: Makefile.am 52361 2008-10-20 10:49:20Z kmachalkova $ # - -agent_SCRIPTS = ag_showexports - -scrconf_DATA = net_showexports.scr - -EXTRA_DIST = $(agent_SCRIPTS) $(scrconf_DATA) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nfs-client-2.17.5/agents/Makefile.in new/yast2-nfs-client-2.17.6/agents/Makefile.in --- old/yast2-nfs-client-2.17.5/agents/Makefile.in 2008-10-09 11:11:56.000000000 +0200 +++ new/yast2-nfs-client-2.17.6/agents/Makefile.in 2008-10-20 12:51:48.000000000 +0200 @@ -13,14 +13,6 @@ # PARTICULAR PURPOSE. @SET_MAKE@ - -# -# Makefile.am for nfs-client/agents -# -# $Id: Makefile.am 9664 2003-03-28 13:27:56Z mvidner $ -# - - VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -48,19 +40,8 @@ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_CLEAN_FILES = -am__installdirs = "$(DESTDIR)$(agentdir)" "$(DESTDIR)$(scrconfdir)" -agentSCRIPT_INSTALL = $(INSTALL_SCRIPT) -SCRIPTS = $(agent_SCRIPTS) SOURCES = DIST_SOURCES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -scrconfDATA_INSTALL = $(INSTALL_DATA) -DATA = $(scrconf_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -179,9 +160,6 @@ ydatadir = @ydatadir@ yncludedir = @yncludedir@ ystartupdir = @ystartupdir@ -agent_SCRIPTS = ag_showexports -scrconf_DATA = net_showexports.scr -EXTRA_DIST = $(agent_SCRIPTS) $(scrconf_DATA) all: all-am .SUFFIXES: @@ -214,42 +192,6 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -install-agentSCRIPTS: $(agent_SCRIPTS) - @$(NORMAL_INSTALL) - test -z "$(agentdir)" || $(MKDIR_P) "$(DESTDIR)$(agentdir)" - @list='$(agent_SCRIPTS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - if test -f $$d$$p; then \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ - echo " $(agentSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(agentdir)/$$f'"; \ - $(agentSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(agentdir)/$$f"; \ - else :; fi; \ - done - -uninstall-agentSCRIPTS: - @$(NORMAL_UNINSTALL) - @list='$(agent_SCRIPTS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ - echo " rm -f '$(DESTDIR)$(agentdir)/$$f'"; \ - rm -f "$(DESTDIR)$(agentdir)/$$f"; \ - done -install-scrconfDATA: $(scrconf_DATA) - @$(NORMAL_INSTALL) - test -z "$(scrconfdir)" || $(MKDIR_P) "$(DESTDIR)$(scrconfdir)" - @list='$(scrconf_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(scrconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(scrconfdir)/$$f'"; \ - $(scrconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(scrconfdir)/$$f"; \ - done - -uninstall-scrconfDATA: - @$(NORMAL_UNINSTALL) - @list='$(scrconf_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(scrconfdir)/$$f'"; \ - rm -f "$(DESTDIR)$(scrconfdir)/$$f"; \ - done tags: TAGS TAGS: @@ -285,11 +227,8 @@ done check-am: all-am check: check-am -all-am: Makefile $(SCRIPTS) $(DATA) +all-am: Makefile installdirs: - for dir in "$(DESTDIR)$(agentdir)" "$(DESTDIR)$(scrconfdir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done install: install-am install-exec: install-exec-am install-data: install-data-am @@ -332,7 +271,7 @@ info-am: -install-data-am: install-agentSCRIPTS install-scrconfDATA +install-data-am: install-dvi: install-dvi-am @@ -366,22 +305,26 @@ ps-am: -uninstall-am: uninstall-agentSCRIPTS uninstall-scrconfDATA +uninstall-am: .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic distclean \ distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-agentSCRIPTS install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-scrconfDATA install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am uninstall uninstall-agentSCRIPTS uninstall-am \ - uninstall-scrconfDATA + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am + +# +# Makefile.am for nfs-client/agents +# +# $Id: Makefile.am 52361 2008-10-20 10:49:20Z kmachalkova $ +# # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nfs-client-2.17.5/agents/net_showexports.scr new/yast2-nfs-client-2.17.6/agents/net_showexports.scr --- old/yast2-nfs-client-2.17.5/agents/net_showexports.scr 2005-09-08 10:36:46.000000000 +0200 +++ new/yast2-nfs-client-2.17.6/agents/net_showexports.scr 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -.net.showexports -`ag_showexports () diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nfs-client-2.17.5/configure new/yast2-nfs-client-2.17.6/configure --- old/yast2-nfs-client-2.17.5/configure 2008-10-09 11:11:54.000000000 +0200 +++ new/yast2-nfs-client-2.17.6/configure 2008-04-14 19:16:20.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for yast2-nfs-client 2.17.4. +# Generated by GNU Autoconf 2.61 for yast2-nfs-client 2.16.0. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -574,8 +574,8 @@ # Identity of this package. PACKAGE_NAME='yast2-nfs-client' PACKAGE_TARNAME='yast2-nfs-client' -PACKAGE_VERSION='2.17.4' -PACKAGE_STRING='yast2-nfs-client 2.17.4' +PACKAGE_VERSION='2.16.0' +PACKAGE_STRING='yast2-nfs-client 2.16.0' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1199,7 +1199,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.17.4 to adapt to many kinds of systems. +\`configure' configures yast2-nfs-client 2.16.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1270,7 +1270,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-nfs-client 2.17.4:";; + short | recursive ) echo "Configuration of yast2-nfs-client 2.16.0:";; esac cat <<\_ACEOF @@ -1348,7 +1348,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-nfs-client configure 2.17.4 +yast2-nfs-client configure 2.16.0 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1362,7 +1362,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.17.4, which was +It was created by yast2-nfs-client $as_me 2.16.0, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2183,7 +2183,7 @@ # Define the identity of the package. PACKAGE='yast2-nfs-client' - VERSION='2.17.4' + VERSION='2.16.0' cat >>confdefs.h <<_ACEOF @@ -2411,7 +2411,7 @@ -VERSION="2.17.4" +VERSION="2.16.0" RPMNAME="yast2-nfs-client" MAINTAINER="Katarina Machalkova <kmachalkova@suse.cz>" @@ -3399,7 +3399,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.17.4, which was +This file was extended by yast2-nfs-client $as_me 2.16.0, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3442,7 +3442,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-nfs-client config.status 2.17.4 +yast2-nfs-client config.status 2.16.0 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nfs-client-2.17.5/configure.in new/yast2-nfs-client-2.17.6/configure.in --- old/yast2-nfs-client-2.17.5/configure.in 2008-10-09 11:11:48.000000000 +0200 +++ new/yast2-nfs-client-2.17.6/configure.in 2008-04-14 19:16:15.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-nfs-client dnl -dnl -- This file is generated by y2autoconf 2.16.8 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-nfs-client, 2.17.4, http://bugs.opensuse.org/, yast2-nfs-client) +AC_INIT(yast2-nfs-client, 2.16.0, 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.17.4" +VERSION="2.16.0" RPMNAME="yast2-nfs-client" MAINTAINER="Katarina Machalkova <kmachalkova@suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nfs-client-2.17.5/src/ui.ycp new/yast2-nfs-client-2.17.6/src/ui.ycp --- old/yast2-nfs-client-2.17.5/src/ui.ycp 2008-09-23 13:16:36.000000000 +0200 +++ new/yast2-nfs-client-2.17.6/src/ui.ycp 2008-10-20 12:09:41.000000000 +0200 @@ -13,7 +13,7 @@ * Dan Vesely <dan@suse.cz> * Martin Vidner <mvidner@suse.cz> * - * $Id: ui.ycp 51397 2008-09-23 10:42:25Z kmachalkova $ + * $Id: ui.ycp 52358 2008-10-20 10:09:05Z kmachalkova $ * * Network NFS client dialogs * @@ -426,10 +426,10 @@ <B>Delete</B> button.</p>"); - string help_text2 = _("If you need to access NFSv4 shares (NFSv4 is a newer version + 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.") + fw_cwm_widget["help"]:""; +rights.</p>") + fw_cwm_widget["help"]:""; term FstabTab() { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nfs-client-2.17.5/VERSION new/yast2-nfs-client-2.17.6/VERSION --- old/yast2-nfs-client-2.17.5/VERSION 2008-10-09 11:13:21.000000000 +0200 +++ new/yast2-nfs-client-2.17.6/VERSION 2008-10-20 12:51:32.000000000 +0200 @@ -1 +1 @@ -2.17.5 +2.17.6 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org