Hello community,
here is the log from the commit of package yast2-dns-server
checked in at Thu Aug 7 01:39:53 CEST 2008.
--------
--- yast2-dns-server/yast2-dns-server.changes 2008-08-05 10:53:45.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-dns-server/yast2-dns-server.changes 2008-08-06 15:56:00.000000000 +0200
@@ -1,0 +2,7 @@
+Wed Aug 6 15:54:32 CEST 2008 - locilka@suse.cz
+
+- DNS zones need a FQDN hostname, using /etc/HOSTNAME as a fallback
+ when hostname --fqdn returns empty string (bnc #403468).
+- 2.17.5
+
+-------------------------------------------------------------------
Old:
----
yast2-dns-server-2.17.4.tar.bz2
New:
----
yast2-dns-server-2.17.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-dns-server.spec ++++++
--- /var/tmp/diff_new_pack.O22722/_old 2008-08-07 01:39:42.000000000 +0200
+++ /var/tmp/diff_new_pack.O22722/_new 2008-08-07 01:39:42.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-dns-server (Version 2.17.4)
+# spec file for package yast2-dns-server (Version 2.17.5)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-dns-server
-Version: 2.17.4
+Version: 2.17.5
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-dns-server-2.17.4.tar.bz2
+Source0: yast2-dns-server-2.17.5.tar.bz2
Prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-ldap-client yast2-perl-bindings yast2-testsuite
# requires DnsServerAPI::GetReverseIPforIPv6
@@ -56,7 +56,7 @@
Lukas Ocilka
%prep
-%setup -n yast2-dns-server-2.17.4
+%setup -n yast2-dns-server-2.17.5
%build
%{prefix}/bin/y2tool y2autoconf
@@ -99,6 +99,10 @@
/usr/share/YaST2/schema/autoyast/rnc/dns-server.rnc
%doc %{prefix}/share/doc/packages/yast2-dns-server
%changelog
+* Wed Aug 06 2008 locilka@suse.cz
+- DNS zones need a FQDN hostname, using /etc/HOSTNAME as a fallback
+ when hostname --fqdn returns empty string (bnc #403468).
+- 2.17.5
* Tue Aug 05 2008 locilka@suse.cz
- Adjusted to the newest LDAP SCR agent (patch written by jsuchome)
(FATE #303596).
++++++ yast2-dns-server-2.17.4.tar.bz2 -> yast2-dns-server-2.17.5.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.17.4/configure new/yast2-dns-server-2.17.5/configure
--- old/yast2-dns-server-2.17.4/configure 2008-07-23 15:38:20.000000000 +0200
+++ new/yast2-dns-server-2.17.5/configure 2008-08-06 16:16:15.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-dns-server 2.17.3.
+# Generated by GNU Autoconf 2.61 for yast2-dns-server 2.17.5.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-dns-server'
PACKAGE_TARNAME='yast2-dns-server'
-PACKAGE_VERSION='2.17.3'
-PACKAGE_STRING='yast2-dns-server 2.17.3'
+PACKAGE_VERSION='2.17.5'
+PACKAGE_STRING='yast2-dns-server 2.17.5'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1197,7 +1197,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.17.3 to adapt to many kinds of systems.
+\`configure' configures yast2-dns-server 2.17.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1268,7 +1268,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-dns-server 2.17.3:";;
+ short | recursive ) echo "Configuration of yast2-dns-server 2.17.5:";;
esac
cat <<\_ACEOF
@@ -1346,7 +1346,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-dns-server configure 2.17.3
+yast2-dns-server configure 2.17.5
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1360,7 +1360,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.17.3, which was
+It was created by yast2-dns-server $as_me 2.17.5, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2181,7 +2181,7 @@
# Define the identity of the package.
PACKAGE='yast2-dns-server'
- VERSION='2.17.3'
+ VERSION='2.17.5'
cat >>confdefs.h <<_ACEOF
@@ -2409,7 +2409,7 @@
-VERSION="2.17.3"
+VERSION="2.17.5"
RPMNAME="yast2-dns-server"
MAINTAINER="Lukas Ocilka "
@@ -3304,7 +3304,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-dns-server $as_me 2.17.3, which was
+This file was extended by yast2-dns-server $as_me 2.17.5, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3347,7 +3347,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-dns-server config.status 2.17.3
+yast2-dns-server config.status 2.17.5
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-dns-server-2.17.4/configure.in new/yast2-dns-server-2.17.5/configure.in
--- old/yast2-dns-server-2.17.4/configure.in 2008-07-23 15:38:17.000000000 +0200
+++ new/yast2-dns-server-2.17.5/configure.in 2008-08-06 16:16:11.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-dns-server
dnl
-dnl -- This file is generated by y2autoconf 2.17.0 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.17.5 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-dns-server, 2.17.3, http://bugs.opensuse.org/, yast2-dns-server)
+AC_INIT(yast2-dns-server, 2.17.5, http://bugs.opensuse.org/, yast2-dns-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.17.3"
+VERSION="2.17.5"
RPMNAME="yast2-dns-server"
MAINTAINER="Lukas Ocilka "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.17.4/src/DnsZones.pm new/yast2-dns-server-2.17.5/src/DnsZones.pm
--- old/yast2-dns-server-2.17.4/src/DnsZones.pm 2008-08-05 10:54:02.000000000 +0200
+++ new/yast2-dns-server-2.17.5/src/DnsZones.pm 2008-08-06 16:14:27.000000000 +0200
@@ -5,7 +5,7 @@
# Authors: Jiri Srain
# Lukas Ocilka
#
-# $Id: DnsZones.pm 49676 2008-08-05 08:54:01Z locilka $
+# $Id: DnsZones.pm 49781 2008-08-06 14:14:27Z locilka $
#
# Contains routines for handling zone files (both directly and using nsupdate)
@@ -24,6 +24,7 @@
YaST::YCP::Import ("Hostname");
YaST::YCP::Import ("String");
+YaST::YCP::Import ("Mode");
#use io_routines;
#use check_routines;
@@ -58,13 +59,25 @@
my $self = shift;
my $out = SCR->Execute (".target.bash_output", "/bin/hostname --fqdn");
- if ($out->{"exit"} ne 0)
- {
- return "@";
+
+ if (Mode->test()) {
+ return "";
+ }
+
+ # standard return
+ if ($out->{"exit"} eq "0") {
+ my $stdout = $out->{"stdout"};
+ my ($ret, $rest) = split ("\n", $stdout, 2);
+
+ return $ret;
+ # fallback
+ } else {
+ my $hostname = SCR->Read (".target.string", "/etc/HOSTNAME");
+ my ($ret, $rest) = split ("\n", $hostname, 2);
+ y2warning ("Using fallback hostname: ".$ret);
+
+ return $ret;
}
- my $stdout = $out->{"stdout"};
- my ($ret, $rest) = split ("\n", $stdout, 2);
- return $ret;
}
BEGIN { $TYPEINFO{AbsoluteZoneFileName} = ["function", "string", "string" ]; }
@@ -129,7 +142,11 @@
sub GetDefaultSOA {
my $self = shift;
- my $fqdn = $self->GetFQDN ();
+ my $fqdn = $self->GetFQDN();
+ if ($fqdn eq "") {
+ $fqdn = "linux.site";
+ }
+
$fqdn = "$fqdn.";
my $adm_mail = "root.$fqdn";
my %soa = (
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.17.4/VERSION new/yast2-dns-server-2.17.5/VERSION
--- old/yast2-dns-server-2.17.4/VERSION 2008-08-05 10:53:52.000000000 +0200
+++ new/yast2-dns-server-2.17.5/VERSION 2008-08-06 16:05:07.000000000 +0200
@@ -1 +1 @@
-2.17.4
+2.17.5
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org