Hello community, here is the log from the commit of package yast2-network for openSUSE:Factory checked in at 2013-06-17 10:26:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-network (Old) and /work/SRC/openSUSE:Factory/.yast2-network.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-network" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-network/yast2-network.changes 2013-06-05 13:26:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-network.new/yast2-network.changes 2013-06-17 10:26:32.000000000 +0200 @@ -1,0 +2,16 @@ +Wed May 29 10:19:10 UTC 2013 - [email protected] + +- bnc#821427 + - fixed biosdevname renaming in case of buggy SMBIOS. + - original patch provided by Martin Wilck + ([email protected]) +- 2.25.4 + +------------------------------------------------------------------- +Mon May 27 06:21:40 UTC 2013 - [email protected] + +- bnc#813232 + - extended fix from 2.25.2. DNS module is able to handle FQDN now. +- 2.25.3 + +------------------------------------------------------------------- Old: ---- yast2-network-2.25.2.tar.bz2 New: ---- yast2-network-2.25.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-network.spec ++++++ --- /var/tmp/diff_new_pack.2oiCaf/_old 2013-06-17 10:26:33.000000000 +0200 +++ /var/tmp/diff_new_pack.2oiCaf/_new 2013-06-17 10:26:33.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-network -Version: 2.25.2 +Version: 2.25.4 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-network-2.25.2.tar.bz2 -> yast2-network-2.25.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.25.2/VERSION new/yast2-network-2.25.4/VERSION --- old/yast2-network-2.25.2/VERSION 2013-05-16 14:01:47.000000000 +0200 +++ new/yast2-network-2.25.4/VERSION 2013-05-30 11:06:38.000000000 +0200 @@ -1 +1 @@ -2.25.2 +2.25.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.25.2/configure new/yast2-network-2.25.4/configure --- old/yast2-network-2.25.2/configure 2013-05-28 15:04:27.000000000 +0200 +++ new/yast2-network-2.25.4/configure 2013-06-14 14:39:01.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-network 2.25.2. +# Generated by GNU Autoconf 2.69 for yast2-network 2.25.4. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -579,8 +579,8 @@ # Identity of this package. PACKAGE_NAME='yast2-network' PACKAGE_TARNAME='yast2-network' -PACKAGE_VERSION='2.25.2' -PACKAGE_STRING='yast2-network 2.25.2' +PACKAGE_VERSION='2.25.4' +PACKAGE_STRING='yast2-network 2.25.4' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1247,7 +1247,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-network 2.25.2 to adapt to many kinds of systems. +\`configure' configures yast2-network 2.25.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1318,7 +1318,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-network 2.25.2:";; + short | recursive ) echo "Configuration of yast2-network 2.25.4:";; esac cat <<\_ACEOF @@ -1398,7 +1398,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-network configure 2.25.2 +yast2-network configure 2.25.4 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1415,7 +1415,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-network $as_me 2.25.2, which was +It was created by yast2-network $as_me 2.25.4, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2354,7 +2354,7 @@ # Define the identity of the package. PACKAGE='yast2-network' - VERSION='2.25.2' + VERSION='2.25.4' cat >>confdefs.h <<_ACEOF @@ -2477,7 +2477,7 @@ -VERSION="2.25.2" +VERSION="2.25.4" RPMNAME="yast2-network" MAINTAINER="Michal Filka <[email protected]>" @@ -3403,7 +3403,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-network $as_me 2.25.2, which was +This file was extended by yast2-network $as_me 2.25.4, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3456,7 +3456,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-network config.status 2.25.2 +yast2-network config.status 2.25.4 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-network-2.25.2/configure.in new/yast2-network-2.25.4/configure.in --- old/yast2-network-2.25.2/configure.in 2013-05-28 15:04:22.000000000 +0200 +++ new/yast2-network-2.25.4/configure.in 2013-06-14 14:38:57.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.24.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-network, 2.25.2, http://bugs.opensuse.org/, yast2-network) +AC_INIT(yast2-network, 2.25.4, http://bugs.opensuse.org/, yast2-network) 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.25.2" +VERSION="2.25.4" RPMNAME="yast2-network" MAINTAINER="Michal Filka <[email protected]>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.25.2/src/clients/save_network.ycp new/yast2-network-2.25.4/src/clients/save_network.ycp --- old/yast2-network-2.25.2/src/clients/save_network.ycp 2013-04-19 17:16:35.000000000 +0200 +++ new/yast2-network-2.25.4/src/clients/save_network.ycp 2013-05-30 11:06:38.000000000 +0200 @@ -338,7 +338,8 @@ string new_netdevice = netdevice; if (! LanUdevAuto::AllowUdevModify()) { - string cmd = sformat("biosdevname --policy=all_names -i %1", netdevice); + // bnc#821427: use same options as in /lib/udev/rules.d/71-biosdevname.rules + string cmd = sformat("biosdevname --policy physical --smbios 2.6 --nopirq -i %1", netdevice); string out = String::FirstChunk(StdoutOf(cmd), "\n"); if (out != "") { y2milestone ("biosdevname renames %1 to %2", netdevice, out); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.25.2/src/modules/DNS.ycp new/yast2-network-2.25.4/src/modules/DNS.ycp --- old/yast2-network-2.25.2/src/modules/DNS.ycp 2013-05-03 13:21:36.000000000 +0200 +++ new/yast2-network-2.25.4/src/modules/DNS.ycp 2013-05-28 16:01:48.000000000 +0200 @@ -128,24 +128,41 @@ } /** - * Handles input as one line of getent output. Returns first hostname found on the line. + * Handles input as one line of getent output. Returns first hostname found + * on the line (= canonical hostname). + * + * @param line in /etc/hosts format + * @return canonical hostname from given line */ string GetHostnameFromGetent( string line) { - // hosts line is formatted this way: - // - // <ip address> <canonical hostname> [<alias> ...] - // - // field separators are at least one space and/or tab. - - string hostname = regexpsub( line, sformat( "^[%1]+[[:blank:]]+(.*)", IP::ValidChars), "\\1"); +/* + * line is expected same format as is used in /etc/hosts without additional + * comments (getent removes comments from the end). + * + * /etc/hosts line is formatted this way (man 5 hosts): + * + * <ip address> <canonical hostname> [<alias> ...] + * + * - field separators are at least one space and/or tab. + * - <canonical hostname>, in generic it is "a computer's unique name". In case + * of DNS world, <canonical hostname> is FQDN ("A" record), then <hostname> is + * <canonical hostname> without domain part. For example: + * + * foo.example.com. IN A 1.2.3.4 + * + * <canonical hostname> => foo.example.com + * <hostname> => foo + * + */ + string canonical_hostname = regexpsub( line, sformat( "^[%1]+[[:blank:]]+(.*)", IP::ValidChars), "\\1"); - hostname = String::FirstChunk( hostname, " \t\n"); - hostname = String::CutBlanks( hostname); + canonical_hostname = String::FirstChunk( canonical_hostname, " \t\n"); + canonical_hostname = String::CutBlanks( canonical_hostname); - if( ! Hostname::Check( hostname)) + if( !Hostname::CheckDomain( canonical_hostname) && !Hostname::Check( canonical_hostname)) { - y2error( "GetHostnameFromGetent: Invalid hostname detected (%1)", hostname); + y2error( "GetHostnameFromGetent: Invalid hostname detected (%1)", canonical_hostname); y2error( "GetHostnameFromGetent: input params - begin"); y2error( "%1", line); y2error( "GetHostnameFromGetent: input params - end"); @@ -153,13 +170,16 @@ return ""; } - return hostname; + y2milestone( "GetHostnameFromGetEnt: canonical hostname => (%1)", canonical_hostname); + + return canonical_hostname; } /** - * Resolve IP to hostname + * Resolve IP to canonical hostname + * * @param ip given IP address - * @return resolved host or empty string in case of failure. + * @return resolved canonical hostname (FQDN) for given IP or empty string in case of failure. */ string ResolveIP(string ip) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.25.2/testsuite/tests/dns.ycp new/yast2-network-2.25.4/testsuite/tests/dns.ycp --- old/yast2-network-2.25.2/testsuite/tests/dns.ycp 2013-05-03 13:21:36.000000000 +0200 +++ new/yast2-network-2.25.4/testsuite/tests/dns.ycp 2013-05-28 16:01:48.000000000 +0200 @@ -30,6 +30,7 @@ "1.1.1.1 1-hostname alias", "2.2.2.2 hostname-2", "3.3.3.3 -invalid_hostname-", + "9.114.214.42 9117-mma-1-lp1.pok.stglabs.ibm.com" ]; import "DNS"; @@ -38,5 +39,6 @@ Assert::Equal( "1-hostname", DNS::GetHostnameFromGetent( hostnames[ 1]:"") ); Assert::Equal( "hostname-2", DNS::GetHostnameFromGetent( hostnames[ 2]:"") ); Assert::Equal( "", DNS::GetHostnameFromGetent( hostnames[ 3]:"") ); +Assert::Equal( "9117-mma-1-lp1.pok.stglabs.ibm.com", DNS::GetHostnameFromGetent( hostnames[ 4]:"") ); } /* EOF */ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
