Hello community,
here is the log from the commit of package yast2-ca-management for openSUSE:Factory
checked in at Fri Jan 9 02:11:52 CET 2009.
--------
--- yast2-ca-management/yast2-ca-management.changes 2008-12-12 13:23:04.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-ca-management/yast2-ca-management.changes 2009-01-07 16:45:42.599678000 +0100
@@ -1,0 +2,7 @@
+Wed Jan 7 15:28:27 CET 2009 - mc@suse.de
+
+- version 2.17.9
+- use Hostname::CurrentFQ() as hostname fallback in proposal.
+ (bnc#460737)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-ca-management-2.17.8.tar.bz2
New:
----
yast2-ca-management-2.17.9.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-ca-management.spec ++++++
--- /var/tmp/diff_new_pack.A20524/_old 2009-01-09 02:11:42.000000000 +0100
+++ /var/tmp/diff_new_pack.A20524/_new 2009-01-09 02:11:42.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package yast2-ca-management (Version 2.17.8)
+# spec file for package yast2-ca-management (Version 2.17.9)
#
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2009 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,12 +19,12 @@
Name: yast2-ca-management
-Version: 2.17.8
+Version: 2.17.9
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-ca-management-2.17.8.tar.bz2
+Source0: yast2-ca-management-2.17.9.tar.bz2
Prefix: /usr
BuildRequires: docbook-xsl-stylesheets dosfstools doxygen libxslt limal-ca-mgm-perl limal-perl perl-Date-Calc perl-URI perl-X500-DN perl-XML-Writer pkg-config update-desktop-files yast2 yast2-core yast2-devtools
Requires: yast2 perl perl-gettext yast2-perl-bindings perl-X500-DN perl-Date-Calc limal-perl perl-Config-IniFiles perl-URI
@@ -38,7 +38,7 @@
%prep
-%setup -n yast2-ca-management-2.17.8
+%setup -n yast2-ca-management-2.17.9
%build
%{prefix}/bin/y2tool y2autoconf
@@ -85,6 +85,10 @@
/usr/bin/exportCRL.pl
%attr(600, root, root) %config(noreplace) /etc/generateCRL.conf
%changelog
+* Wed Jan 07 2009 mc@suse.de
+- version 2.17.9
+- use Hostname::CurrentFQ() as hostname fallback in proposal.
+ (bnc#460737)
* Fri Dec 12 2008 mc@suse.de
- version 2.17.8
- fix closing common cert window via (X) in the window decoration
++++++ yast2-ca-management-2.17.8.tar.bz2 -> yast2-ca-management-2.17.9.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ca-management-2.17.8/configure new/yast2-ca-management-2.17.9/configure
--- old/yast2-ca-management-2.17.8/configure 2008-12-12 13:20:57.000000000 +0100
+++ new/yast2-ca-management-2.17.9/configure 2009-01-07 15:30:39.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for yast2-ca-management 2.17.8.
+# Generated by GNU Autoconf 2.63 for yast2-ca-management 2.17.9.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -596,8 +596,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-ca-management'
PACKAGE_TARNAME='yast2-ca-management'
-PACKAGE_VERSION='2.17.8'
-PACKAGE_STRING='yast2-ca-management 2.17.8'
+PACKAGE_VERSION='2.17.9'
+PACKAGE_STRING='yast2-ca-management 2.17.9'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1274,7 +1274,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-ca-management 2.17.8 to adapt to many kinds of systems.
+\`configure' configures yast2-ca-management 2.17.9 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1346,7 +1346,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-ca-management 2.17.8:";;
+ short | recursive ) echo "Configuration of yast2-ca-management 2.17.9:";;
esac
cat <<\_ACEOF
@@ -1426,7 +1426,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-ca-management configure 2.17.8
+yast2-ca-management configure 2.17.9
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1440,7 +1440,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-ca-management $as_me 2.17.8, which was
+It was created by yast2-ca-management $as_me 2.17.9, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2287,7 +2287,7 @@
# Define the identity of the package.
PACKAGE='yast2-ca-management'
- VERSION='2.17.8'
+ VERSION='2.17.9'
cat >>confdefs.h <<_ACEOF
@@ -2511,7 +2511,7 @@
-VERSION="2.17.8"
+VERSION="2.17.9"
RPMNAME="yast2-ca-management"
MAINTAINER="Michael Calmer , J. Daniel Schmidt "
@@ -3452,7 +3452,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-ca-management $as_me 2.17.8, which was
+This file was extended by yast2-ca-management $as_me 2.17.9, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3502,7 +3502,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-yast2-ca-management config.status 2.17.8
+yast2-ca-management config.status 2.17.9
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ca-management-2.17.8/configure.in new/yast2-ca-management-2.17.9/configure.in
--- old/yast2-ca-management-2.17.8/configure.in 2008-12-12 13:20:51.000000000 +0100
+++ new/yast2-ca-management-2.17.9/configure.in 2009-01-07 15:30:33.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.17.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-ca-management, 2.17.8, http://bugs.opensuse.org/, yast2-ca-management)
+AC_INIT(yast2-ca-management, 2.17.9, http://bugs.opensuse.org/, yast2-ca-management)
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.8"
+VERSION="2.17.9"
RPMNAME="yast2-ca-management"
MAINTAINER="Michael Calmer , J. Daniel Schmidt "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ca-management-2.17.8/src/ca_mgm_auto.ycp new/yast2-ca-management-2.17.9/src/ca_mgm_auto.ycp
--- old/yast2-ca-management-2.17.8/src/ca_mgm_auto.ycp 2008-05-13 17:25:32.000000000 +0200
+++ new/yast2-ca-management-2.17.9/src/ca_mgm_auto.ycp 2009-01-07 16:43:57.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Client for autoinstallation
* Authors: Ryan Partridge
*
- * $Id: ca_mgm_auto.ycp 47499 2008-05-13 15:25:31Z mcalmer $
+ * $Id: ca_mgm_auto.ycp 54442 2009-01-07 15:43:57Z mcalmer $
*
* This is a client for autoinstallation. It takes its arguments,
* goes through the configuration and return the setting.
@@ -28,6 +28,7 @@
import "Users";
import "CaMgm";
import "Summary";
+import "Hostname";
include "ca-management/new_cert_read_write.ycp";
include "ca-management/util.ycp";
@@ -375,18 +376,32 @@
CaMgm::autoYaSTSettings["takeLocalServerName"] = settings["takeLocalServerName"]:true;
if (settings["takeLocalServerName"]:true )
{
+ map host_ips = getHostIPs ();
+ string hostname_bak = "";
+
+ foreach(string key, string value, host_ips, {
+ if(value == "DNS")
+ {
+ hostname_bak = key;
+ }
+ });
+
map retmap = (map) SCR::Execute (.target.bash_output,
"/bin/hostname --long",
$[] );
y2milestone("Hostname :%1", retmap);
- if (retmap["exit"]:0 != 0)
+ if (retmap["exit"]:1 != 0)
{
- ret = false;
+ if(hostname_bak == "")
+ {
+ retmap["stdout"] = Hostname::CurrentFQ();
+ }
+ else
+ {
+ retmap["stdout"] = hostname_bak;
+ }
}
- else
- {
CaMgm::autoYaSTSettings["server_commonName"] = strip(retmap["stdout"]:"linux.site");
- }
}
else
{
@@ -557,15 +572,31 @@
// create one
if (CaMgm::autoYaSTSettings["takeLocalServerName"]:true)
{
+ map host_ips = getHostIPs ();
+ string hostname_bak = "";
+
+ foreach(string key, string value, host_ips, {
+ if(value == "DNS")
+ {
+ hostname_bak = key;
+ }
+ });
+
map retmap = (map) SCR::Execute (.target.bash_output,
- "/bin/hostname --long",
- $[] );
+ "/bin/hostname --long",
+ $[] );
y2milestone("Hostname :%1", retmap);
- if (retmap["exit"]:0 != 0)
+ if (retmap["exit"]:1 != 0)
{
- Report::Error(_("Cannot evaluate the name of the local machine."));
- success = false;
+ if(hostname_bak == "")
+ {
+ retmap["stdout"] = Hostname::CurrentFQ();
+ }
+ else
+ {
+ retmap["stdout"] = hostname_bak;
+ }
}
CaMgm::prop_server_commonName = strip(retmap["stdout"]:"linux.site");
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ca-management-2.17.8/src/ca_mgm_proposal.ycp new/yast2-ca-management-2.17.9/src/ca_mgm_proposal.ycp
--- old/yast2-ca-management-2.17.8/src/ca_mgm_proposal.ycp 2008-10-16 14:05:13.000000000 +0200
+++ new/yast2-ca-management-2.17.9/src/ca_mgm_proposal.ycp 2009-01-07 16:43:57.000000000 +0100
@@ -11,7 +11,7 @@
* Authors:
* Stefan Schubert
*
- * $Id: ca_mgm_proposal.ycp 52284 2008-10-16 10:51:47Z jdsn $
+ * $Id: ca_mgm_proposal.ycp 54442 2009-01-07 15:43:57Z mcalmer $
*
* Proposal function dispatcher for CA Management
*/
@@ -27,6 +27,7 @@
import "Timezone";
import "Users";
import "String";
+ import "Hostname";
include "ca-management/new_cert_read_write.ycp";
include "ca-management/util.ycp";
@@ -70,11 +71,13 @@
{
if(hostname_bak == "")
{
- ret = add( ret, "warning", _("Cannot evaluate the name of the local machine. Change the values of Server Name and E-Mail."));
- ret = add( ret, "warning_level", `blocker );
+ retmap["stdout"] = Hostname::CurrentFQ();
- // setting dummy
- retmap["stdout"] = "linux.site";
+ if(retmap["stdout"]:"linux.site" == "linux.site")
+ {
+ ret = add( ret, "warning", _("Cannot evaluate the name of the local machine. Change the values of Server Name and E-Mail."));
+ ret = add( ret, "warning_level", `blocker );
+ }
}
else
{
@@ -82,12 +85,12 @@
}
}
- string longhostname = strip(retmap["stdout"]:"linux.site");
+ string longhostname = strip(retmap["stdout"]:"");
if ( longhostname == nil ) longhostname = ""; // (bnc#428101)
if(size(longhostname) <= 0)
{
- longhostname = "linux.site";
+ longhostname = Hostname::CurrentFQ();
}
string hostname = ((list<string>) splitstring (longhostname, "."))[0]:"";
if ( hostname == nil ) hostname = ""; // (bnc#428101)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ca-management-2.17.8/VERSION new/yast2-ca-management-2.17.9/VERSION
--- old/yast2-ca-management-2.17.8/VERSION 2008-12-12 13:20:40.000000000 +0100
+++ new/yast2-ca-management-2.17.9/VERSION 2009-01-07 15:28:13.000000000 +0100
@@ -1 +1 @@
-2.17.8
+2.17.9
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org