Hello community,
here is the log from the commit of package yast2-nfs-server for
openSUSE:Factory checked in at 2013-07-07 22:28:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-nfs-server (Old)
and /work/SRC/openSUSE:Factory/.yast2-nfs-server.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-nfs-server"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-nfs-server/yast2-nfs-server.changes
2013-06-05 13:26:24.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-nfs-server.new/yast2-nfs-server.changes
2013-07-07 22:28:27.000000000 +0200
@@ -1,0 +2,7 @@
+Wed Jun 26 16:39:49 UTC 2013 - lsle...@suse.cz
+
+- use ini-agent instead of Limal for reading /etc/idmapd.conf file,
+ Limal has been dropped in Factory (FATE#313242).
+- 2.24.0
+
+-------------------------------------------------------------------
Old:
----
yast2-nfs-server-2.21.7.tar.bz2
New:
----
yast2-nfs-server-2.24.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-nfs-server.spec ++++++
--- /var/tmp/diff_new_pack.xK7YdN/_old 2013-07-07 22:28:28.000000000 +0200
+++ /var/tmp/diff_new_pack.xK7YdN/_new 2013-07-07 22:28:28.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-nfs-server
-Version: 2.21.7
+Version: 2.24.0
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -49,8 +49,6 @@
%package -n yast2-nfs-common
Summary: Configuration of NFS, common parts
Group: System/YaST
-Requires: limal-nfs-server
-Requires: limal-nfs-server-perl
%description -n yast2-nfs-common
-
@@ -101,6 +99,5 @@
%defattr(-,root,root)
/usr/share/YaST2/scrconf/cfg_nfs.scr
/usr/share/YaST2/scrconf/etc_idmapd_conf.scr
-/usr/lib/YaST2/servers_non_y2/ag_idmapd_conf
%changelog
++++++ yast2-nfs-server-2.21.7.tar.bz2 -> yast2-nfs-server-2.24.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-nfs-server-2.21.7/VERSION
new/yast2-nfs-server-2.24.0/VERSION
--- old/yast2-nfs-server-2.21.7/VERSION 2013-05-16 16:30:41.000000000 +0200
+++ new/yast2-nfs-server-2.24.0/VERSION 2013-07-02 10:20:52.000000000 +0200
@@ -1 +1 @@
-2.21.7
+2.24.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-nfs-server-2.21.7/agents/Makefile.am
new/yast2-nfs-server-2.24.0/agents/Makefile.am
--- old/yast2-nfs-server-2.21.7/agents/Makefile.am 2013-01-23
18:54:21.000000000 +0100
+++ new/yast2-nfs-server-2.24.0/agents/Makefile.am 2013-07-02
10:20:52.000000000 +0200
@@ -4,8 +4,7 @@
# $Id$
#
-agent_SCRIPTS = ag_exports\
- ag_idmapd_conf
+agent_SCRIPTS = ag_exports
scrconf_DATA = etc_exports.scr\
etc_idmapd_conf.scr\
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-nfs-server-2.21.7/agents/Makefile.in
new/yast2-nfs-server-2.24.0/agents/Makefile.in
--- old/yast2-nfs-server-2.21.7/agents/Makefile.in 2013-05-28
14:14:43.000000000 +0200
+++ new/yast2-nfs-server-2.24.0/agents/Makefile.in 2013-07-04
12:58:56.000000000 +0200
@@ -224,9 +224,7 @@
ydatadir = @ydatadir@
yncludedir = @yncludedir@
ystartupdir = @ystartupdir@
-agent_SCRIPTS = ag_exports\
- ag_idmapd_conf
-
+agent_SCRIPTS = ag_exports
scrconf_DATA = etc_exports.scr\
etc_idmapd_conf.scr\
cfg_nfs.scr
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-nfs-server-2.21.7/agents/ag_idmapd_conf
new/yast2-nfs-server-2.24.0/agents/ag_idmapd_conf
--- old/yast2-nfs-server-2.21.7/agents/ag_idmapd_conf 2013-01-23
18:54:21.000000000 +0100
+++ new/yast2-nfs-server-2.24.0/agents/ag_idmapd_conf 1970-01-01
01:00:00.000000000 +0100
@@ -1,164 +0,0 @@
-#!/usr/bin/perl -w
-#
-# $Id: $
-#
-# Agent for modifying /etc/idmapd.conf parameters.
-#
-# using limal-nfs-server swig interface, see:
-# http://svn.suse.de/svn/limal/limal-head/limal-nfs-server/
-#
-
-use strict;
-use ycp;
-use Errno qw(ENOENT);
-use LIMAL::NfsServer;
-use LIMAL;
-
-my $filename="";
-my $conf = new LIMAL::NfsServer::KNfsIdmapdConf();
-my @idmapdentry = ();
-my $entryName="";
-
-# read the conf file
-
-sub parse_file()
-{
- eval {
- $conf->load($filename);
- };
- if($@)
- {
- return $@;
- }
- return undef;
-}
-
-
-# verify and tell if there are errors in the conf file
-sub checked_write_file ()
-{
- eval
- {
- my $res = $conf->verifyConf();
- my @msg = "";
-
- if ($res->size() > 0)
- {
- y2error("Check failed !!");
- for(my $i = 0; $i < $res->size(); $i++)
- {
- push(@msg, $res->getitem($i));
- y2error($res->getitem($i));
- }
- die "Error in Idmapd Entries ".join(": ",@msg. "\n");
- }
- };
- return 0 if ($@);
-
- eval
- {
- $conf->save($filename,"");
- };
- return 0 if ($@);
-
- return 1;
-
-}
-
-
-sub set_entry ()
-{
- eval
- {
- $conf->setEntry($idmapdentry[0],$idmapdentry[1]);
- if ($@)
- {
- y2error("Unable to set entry!");
- }
- };
- return 0 if ($@);
-
- return 1;
-}
-
-
-sub get_value ()
-{
- my $value = "";
- eval
- {
- $value = $conf->getValueFor($entryName);
- };
- return undef if ($@);
-
- return $value;
-}
-
-
-#
-# MAIN program
-#
-
-$filename="/etc/idmapd.conf";
-
-while ( <STDIN> )
-{
- my ($command, $path, $argument) = ycp::ParseCommand ($_);
-
- if ($command eq "Write")
- {
- parse_file();
- my $result = "true";
- if ($path eq "." && ref ($argument) eq "ARRAY")
- {
- @idmapdentry = @{$argument};
- $result = set_entry() ? "true" : "false";
- if( $@)
- {
- y2error ("$@");
- }
-
- $result = checked_write_file()? "true":"false";
- }
- else
- {
- y2error ("Wrong path $path or argument: ", ref ($argument));
- $result = "false";
- }
-
- ycp::Return ($result);
- }
- elsif ($command eq "Read")
- {
- parse_file();
- my $value = "";
- if ($path eq ".")
- {
- $entryName = $argument;
- $value = get_value();
- }
- if ($@)
- {
- y2error ("$@");
- }
- else
- {
- y2error ("Wrong path $path");
- }
- ycp::Return ($value);
-
- }
-
- elsif ($command eq "result")
- {
- exit;
- }
-
- # Unknown command
- else
- {
- y2error ("Unknown instruction $command or argument: ", ref ($argument));
- ycp::Return (undef);
- }
-
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-nfs-server-2.21.7/agents/etc_idmapd_conf.scr
new/yast2-nfs-server-2.24.0/agents/etc_idmapd_conf.scr
--- old/yast2-nfs-server-2.21.7/agents/etc_idmapd_conf.scr 2013-01-23
18:54:21.000000000 +0100
+++ new/yast2-nfs-server-2.24.0/agents/etc_idmapd_conf.scr 2013-07-02
10:20:52.000000000 +0200
@@ -4,40 +4,50 @@
* Summary:
* SCR Agent for reading/writing /etc/idmapd.conf
* Access:
- * Currently only write
+ * R/W
* Authors:
- * Chakravarthi P <pchakravar...@novell.com>
+ * Ladislav Slezák <lsle...@suse.cz>
* See:
- * anyagent
- * libscr
+ * iniagent
* man idmapd.conf
- * Example:
- * Partial /etc/idmapd.conf:
- *
- * [General]
- *
- * Verbosity=0
- * Pipefs-Directory=/var/lib/nfs/rpc_pipefs
- * Domain=abc.com
- *
- * [<Another Section>]
- * <name>=<value>
*
**
- * Read(.etc.idmapd_conf, "Domain")
- * (abc.com)
*
- * Read(.etc.idmapd_conf, "Verbosity")
- * (0)
+ * Examples:
*
- * Write(.etc.idmapd_conf, $["Domain", "doodahh"])
- * (false)
+ * Read(.etc.idmapd_conf.value.General.Domain)
+ * ("localdomain")
*
- * Write(.etc.idmapd_conf, $["Verbosity", "4"])
+ * Read(.etc.idmapd_conf.value.General.Verbosity)
+ * ("0")
+ *
+ * Write(.etc.idmapd_conf.value.General.Verbosity, "4")
* (true)
*
+ * Write(.etc.idmapd_conf, nil)
+ * (true)
*
*/
.etc.idmapd_conf
-`ag_idmapd_conf ()
+
+`ag_ini(
+ `IniAgent( "/etc/idmapd.conf",
+ $[
+ "options" : [ ],
+ "comments" : [ "^[ \t]*#.*", "#.*", "^[ \t]*$" ],
+ "sections" : [
+ $[ "begin" : [
+ "^[ \t]*\\[[ \t]*(.*[^ \t])[ \t]*\\][ \t]*",
+ "[%s]",
+ ]],
+ ],
+ "params" : [
+ $[ "match" : [
+ "^[ \t]*([^=]*[^ \t=])[ \t]*=[ \t]*(.*[^ \t]|)[ \t]*$" ,
+ "%s = %s",
+ ]],
+ ],
+ ]
+ )
+)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-nfs-server-2.21.7/configure
new/yast2-nfs-server-2.24.0/configure
--- old/yast2-nfs-server-2.21.7/configure 2013-05-28 14:14:42.000000000
+0200
+++ new/yast2-nfs-server-2.24.0/configure 2013-07-04 12:58:55.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-nfs-server 2.21.7.
+# Generated by GNU Autoconf 2.69 for yast2-nfs-server 2.24.0.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -579,8 +579,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-nfs-server'
PACKAGE_TARNAME='yast2-nfs-server'
-PACKAGE_VERSION='2.21.7'
-PACKAGE_STRING='yast2-nfs-server 2.21.7'
+PACKAGE_VERSION='2.24.0'
+PACKAGE_STRING='yast2-nfs-server 2.24.0'
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-nfs-server 2.21.7 to adapt to many kinds of
systems.
+\`configure' configures yast2-nfs-server 2.24.0 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-nfs-server 2.21.7:";;
+ short | recursive ) echo "Configuration of yast2-nfs-server 2.24.0:";;
esac
cat <<\_ACEOF
@@ -1401,7 +1401,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-nfs-server configure 2.21.7
+yast2-nfs-server configure 2.24.0
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-nfs-server $as_me 2.21.7, which was
+It was created by yast2-nfs-server $as_me 2.24.0, 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-nfs-server'
- VERSION='2.21.7'
+ VERSION='2.24.0'
cat >>confdefs.h <<_ACEOF
@@ -2480,7 +2480,7 @@
-VERSION="2.21.7"
+VERSION="2.24.0"
RPMNAME="yast2-nfs-server"
MAINTAINER="Martin Vidner <mvid...@suse.cz>"
@@ -3495,7 +3495,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.7, which was
+This file was extended by yast2-nfs-server $as_me 2.24.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3548,7 +3548,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.7
+yast2-nfs-server config.status 2.24.0
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-nfs-server-2.21.7/configure.in
new/yast2-nfs-server-2.24.0/configure.in
--- old/yast2-nfs-server-2.21.7/configure.in 2013-05-28 14:14:37.000000000
+0200
+++ new/yast2-nfs-server-2.24.0/configure.in 2013-07-04 12:58:51.000000000
+0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-nfs-server
dnl
-dnl -- This file is generated by y2autoconf 2.24.0 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.24.1 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-nfs-server, 2.21.7, http://bugs.opensuse.org/, yast2-nfs-server)
+AC_INIT(yast2-nfs-server, 2.24.0, 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.7"
+VERSION="2.24.0"
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.7/src/NfsServer.ycp
new/yast2-nfs-server-2.24.0/src/NfsServer.ycp
--- old/yast2-nfs-server-2.21.7/src/NfsServer.ycp 2013-01-23
18:54:21.000000000 +0100
+++ new/yast2-nfs-server-2.24.0/src/NfsServer.ycp 2013-07-02
10:20:52.000000000 +0200
@@ -172,7 +172,7 @@
if (enable_nfsv4)
{
- domain = (string) SCR::Read(.etc.idmapd_conf,"Domain");
+ domain = (string) SCR::Read(.etc.idmapd_conf.value.General.Domain);
}
boolean progress_orig = Progress::set (false);
@@ -275,7 +275,7 @@
if(enable_nfsv4)
{
SCR::Write(.sysconfig.nfs.NFS4_SUPPORT,"yes");
- if( !( SCR::Write(.etc.idmapd_conf,["Domain",(string)domain]) )
)
+ if (!SCR::Write(.etc.idmapd_conf.value.General.Domain,
(string)domain) || !(SCR::Write(.etc.idmapd_conf, nil)))
{
Report::Error(_("Unable to write to idmapd.conf."));
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-nfs-server-2.21.7/src/ui.ycp
new/yast2-nfs-server-2.24.0/src/ui.ycp
--- old/yast2-nfs-server-2.21.7/src/ui.ycp 2013-01-23 18:54:21.000000000
+0100
+++ new/yast2-nfs-server-2.24.0/src/ui.ycp 2013-07-02 10:20:52.000000000
+0200
@@ -299,7 +299,7 @@
Wizard::SetScreenShotName ("nfs-server-1-start");
boolean start_nfs_server = NfsServer::start;
- string domain = (string) SCR::Read(.etc.idmapd_conf,"Domain");
+ string domain = (string)
SCR::Read(.etc.idmapd_conf.value.General.Domain);
if (domain == nil)
{
Popup::Message(_("Unable to read the /etc/idmapd.conf file.
Setting the default setting for the domain to 'localdomain'."));
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
