Hello community,
here is the log from the commit of package yast2-dhcp-server for openSUSE:Factory
checked in at Wed Sep 7 17:58:57 CEST 2011.
--------
--- yast2-dhcp-server/yast2-dhcp-server.changes 2010-04-23 20:11:55.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-dhcp-server/yast2-dhcp-server.changes 2011-09-06 16:55:09.000000000 +0200
@@ -1,0 +2,17 @@
+Tue Sep 6 16:35:43 CEST 2011 - locilka@suse.cz
+
+- Fixed detection of default exemplary config file (bnc #715473)
+- Adapted testsuite
+- 2.21.0
+
+-------------------------------------------------------------------
+Fri Aug 5 12:31:23 CEST 2011 - tgoettlicher@suse.de
+
+- fixed .desktop file (bnc #681249)
+
+-------------------------------------------------------------------
+Mon Jul 4 11:12:40 CEST 2011 - snwint@suse.de
+
+- fixed typo (bnc #703097)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-dhcp-server-2.19.0.tar.bz2
New:
----
yast2-dhcp-server-2.21.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-dhcp-server.spec ++++++
--- /var/tmp/diff_new_pack.nXrAqN/_old 2011-09-07 17:58:52.000000000 +0200
+++ /var/tmp/diff_new_pack.nXrAqN/_new 2011-09-07 17:58:52.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package yast2-dhcp-server (Version 2.19.0)
+# spec file for package yast2-dhcp-server
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,16 +19,16 @@
Name: yast2-dhcp-server
-Version: 2.19.0
-Release: 2
+Version: 2.21.0
+Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-dhcp-server-2.19.0.tar.bz2
+Source0: yast2-dhcp-server-2.21.0.tar.bz2
Prefix: /usr
Group: System/YaST
-License: GPLv2+
+License: GPL v2 or later
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-Digest-SHA1 perl-X500-DN perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-dns-server yast2-perl-bindings yast2-testsuite
Requires: perl-gettext yast2-perl-bindings bind-utils perl-X500-DN yast2-ldap perl-Digest-SHA1 perl-Parse-RecDescent
@@ -47,7 +47,7 @@
configuration.
%prep
-%setup -n yast2-dhcp-server-2.19.0
+%setup -n yast2-dhcp-server-2.21.0
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-dhcp-server-2.19.0.tar.bz2 -> yast2-dhcp-server-2.21.0.tar.bz2 ++++++
++++ 4456 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-dhcp-server-2.19.0/MAINTAINER new/yast2-dhcp-server-2.21.0/MAINTAINER
--- old/yast2-dhcp-server-2.19.0/MAINTAINER 2008-01-28 10:38:15.000000000 +0100
+++ new/yast2-dhcp-server-2.21.0/MAINTAINER 2011-05-20 16:18:16.000000000 +0200
@@ -1 +1 @@
-Jozef Uhliarik
+YaST2 Maintainers
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-dhcp-server-2.19.0/VERSION new/yast2-dhcp-server-2.21.0/VERSION
--- old/yast2-dhcp-server-2.19.0/VERSION 2010-02-12 11:08:08.000000000 +0100
+++ new/yast2-dhcp-server-2.21.0/VERSION 2011-09-06 16:38:41.000000000 +0200
@@ -1 +1 @@
-2.19.0
+2.21.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-dhcp-server-2.19.0/configure.in new/yast2-dhcp-server-2.21.0/configure.in
--- old/yast2-dhcp-server-2.19.0/configure.in 2010-04-23 20:07:30.000000000 +0200
+++ new/yast2-dhcp-server-2.21.0/configure.in 2011-09-06 16:54:11.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-dhcp-server, 2.19.0, http://bugs.opensuse.org/, yast2-dhcp-server)
+AC_INIT(yast2-dhcp-server, 2.21.0, http://bugs.opensuse.org/, yast2-dhcp-server)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,9 +18,9 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.19.0"
+VERSION="2.21.0"
RPMNAME="yast2-dhcp-server"
-MAINTAINER="Jozef Uhliarik "
+MAINTAINER="YaST2 Maintainers "
dnl pkgconfig honors lib64
pkgconfigdir=\${libdir}/pkgconfig
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-dhcp-server-2.19.0/src/DhcpServer.pm new/yast2-dhcp-server-2.21.0/src/DhcpServer.pm
--- old/yast2-dhcp-server-2.19.0/src/DhcpServer.pm 2009-03-17 14:10:26.000000000 +0100
+++ new/yast2-dhcp-server-2.21.0/src/DhcpServer.pm 2011-09-06 15:55:49.000000000 +0200
@@ -1521,9 +1521,11 @@
}
else
{
- my $diff_out = SCR->Execute (".target.bash", "diff -q /etc/dhcpd.conf \\
- /usr/share/doc/packages/dhcp-server/dhcpd.conf");
- my $using_sample = int(0 == $diff_out);
+ # Checking whether the config file is the default one (just the content)
+ # 0 == no change
+ my $check = SCR->Execute (".target.bash", "rpm -q -V --file /etc/dhcpd.conf --nouser --nogroup --nomtime --nomode");
+ my $using_sample = int(0 == $check);
+
if ($using_sample)
{
y2milestone ("Sample configuration file found");
@@ -2319,27 +2321,33 @@
$ldap_port = "389";
$ldap_server = "";
$base_config_dn = "";
+
if ( defined ($settings{"ldap-server"}) and
defined ($settings{"ldap-base-dn"}))
{
- if ($settings{"ldap-server"} =~ /^\"(\S+)\"$/)
+ if (defined $settings{"ldap-server"} && $settings{"ldap-server"} =~ /^\"(\S+)\"$/)
{
$ldap_server = $1;
+ y2milestone ("LDAP server: ".$ldap_server);
}
- if ($settings{"ldap-base-dn"} =~ /^\"(.+)\"$/)
+ if (defined $settings{"ldap-base-dn"} && $settings{"ldap-base-dn"} =~ /^\"(.+)\"$/)
{
$base_config_dn = $1;
+ y2milestone ("Base Config DN: ".$base_config_dn);
}
- if ($settings{"ldap-port"} =~ /^(\d+)$/)
+ # Otherwise default is used
+ if (defined $settings{"ldap-port"} && $settings{"ldap-port"} =~ /^(\d+)$/)
{
$ldap_port = $1 if($1 > 0 && $1 < 65535);
+ y2milestone ("LDAP Port: ".$ldap_port);
}
if ($ldap_server ne "" and $base_config_dn ne "")
{
$configured_ldap = 1;
+ y2milestone ("LDAP Configured: ".Boolean ($configured_ldap));
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-dhcp-server-2.19.0/src/dhcp-server.desktop new/yast2-dhcp-server-2.21.0/src/dhcp-server.desktop
--- old/yast2-dhcp-server-2.19.0/src/dhcp-server.desktop 2010-01-14 11:19:01.000000000 +0100
+++ new/yast2-dhcp-server-2.21.0/src/dhcp-server.desktop 2011-08-05 15:08:44.000000000 +0200
@@ -3,7 +3,6 @@
Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Net_advanced;
X-KDE-ModuleType=Library
-X-KDE-RootOnly=true
X-KDE-HasReadOnlyMode=true
X-KDE-Library=yast2
X-SuSE-YaST-Call=dhcp-server
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-dhcp-server-2.19.0/src/dns-server-wizard.ycp new/yast2-dhcp-server-2.21.0/src/dns-server-wizard.ycp
--- old/yast2-dhcp-server-2.19.0/src/dns-server-wizard.ycp 2009-04-29 12:58:09.000000000 +0200
+++ new/yast2-dhcp-server-2.21.0/src/dns-server-wizard.ycp 2011-07-11 13:33:28.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Synchronization with DNS Server
* Authors: Lukas Ocilka
*
- * $Id: dns-server-wizard.ycp 57028 2009-04-29 10:58:09Z lslezak $
+ * $Id: dns-server-wizard.ycp 64717 2011-07-04 09:13:33Z snwint $
*/
{
@@ -1066,7 +1066,7 @@
if (Popup::YesNo (sformat (
// TRANSLATORS: popup question, %1 is a list of errors
- _("Errors occured during DNS zone creation:
+ _("Errors occurred during DNS zone creation:
%1
Return to the wizard?
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-dhcp-server-2.19.0/testsuite/tests/Read.out new/yast2-dhcp-server-2.21.0/testsuite/tests/Read.out
--- old/yast2-dhcp-server-2.19.0/testsuite/tests/Read.out 2006-11-13 14:40:30.000000000 +0100
+++ new/yast2-dhcp-server-2.21.0/testsuite/tests/Read.out 2011-09-06 16:49:08.000000000 +0200
@@ -5,7 +5,7 @@
Read .sysconfig.dhcpd.DHCPD_OTHER_ARGS "-p 111"
Read .etc.dhcpd_conf [$["comment_after":"", "comment_before":"# dhcpd.conf", "key":"domain-name", "type":"option", "value":"\"example.org\""], $["comment_after":"", "comment_before":"", "key":"domain-name-servers", "type":"option", "value":"ns1.example.org, ns2.example.org"], $["comment_after":"", "comment_before":"", "key":"policy-filter", "type":"option", "value":"{ a1, a2 }, { a1, a2 }, { a3, a4 }"]]
Read .target.size "/etc/dhcpd.conf" 5
-Execute .target.bash "diff -q /etc/dhcpd.conf \\\n /usr/share/doc/packages/dhcp-server/dhcpd.conf" 1
+Execute .target.bash "rpm -q -V --file /etc/dhcpd.conf --nouser --nogroup --nomtime --nomode" 1
Read .target.stat "/var/lib/YaST2/dhcp_server_done_once" $[]
Return true
Return $["allowed_interfaces":["eth0", "eth2"], "chroot":"0", "other_options":"-p 111", "settings":[$["children":[], "comment_after":nil, "comment_before":nil, "directives":[], "id":"", "options":[$["comment_after":"", "comment_before":"# dhcpd.conf", "key":"domain-name", "type":"option", "value":"\"example.org\""], $["comment_after":"", "comment_before":"", "key":"domain-name-servers", "type":"option", "value":"ns1.example.org, ns2.example.org"], $["comment_after":"", "comment_before":"", "key":"policy-filter", "type":"option", "value":"{ a1, a2 }, { a1, a2 }, { a3, a4 }"]], "parent_id":"", "parent_type":"", "type":""]], "start_service":"0", "use_ldap":"0"]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-dhcp-server-2.19.0/testsuite/tests/YaPIAddDeclaration.out new/yast2-dhcp-server-2.21.0/testsuite/tests/YaPIAddDeclaration.out
--- old/yast2-dhcp-server-2.19.0/testsuite/tests/YaPIAddDeclaration.out 2006-11-13 14:40:30.000000000 +0100
+++ new/yast2-dhcp-server-2.21.0/testsuite/tests/YaPIAddDeclaration.out 2011-09-06 16:49:08.000000000 +0200
@@ -6,7 +6,7 @@
Read .sysconfig.dhcpd.DHCPD_OTHER_ARGS "-p 111"
Read .etc.dhcpd_conf [$["key":"domain-name", "type":"option", "value":"\"example.net\""], $["key":"ddns-update-style", "type":"directive", "value":"none"], $["key":"192.168.0.0 netmask 255.255.255.0", "type":"subnet", "value":[$["key":"range", "type":"directive", "value":"192.168.0.100 192.168.0.200"], $["key":"h1", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.1"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:66"]]], $["key":"h2", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.2"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:77"]]]]]]
Read .target.size "/etc/dhcpd.conf" 5
-Execute .target.bash "diff -q /etc/dhcpd.conf \\\n /usr/share/doc/packages/dhcp-server/dhcpd.conf" 1
+Execute .target.bash "rpm -q -V --file /etc/dhcpd.conf --nouser --nogroup --nomtime --nomode" 1
Read .target.stat "/var/lib/YaST2/dhcp_server_done_once" $[]
Write .etc.dhcpd_conf [$["key":"domain-name", "type":"option", "value":"\"example.net\""], $["key":"ddns-update-style", "type":"directive", "value":"none"], $["comment_after":nil, "comment_before":nil, "key":"192.168.0.0 netmask 255.255.255.0", "type":"subnet", "value":[$["key":"range", "type":"directive", "value":"192.168.0.100 192.168.0.200"], $["comment_after":nil, "comment_before":nil, "key":"h1", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.1"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:66"]]], $["comment_after":nil, "comment_before":nil, "key":"h2", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.2"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:77"]]]]], $["comment_after":"", "comment_before":"", "key":"192.168.5.1 netmask 255.255.255.0", "type":"subnet", "value":[]]] true
Write .sysconfig.dhcpd.DHCPD_RUN_CHROOTED "no" true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-dhcp-server-2.19.0/testsuite/tests/YaPIDeleteDeclartion.out new/yast2-dhcp-server-2.21.0/testsuite/tests/YaPIDeleteDeclartion.out
--- old/yast2-dhcp-server-2.19.0/testsuite/tests/YaPIDeleteDeclartion.out 2006-11-13 14:40:30.000000000 +0100
+++ new/yast2-dhcp-server-2.21.0/testsuite/tests/YaPIDeleteDeclartion.out 2011-09-06 16:49:08.000000000 +0200
@@ -6,7 +6,7 @@
Read .sysconfig.dhcpd.DHCPD_OTHER_ARGS "-p 111"
Read .etc.dhcpd_conf [$["key":"domain-name", "type":"option", "value":"\"example.net\""], $["key":"ddns-update-style", "type":"directive", "value":"none"], $["key":"192.168.0.0 netmask 255.255.255.0", "type":"subnet", "value":[$["key":"range", "type":"directive", "value":"192.168.0.100 192.168.0.200"], $["key":"h1", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.1"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:66"]]], $["key":"h2", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.2"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:77"]]]]]]
Read .target.size "/etc/dhcpd.conf" 5
-Execute .target.bash "diff -q /etc/dhcpd.conf \\\n /usr/share/doc/packages/dhcp-server/dhcpd.conf" 1
+Execute .target.bash "rpm -q -V --file /etc/dhcpd.conf --nouser --nogroup --nomtime --nomode" 1
Read .target.stat "/var/lib/YaST2/dhcp_server_done_once" $[]
Write .etc.dhcpd_conf [$["key":"domain-name", "type":"option", "value":"\"example.net\""], $["key":"ddns-update-style", "type":"directive", "value":"none"], $["comment_after":nil, "comment_before":nil, "key":"192.168.0.0 netmask 255.255.255.0", "type":"subnet", "value":[$["key":"range", "type":"directive", "value":"192.168.0.100 192.168.0.200"], $["comment_after":nil, "comment_before":nil, "key":"h2", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.2"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:77"]]]]]] true
Write .sysconfig.dhcpd.DHCPD_RUN_CHROOTED "no" true
@@ -23,7 +23,7 @@
Read .sysconfig.dhcpd.DHCPD_OTHER_ARGS "-p 111"
Read .etc.dhcpd_conf [$["key":"domain-name", "type":"option", "value":"\"example.net\""], $["key":"ddns-update-style", "type":"directive", "value":"none"], $["key":"192.168.0.0 netmask 255.255.255.0", "type":"subnet", "value":[$["key":"range", "type":"directive", "value":"192.168.0.100 192.168.0.200"], $["key":"h1", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.1"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:66"]]], $["key":"h2", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.2"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:77"]]]]]]
Read .target.size "/etc/dhcpd.conf" 5
-Execute .target.bash "diff -q /etc/dhcpd.conf \\\n /usr/share/doc/packages/dhcp-server/dhcpd.conf" 1
+Execute .target.bash "rpm -q -V --file /etc/dhcpd.conf --nouser --nogroup --nomtime --nomode" 1
Read .target.stat "/var/lib/YaST2/dhcp_server_done_once" $[]
Write .etc.dhcpd_conf [$["key":"domain-name", "type":"option", "value":"\"example.net\""], $["key":"ddns-update-style", "type":"directive", "value":"none"]] true
Write .sysconfig.dhcpd.DHCPD_RUN_CHROOTED "no" true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-dhcp-server-2.19.0/testsuite/tests/YaPIGetDeclarationChildren.out new/yast2-dhcp-server-2.21.0/testsuite/tests/YaPIGetDeclarationChildren.out
--- old/yast2-dhcp-server-2.19.0/testsuite/tests/YaPIGetDeclarationChildren.out 2006-11-13 14:40:30.000000000 +0100
+++ new/yast2-dhcp-server-2.21.0/testsuite/tests/YaPIGetDeclarationChildren.out 2011-09-06 16:49:08.000000000 +0200
@@ -6,7 +6,7 @@
Read .sysconfig.dhcpd.DHCPD_OTHER_ARGS "-p 111"
Read .etc.dhcpd_conf [$["key":"domain-name", "type":"option", "value":"\"example.net\""], $["key":"ddns-update-style", "type":"directive", "value":"none"], $["key":"192.168.0.0 netmask 255.255.255.0", "type":"subnet", "value":[$["key":"range", "type":"directive", "value":"192.168.0.100 192.168.0.200"], $["key":"h1", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.1"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:66"]]], $["key":"h2", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.2"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:77"]]]]]]
Read .target.size "/etc/dhcpd.conf" 5
-Execute .target.bash "diff -q /etc/dhcpd.conf \\\n /usr/share/doc/packages/dhcp-server/dhcpd.conf" 1
+Execute .target.bash "rpm -q -V --file /etc/dhcpd.conf --nouser --nogroup --nomtime --nomode" 1
Read .target.stat "/var/lib/YaST2/dhcp_server_done_once" $[]
Return [$["id":"192.168.0.0 netmask 255.255.255.0", "type":"subnet"]]
Dump ==========================================================
@@ -17,7 +17,7 @@
Read .sysconfig.dhcpd.DHCPD_OTHER_ARGS "-p 111"
Read .etc.dhcpd_conf [$["key":"domain-name", "type":"option", "value":"\"example.net\""], $["key":"ddns-update-style", "type":"directive", "value":"none"], $["key":"192.168.0.0 netmask 255.255.255.0", "type":"subnet", "value":[$["key":"range", "type":"directive", "value":"192.168.0.100 192.168.0.200"], $["key":"h1", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.1"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:66"]]], $["key":"h2", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.2"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:77"]]]]]]
Read .target.size "/etc/dhcpd.conf" 5
-Execute .target.bash "diff -q /etc/dhcpd.conf \\\n /usr/share/doc/packages/dhcp-server/dhcpd.conf" 1
+Execute .target.bash "rpm -q -V --file /etc/dhcpd.conf --nouser --nogroup --nomtime --nomode" 1
Read .target.stat "/var/lib/YaST2/dhcp_server_done_once" $[]
Return [$["id":"h1", "type":"host"], $["id":"h2", "type":"host"]]
Dump ==========================================================
@@ -28,7 +28,7 @@
Read .sysconfig.dhcpd.DHCPD_OTHER_ARGS "-p 111"
Read .etc.dhcpd_conf [$["key":"domain-name", "type":"option", "value":"\"example.net\""], $["key":"ddns-update-style", "type":"directive", "value":"none"], $["key":"192.168.0.0 netmask 255.255.255.0", "type":"subnet", "value":[$["key":"range", "type":"directive", "value":"192.168.0.100 192.168.0.200"], $["key":"h1", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.1"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:66"]]], $["key":"h2", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.2"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:77"]]]]]]
Read .target.size "/etc/dhcpd.conf" 5
-Execute .target.bash "diff -q /etc/dhcpd.conf \\\n /usr/share/doc/packages/dhcp-server/dhcpd.conf" 1
+Execute .target.bash "rpm -q -V --file /etc/dhcpd.conf --nouser --nogroup --nomtime --nomode" 1
Read .target.stat "/var/lib/YaST2/dhcp_server_done_once" $[]
Return []
Dump ==========================================================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-dhcp-server-2.19.0/testsuite/tests/YaPIGetDeclarationDirectives.out new/yast2-dhcp-server-2.21.0/testsuite/tests/YaPIGetDeclarationDirectives.out
--- old/yast2-dhcp-server-2.19.0/testsuite/tests/YaPIGetDeclarationDirectives.out 2006-11-13 14:40:30.000000000 +0100
+++ new/yast2-dhcp-server-2.21.0/testsuite/tests/YaPIGetDeclarationDirectives.out 2011-09-06 16:49:08.000000000 +0200
@@ -6,7 +6,7 @@
Read .sysconfig.dhcpd.DHCPD_OTHER_ARGS "-p 111"
Read .etc.dhcpd_conf [$["key":"domain-name", "type":"option", "value":"\"example.net\""], $["key":"ddns-update-style", "type":"directive", "value":"none"], $["key":"192.168.0.0 netmask 255.255.255.0", "type":"subnet", "value":[$["key":"range", "type":"directive", "value":"192.168.0.100 192.168.0.200"], $["key":"h1", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.1"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:66"]]], $["key":"h2", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.2"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:77"]]]]]]
Read .target.size "/etc/dhcpd.conf" 5
-Execute .target.bash "diff -q /etc/dhcpd.conf \\\n /usr/share/doc/packages/dhcp-server/dhcpd.conf" 1
+Execute .target.bash "rpm -q -V --file /etc/dhcpd.conf --nouser --nogroup --nomtime --nomode" 1
Read .target.stat "/var/lib/YaST2/dhcp_server_done_once" $[]
Return [$["key":"range", "type":"directive", "value":"192.168.0.100 192.168.0.200"]]
Dump ==========================================================
@@ -17,7 +17,7 @@
Read .sysconfig.dhcpd.DHCPD_OTHER_ARGS "-p 111"
Read .etc.dhcpd_conf [$["key":"domain-name", "type":"option", "value":"\"example.net\""], $["key":"ddns-update-style", "type":"directive", "value":"none"], $["key":"192.168.0.0 netmask 255.255.255.0", "type":"subnet", "value":[$["key":"range", "type":"directive", "value":"192.168.0.100 192.168.0.200"], $["key":"h1", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.1"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:66"]]], $["key":"h2", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.2"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:77"]]]]]]
Read .target.size "/etc/dhcpd.conf" 5
-Execute .target.bash "diff -q /etc/dhcpd.conf \\\n /usr/share/doc/packages/dhcp-server/dhcpd.conf" 1
+Execute .target.bash "rpm -q -V --file /etc/dhcpd.conf --nouser --nogroup --nomtime --nomode" 1
Read .target.stat "/var/lib/YaST2/dhcp_server_done_once" $[]
Return [$["key":"ddns-update-style", "type":"directive", "value":"none"]]
Dump ==========================================================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-dhcp-server-2.19.0/testsuite/tests/YaPIGetDeclarationOptions.out new/yast2-dhcp-server-2.21.0/testsuite/tests/YaPIGetDeclarationOptions.out
--- old/yast2-dhcp-server-2.19.0/testsuite/tests/YaPIGetDeclarationOptions.out 2006-11-13 14:40:30.000000000 +0100
+++ new/yast2-dhcp-server-2.21.0/testsuite/tests/YaPIGetDeclarationOptions.out 2011-09-06 16:49:08.000000000 +0200
@@ -6,7 +6,7 @@
Read .sysconfig.dhcpd.DHCPD_OTHER_ARGS "-p 111"
Read .etc.dhcpd_conf [$["key":"domain-name", "type":"option", "value":"\"example.net\""], $["key":"ddns-update-style", "type":"directive", "value":"none"], $["key":"192.168.0.0 netmask 255.255.255.0", "type":"subnet", "value":[$["key":"range", "type":"directive", "value":"192.168.0.100 192.168.0.200"], $["key":"h1", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.1"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:66"]]], $["key":"h2", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.2"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:77"]]]]]]
Read .target.size "/etc/dhcpd.conf" 5
-Execute .target.bash "diff -q /etc/dhcpd.conf \\\n /usr/share/doc/packages/dhcp-server/dhcpd.conf" 1
+Execute .target.bash "rpm -q -V --file /etc/dhcpd.conf --nouser --nogroup --nomtime --nomode" 1
Read .target.stat "/var/lib/YaST2/dhcp_server_done_once" $[]
Return []
Dump ==========================================================
@@ -17,7 +17,7 @@
Read .sysconfig.dhcpd.DHCPD_OTHER_ARGS "-p 111"
Read .etc.dhcpd_conf [$["key":"domain-name", "type":"option", "value":"\"example.net\""], $["key":"ddns-update-style", "type":"directive", "value":"none"], $["key":"192.168.0.0 netmask 255.255.255.0", "type":"subnet", "value":[$["key":"range", "type":"directive", "value":"192.168.0.100 192.168.0.200"], $["key":"h1", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.1"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:66"]]], $["key":"h2", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.2"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:77"]]]]]]
Read .target.size "/etc/dhcpd.conf" 5
-Execute .target.bash "diff -q /etc/dhcpd.conf \\\n /usr/share/doc/packages/dhcp-server/dhcpd.conf" 1
+Execute .target.bash "rpm -q -V --file /etc/dhcpd.conf --nouser --nogroup --nomtime --nomode" 1
Read .target.stat "/var/lib/YaST2/dhcp_server_done_once" $[]
Return [$["key":"domain-name", "type":"option", "value":"\"example.net\""]]
Dump ==========================================================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-dhcp-server-2.19.0/testsuite/tests/YaPIGetDeclarationParent.out new/yast2-dhcp-server-2.21.0/testsuite/tests/YaPIGetDeclarationParent.out
--- old/yast2-dhcp-server-2.19.0/testsuite/tests/YaPIGetDeclarationParent.out 2006-11-13 14:40:30.000000000 +0100
+++ new/yast2-dhcp-server-2.21.0/testsuite/tests/YaPIGetDeclarationParent.out 2011-09-06 16:49:08.000000000 +0200
@@ -6,7 +6,7 @@
Read .sysconfig.dhcpd.DHCPD_OTHER_ARGS "-p 111"
Read .etc.dhcpd_conf [$["key":"domain-name", "type":"option", "value":"\"example.net\""], $["key":"ddns-update-style", "type":"directive", "value":"none"], $["key":"192.168.0.0 netmask 255.255.255.0", "type":"subnet", "value":[$["key":"range", "type":"directive", "value":"192.168.0.100 192.168.0.200"], $["key":"h1", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.1"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:66"]]], $["key":"h2", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.2"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:77"]]]]]]
Read .target.size "/etc/dhcpd.conf" 5
-Execute .target.bash "diff -q /etc/dhcpd.conf \\\n /usr/share/doc/packages/dhcp-server/dhcpd.conf" 1
+Execute .target.bash "rpm -q -V --file /etc/dhcpd.conf --nouser --nogroup --nomtime --nomode" 1
Read .target.stat "/var/lib/YaST2/dhcp_server_done_once" $[]
Return $["id":"", "type":""]
Dump ==========================================================
@@ -17,7 +17,7 @@
Read .sysconfig.dhcpd.DHCPD_OTHER_ARGS "-p 111"
Read .etc.dhcpd_conf [$["key":"domain-name", "type":"option", "value":"\"example.net\""], $["key":"ddns-update-style", "type":"directive", "value":"none"], $["key":"192.168.0.0 netmask 255.255.255.0", "type":"subnet", "value":[$["key":"range", "type":"directive", "value":"192.168.0.100 192.168.0.200"], $["key":"h1", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.1"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:66"]]], $["key":"h2", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.2"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:77"]]]]]]
Read .target.size "/etc/dhcpd.conf" 5
-Execute .target.bash "diff -q /etc/dhcpd.conf \\\n /usr/share/doc/packages/dhcp-server/dhcpd.conf" 1
+Execute .target.bash "rpm -q -V --file /etc/dhcpd.conf --nouser --nogroup --nomtime --nomode" 1
Read .target.stat "/var/lib/YaST2/dhcp_server_done_once" $[]
Return $["id":"192.168.0.0 netmask 255.255.255.0", "type":"subnet"]
Dump ==========================================================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-dhcp-server-2.19.0/testsuite/tests/YaPISetDeclarationDirectives.out new/yast2-dhcp-server-2.21.0/testsuite/tests/YaPISetDeclarationDirectives.out
--- old/yast2-dhcp-server-2.19.0/testsuite/tests/YaPISetDeclarationDirectives.out 2006-11-13 14:40:30.000000000 +0100
+++ new/yast2-dhcp-server-2.21.0/testsuite/tests/YaPISetDeclarationDirectives.out 2011-09-06 16:49:08.000000000 +0200
@@ -6,7 +6,7 @@
Read .sysconfig.dhcpd.DHCPD_OTHER_ARGS "-p 111"
Read .etc.dhcpd_conf [$["key":"domain-name", "type":"option", "value":"\"example.net\""], $["key":"ddns-update-style", "type":"directive", "value":"none"], $["key":"192.168.0.0 netmask 255.255.255.0", "type":"subnet", "value":[$["key":"range", "type":"directive", "value":"192.168.0.100 192.168.0.200"], $["key":"h1", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.1"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:66"]]], $["key":"h2", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.2"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:77"]]]]]]
Read .target.size "/etc/dhcpd.conf" 5
-Execute .target.bash "diff -q /etc/dhcpd.conf \\\n /usr/share/doc/packages/dhcp-server/dhcpd.conf" 1
+Execute .target.bash "rpm -q -V --file /etc/dhcpd.conf --nouser --nogroup --nomtime --nomode" 1
Read .target.stat "/var/lib/YaST2/dhcp_server_done_once" $[]
Write .etc.dhcpd_conf [$["key":"domain-name", "type":"option", "value":"\"example.net\""], $["key":"ddns-update-style", "type":"directive", "value":"none"], $["comment_after":nil, "comment_before":nil, "key":"192.168.0.0 netmask 255.255.255.0", "type":"subnet", "value":[$["key":"max-lease-time", "type":"directive", "value":"123456"], $["key":"range", "type":"directive", "value":"192.168.0.110 192.168.0.220"], $["comment_after":nil, "comment_before":nil, "key":"h1", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.1"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:66"]]], $["comment_after":nil, "comment_before":nil, "key":"h2", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.2"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:77"]]]]]] true
Write .sysconfig.dhcpd.DHCPD_RUN_CHROOTED "no" true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-dhcp-server-2.19.0/testsuite/tests/YaPISetDeclarationOptions.out new/yast2-dhcp-server-2.21.0/testsuite/tests/YaPISetDeclarationOptions.out
--- old/yast2-dhcp-server-2.19.0/testsuite/tests/YaPISetDeclarationOptions.out 2006-11-13 14:40:30.000000000 +0100
+++ new/yast2-dhcp-server-2.21.0/testsuite/tests/YaPISetDeclarationOptions.out 2011-09-06 16:49:08.000000000 +0200
@@ -6,7 +6,7 @@
Read .sysconfig.dhcpd.DHCPD_OTHER_ARGS "-p 111"
Read .etc.dhcpd_conf [$["key":"domain-name", "type":"option", "value":"\"example.net\""], $["key":"ddns-update-style", "type":"directive", "value":"none"], $["key":"192.168.0.0 netmask 255.255.255.0", "type":"subnet", "value":[$["key":"range", "type":"directive", "value":"192.168.0.100 192.168.0.200"], $["key":"h1", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.1"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:66"]]], $["key":"h2", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.2"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:77"]]]]]]
Read .target.size "/etc/dhcpd.conf" 5
-Execute .target.bash "diff -q /etc/dhcpd.conf \\\n /usr/share/doc/packages/dhcp-server/dhcpd.conf" 1
+Execute .target.bash "rpm -q -V --file /etc/dhcpd.conf --nouser --nogroup --nomtime --nomode" 1
Read .target.stat "/var/lib/YaST2/dhcp_server_done_once" $[]
Write .etc.dhcpd_conf [$["key":"domain-name", "type":"option", "value":"\"example.net\""], $["key":"ddns-update-style", "type":"directive", "value":"none"], $["comment_after":nil, "comment_before":nil, "key":"192.168.0.0 netmask 255.255.255.0", "type":"subnet", "value":[$["key":"domain-name", "type":"directive", "value":"\"example.net\""], $["key":"wins-server", "type":"directive", "value":"wins.example.net"], $["comment_after":nil, "comment_before":nil, "key":"h1", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.1"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:66"]]], $["comment_after":nil, "comment_before":nil, "key":"h2", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.2"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:77"]]]]]] true
Write .sysconfig.dhcpd.DHCPD_RUN_CHROOTED "no" true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-dhcp-server-2.19.0/testsuite/tests/YaPISetDeclarationParent.out new/yast2-dhcp-server-2.21.0/testsuite/tests/YaPISetDeclarationParent.out
--- old/yast2-dhcp-server-2.19.0/testsuite/tests/YaPISetDeclarationParent.out 2006-11-13 14:40:30.000000000 +0100
+++ new/yast2-dhcp-server-2.21.0/testsuite/tests/YaPISetDeclarationParent.out 2011-09-06 16:49:08.000000000 +0200
@@ -6,7 +6,7 @@
Read .sysconfig.dhcpd.DHCPD_OTHER_ARGS "-p 111"
Read .etc.dhcpd_conf [$["key":"domain-name", "type":"option", "value":"\"example.net\""], $["key":"ddns-update-style", "type":"directive", "value":"none"], $["key":"192.168.0.0 netmask 255.255.255.0", "type":"subnet", "value":[$["key":"range", "type":"directive", "value":"192.168.0.100 192.168.0.200"], $["key":"h1", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.1"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:66"]]], $["key":"h2", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.2"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:77"]]]]]]
Read .target.size "/etc/dhcpd.conf" 5
-Execute .target.bash "diff -q /etc/dhcpd.conf \\\n /usr/share/doc/packages/dhcp-server/dhcpd.conf" 1
+Execute .target.bash "rpm -q -V --file /etc/dhcpd.conf --nouser --nogroup --nomtime --nomode" 1
Read .target.stat "/var/lib/YaST2/dhcp_server_done_once" $[]
Write .etc.dhcpd_conf [$["key":"domain-name", "type":"option", "value":"\"example.net\""], $["key":"ddns-update-style", "type":"directive", "value":"none"], $["comment_after":nil, "comment_before":nil, "key":"192.168.0.0 netmask 255.255.255.0", "type":"subnet", "value":[$["key":"range", "type":"directive", "value":"192.168.0.100 192.168.0.200"], $["comment_after":nil, "comment_before":nil, "key":"h2", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.2"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:77"]]]]], $["comment_after":nil, "comment_before":nil, "key":"h1", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.1"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:66"]]]] true
Write .sysconfig.dhcpd.DHCPD_RUN_CHROOTED "no" true
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org