Hello community,
here is the log from the commit of package yast2-dns-server
checked in at Mon Oct 2 19:15:09 CEST 2006.
--------
--- yast2-dns-server/yast2-dns-server.changes 2006-09-07 10:58:46.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-dns-server/yast2-dns-server.changes 2006-10-02 17:55:01.000000000 +0200
@@ -1,0 +2,14 @@
+Mon Oct 2 16:56:41 CEST 2006 - locilka@suse.cz
+
+- Merged proofread texts
+- 2.13.20
+
+-------------------------------------------------------------------
+Mon Sep 25 09:55:46 CEST 2006 - locilka@suse.cz
+
+- Handling possible exception of hand-edited configuration of
+ forwarders (Enhancement related to bug #134692).
+- Adjusted testsuites.
+- 2.13.19
+
+-------------------------------------------------------------------
Old:
----
yast2-dns-server-2.13.18.tar.bz2
New:
----
yast2-dns-server-2.13.20.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-dns-server.spec ++++++
--- /var/tmp/diff_new_pack.RGnwWy/_old 2006-10-02 19:13:15.000000000 +0200
+++ /var/tmp/diff_new_pack.RGnwWy/_new 2006-10-02 19:13:15.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-dns-server (Version 2.13.18)
+# spec file for package yast2-dns-server (Version 2.13.20)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-dns-server
-Version: 2.13.18
+Version: 2.13.20
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-dns-server-2.13.18.tar.bz2
+Source0: yast2-dns-server-2.13.20.tar.bz2
prefix: /usr
BuildRequires: perl-Digest-SHA1 perl-X500-DN perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-ldap-client yast2-perl-bindings yast2-testsuite
Requires: yast2 /usr/bin/host perl-gettext yast2-perl-bindings bind-utils yast2-ldap perl-X500-DN perl-Digest-SHA1 perl-Parse-RecDescent yast2-ldap-client
@@ -36,7 +36,7 @@
Lukas Ocilka
%prep
-%setup -n yast2-dns-server-2.13.18
+%setup -n yast2-dns-server-2.13.20
%build
%{prefix}/bin/y2tool y2autoconf
@@ -79,6 +79,14 @@
%doc %{prefix}/share/doc/packages/yast2-dns-server
%changelog -n yast2-dns-server
+* Mon Oct 02 2006 - locilka@suse.cz
+- Merged proofread texts
+- 2.13.20
+* Mon Sep 25 2006 - locilka@suse.cz
+- Handling possible exception of hand-edited configuration of
+ forwarders (Enhancement related to bug #134692).
+- Adjusted testsuites.
+- 2.13.19
* Thu Sep 07 2006 - locilka@suse.cz
- Fixed "Enable Zone Transfer" behavior. Transfers are enabled for
anybody by default if the allow-transfer options is not mentioned
++++++ yast2-dns-server-2.13.18.tar.bz2 -> yast2-dns-server-2.13.20.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.13.18/VERSION new/yast2-dns-server-2.13.20/VERSION
--- old/yast2-dns-server-2.13.18/VERSION 2006-09-07 10:59:04.000000000 +0200
+++ new/yast2-dns-server-2.13.20/VERSION 2006-10-02 18:01:28.000000000 +0200
@@ -1 +1 @@
-2.13.18
+2.13.20
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.13.18/agents/ag_named_forwarders new/yast2-dns-server-2.13.20/agents/ag_named_forwarders
--- old/yast2-dns-server-2.13.18/agents/ag_named_forwarders 2006-06-26 09:07:32.000000000 +0200
+++ new/yast2-dns-server-2.13.20/agents/ag_named_forwarders 2006-09-25 09:42:36.000000000 +0200
@@ -15,7 +15,7 @@
my $file = $a[0];
my $forwarders = $a[1];
- y2milestone ("Writing forwarders to file ".$file);
+ y2milestone ("Writing forwarders ".$forwarders." to file ".$file);
open (OUT, ">$file") || do {
y2error("Cannot write forwarders into file ".$file.". ".$!);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.13.18/configure new/yast2-dns-server-2.13.20/configure
--- old/yast2-dns-server-2.13.18/configure 2006-09-07 11:01:59.000000000 +0200
+++ new/yast2-dns-server-2.13.20/configure 2006-09-25 10:23:58.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for yast2-dns-server 2.13.18.
+# Generated by GNU Autoconf 2.59 for yast2-dns-server 2.13.19.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -269,8 +269,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-dns-server'
PACKAGE_TARNAME='yast2-dns-server'
-PACKAGE_VERSION='2.13.18'
-PACKAGE_STRING='yast2-dns-server 2.13.18'
+PACKAGE_VERSION='2.13.19'
+PACKAGE_STRING='yast2-dns-server 2.13.19'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -728,7 +728,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-dns-server 2.13.18 to adapt to many kinds of systems.
+\`configure' configures yast2-dns-server 2.13.19 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -795,7 +795,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-dns-server 2.13.18:";;
+ short | recursive ) echo "Configuration of yast2-dns-server 2.13.19:";;
esac
cat <<\_ACEOF
@@ -908,7 +908,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-yast2-dns-server configure 2.13.18
+yast2-dns-server configure 2.13.19
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -922,7 +922,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-dns-server $as_me 2.13.18, which was
+It was created by yast2-dns-server $as_me 2.13.19, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1652,7 +1652,7 @@
# Define the identity of the package.
PACKAGE='yast2-dns-server'
- VERSION='2.13.18'
+ VERSION='2.13.19'
cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
-VERSION="2.13.18"
+VERSION="2.13.19"
RPMNAME="yast2-dns-server"
MAINTAINER="Lukas Ocilka "
@@ -2693,7 +2693,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2-dns-server $as_me 2.13.18, which was
+This file was extended by yast2-dns-server $as_me 2.13.19, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2748,7 +2748,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-dns-server config.status 2.13.18
+yast2-dns-server config.status 2.13.19
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.13.18/configure.in new/yast2-dns-server-2.13.20/configure.in
--- old/yast2-dns-server-2.13.18/configure.in 2006-09-07 11:01:55.000000000 +0200
+++ new/yast2-dns-server-2.13.20/configure.in 2006-09-25 10:23:53.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.13.19 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-dns-server, 2.13.18, http://bugs.opensuse.org/, yast2-dns-server)
+AC_INIT(yast2-dns-server, 2.13.19, http://bugs.opensuse.org/, yast2-dns-server)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.13.18"
+VERSION="2.13.19"
RPMNAME="yast2-dns-server"
MAINTAINER="Lukas Ocilka "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.13.18/src/DnsServer.pm new/yast2-dns-server-2.13.20/src/DnsServer.pm
--- old/yast2-dns-server-2.13.18/src/DnsServer.pm 2006-08-04 16:04:28.000000000 +0200
+++ new/yast2-dns-server-2.13.20/src/DnsServer.pm 2006-09-25 09:53:30.000000000 +0200
@@ -552,9 +552,12 @@
my @values = @{$opt_map{$key} || []};
SCR->Write (".dns.named.value.options.\"\Q$key\E\"", \@values);
} else {
- $forwarders_found = 1;
- # writing forwarders into single file
- SCR->Write (".dns.named-forwarders", [$forwarders_include, @{$opt_map{$key}}[0]]);
+ # handling an exception
+ if (defined @{$opt_map{$key}}[0] && @{$opt_map{$key}}[0] != "") {
+ $forwarders_found = 1;
+ # writing forwarders into single file
+ SCR->Write (".dns.named-forwarders", [$forwarders_include, @{$opt_map{$key}}[0]]);
+ }
}
}
# forwarders not defined, but they must be at least empty
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.13.18/src/dialog-installwizard.ycp new/yast2-dns-server-2.13.20/src/dialog-installwizard.ycp
--- old/yast2-dns-server-2.13.18/src/dialog-installwizard.ycp 2006-06-26 09:07:34.000000000 +0200
+++ new/yast2-dns-server-2.13.20/src/dialog-installwizard.ycp 2006-10-02 18:01:52.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Jiri Srain
* Lukas Ocilka
*
- * $Id: dialog-installwizard.ycp 23999 2005-07-12 09:50:10Z locilka $
+ * $Id: dialog-installwizard.ycp 33239 2006-10-02 16:01:51Z locilka $
*/
{
@@ -34,6 +34,7 @@
Wizard::SetContentsButtons ( caption, contents, HELPS["forwarders"]:"",
Label::BackButton (), Label::NextButton ()
);
+ Wizard::SetDesktopIcon("dns-server");
Wizard::SetAbortButton ( `abort, Label::CancelButton() );
Wizard::HideBackButton ();
InitExpertForwardersPage ("forwarders");
@@ -82,6 +83,7 @@
caption, ExpertZonesDialog (), HELPS["zones"]:"",
Label::BackButton (), Label::NextButton ()
);
+ Wizard::SetDesktopIcon("dns-server");
Wizard::RestoreAbortButton ();
Wizard::RestoreBackButton ();
Wizard::RestoreNextButton ();
@@ -212,6 +214,7 @@
HELPS["installwizard_step3"]:"" + firewall_help,
Label::BackButton (), Label::NextButton ()
);
+ Wizard::SetDesktopIcon("dns-server");
Wizard::SetNextButton ( `next, Label::FinishButton() );
boolean auto_start = DnsServer::GetStartService ();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.13.18/src/dialog-masterzone.ycp new/yast2-dns-server-2.13.20/src/dialog-masterzone.ycp
--- old/yast2-dns-server-2.13.18/src/dialog-masterzone.ycp 2006-09-07 10:59:17.000000000 +0200
+++ new/yast2-dns-server-2.13.20/src/dialog-masterzone.ycp 2006-10-02 18:01:52.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Jiri Srain ,
* Lukas Ocilka
*
- * $Id: dialog-masterzone.ycp 32756 2006-09-07 09:00:52Z locilka $
+ * $Id: dialog-masterzone.ycp 33239 2006-10-02 16:01:51Z locilka $
*/
{
@@ -232,6 +232,8 @@
* Initialize the tab of the dialog
*/
void InitZoneBasicsTab () {
+ Wizard::SetDesktopIcon("dns-server");
+
boolean allowed = false;
string key = nil;
foreach (map m, current_zone["options"]:[], ``{
@@ -1908,10 +1910,9 @@
} else if (ret == `next) {
if (size(current_zone_forwarders) == 0) {
// TRANSLATORS: popup question
- if (! Popup::YesNo(_("This forward zone has no forwarders defined which means
-that all DNS queries for this zone will be denied.
-
-Are you sure you want to deny these queries?"))) {
+ if (! Popup::YesNo(_("This forward zone has no forwarders defined, which means
+that all DNS queries for this zone are denied.
+Really deny these queries?"))) {
continue;
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.13.18/src/helps.ycp new/yast2-dns-server-2.13.20/src/helps.ycp
--- old/yast2-dns-server-2.13.18/src/helps.ycp 2006-08-03 11:07:01.000000000 +0200
+++ new/yast2-dns-server-2.13.20/src/helps.ycp 2006-10-02 17:55:18.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Jiri Srain ,
* Lukas Ocilka
*
- * $Id: helps.ycp 32131 2006-08-03 09:08:34Z locilka $
+ * $Id: helps.ycp 33238 2006-10-02 15:55:15Z locilka $
*/
{
@@ -280,19 +280,22 @@
_("<p>To remove an existing key, select it and
click <b>Delete</b>.</p>"),
- /* Expert Mode Configuration - Zones 1/2 */
+ /* Expert Mode Configuration - Zones 1/3 */
"zones" : _("<p><b><big>DNS Zones</big></b><br>
Use this dialog to manage the DNS zones.</p>
") +
- /* Expert Mode Configuration - Zones 2/2 */
+ /* Expert Mode Configuration - Zones 2/3 */
_("<p>To add a new zone, enter its <b>Zone Name</b>, select the <b>Zone Type</b>,
and click <b>Add</b>.
-To add a new reverse zone, enter a part of reverse IP address followed by
+To add a new reverse zone, enter a part of the reverse IP address followed by
<tt>.in-addr.arpa</tt> as its <b>Zone Name</b> (for example, zone name
<tt>0.168.192.in-addr.arpa</tt> for network <tt>192.168.0.0/24</tt>), select
the <b>Zone Type</b>, and click <b>Add</b>.</p>
-<p>To modify settings for a zone, such as zone transport and name and
+") +
+
+ /* Expert Mode Configuration - Zones 3/3 */
+_("<p>To modify settings for a zone, such as zone transport and name and
mail servers, select it then click <b>Edit Zone</b>.
To remove a configured zone, select it and click <b>Delete Zone</b>.</p>
"),
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.13.18/testsuite/tests/YaPIWriteZones.out new/yast2-dns-server-2.13.20/testsuite/tests/YaPIWriteZones.out
--- old/yast2-dns-server-2.13.18/testsuite/tests/YaPIWriteZones.out 2006-07-27 10:00:47.000000000 +0200
+++ new/yast2-dns-server-2.13.20/testsuite/tests/YaPIWriteZones.out 2006-09-25 10:50:25.000000000 +0200
@@ -26,9 +26,9 @@
Dir .dns.named.value.options: ["directory", "notify"]
Write .dns.named.value.options."forwarders" nil true
Write .dns.named.value.options."directory" ["\"/var/lib/named\""] true
-Write .dns.named-forwarders ["/etc/named.d/forwarders.conf", ""] true
Write .dns.named.value.options."include" ["\"/etc/named.d/forwarders.conf\""] true
Write .dns.named.value.options."notify" ["no"] true
+Write .dns.named-forwarders ["/etc/named.d/forwarders.conf", "{}"] true
Dir .dns.named.section: ["options", "zone \"localhost\" in"]
Write .dns.named nil true
Dir .dns.named.value: ["acl", "options", "zone \"localhost\" in"]
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
