Hello community,
here is the log from the commit of package yast2-network
checked in at Fri Nov 28 12:13:27 CET 2008.
--------
--- yast2-network/yast2-network.changes 2008-11-20 16:39:51.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-network/yast2-network.changes 2008-11-28 12:09:51.221961000 +0100
@@ -1,0 +2,17 @@
+Wed Nov 26 17:19:46 CET 2008 - mzugec@suse.de
+
+- change device name - validation for existing names (bnc#447480)
+- 2.17.58
+
+-------------------------------------------------------------------
+Fri Nov 21 14:27:20 CET 2008 - kmachalkova@suse.cz
+
+- Removed workaround for installing the right NetworkManager
+ frontend - this is now handled by NM itself (bnc#445643)
+- Removed the single point of dependency on yast2-packager
+ because of that
+- Avoid passing 'nil' arguments when /etc/HOSTNAME's content is not
+ \n-terminated (bnc#445531)
+- Adjusted help text (write_hostname is configurable) (bnc#441819)
+
+-------------------------------------------------------------------
@@ -4007 +4024 @@
-Fri Aug 1 12:49:15 CEST 2003 - msvec@suse.cz
+Fri Aug 2 12:49:15 CEST 2003 - msvec@suse.cz
@@ -4586 +4603 @@
-Sun Jul 24 20:05:14 CEST 2002 - kkeil@suse.de
+Wed Jul 24 20:07:14 CEST 2002 - kkeil@suse.de
calling whatdependson for head-i586
Old:
----
yast2-network-2.17.57.tar.bz2
New:
----
yast2-network-2.17.58.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.e23481/_old 2008-11-28 12:12:40.000000000 +0100
+++ /var/tmp/diff_new_pack.e23481/_new 2008-11-28 12:12:40.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-network (Version 2.17.57)
+# spec file for package yast2-network (Version 2.17.58)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-network
-Version: 2.17.57
+Version: 2.17.58
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-network-2.17.57.tar.bz2
+Source0: yast2-network-2.17.58.tar.bz2
Prefix: /usr
# should be required by devtools
BuildRequires: perl-XML-Writer pkgconfig rpm
@@ -33,12 +33,10 @@
BuildRequires: yast2-country
BuildRequires: yast2-installation >= 2.15.27
BuildRequires: yast2 >= 2.16.6
-BuildRequires: yast2-packager >= 2.16.37
# needed for prefixlen support in aliases
Requires: yast2 >= 2.17.5
#netconfig (FaTE #303618)
Requires: sysconfig >= 0.71.2
-Requires: yast2-packager >= 2.16.37
#GetLanguageCountry
#(in newly created yast2-country-data)
Requires: yast2-country-data >= 2.16.3
@@ -79,7 +77,7 @@
Michal Svec
%prep
-%setup -n yast2-network-2.17.57
+%setup -n yast2-network-2.17.58
%build
%{prefix}/bin/y2tool y2autoconf
@@ -144,6 +142,17 @@
%exclude %{prefix}/share/doc/packages/yast2-network/README
%changelog
+* Wed Nov 26 2008 mzugec@suse.de
+- change device name - validation for existing names (bnc#447480)
+- 2.17.58
+* Fri Nov 21 2008 kmachalkova@suse.cz
+- Removed workaround for installing the right NetworkManager
+ frontend - this is now handled by NM itself (bnc#445643)
+- Removed the single point of dependency on yast2-packager
+ because of that
+- Avoid passing 'nil' arguments when /etc/HOSTNAME's content is not
+ \n-terminated (bnc#445531)
+- Adjusted help text (write_hostname is configurable) (bnc#441819)
* Thu Nov 20 2008 mzugec@suse.cz
- change in device activation in dsl configuration is not accepted
(bnc#442741)
@@ -2360,7 +2369,7 @@
- fixed testsuite
* Mon Aug 04 2003 arvin@suse.de
- fixed return value in inst_netprobe
-* Fri Aug 01 2003 msvec@suse.cz
+* Sat Aug 02 2003 msvec@suse.cz
- read /root/.curlrc only if present
- 2.8.10
* Fri Aug 01 2003 msvec@suse.de
++++++ yast2-network-2.17.57.tar.bz2 -> yast2-network-2.17.58.tar.bz2 ++++++
++++ 6753 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-network-2.17.57/configure.in new/yast2-network-2.17.58/configure.in
--- old/yast2-network-2.17.57/configure.in 2008-11-20 15:23:21.000000000 +0100
+++ new/yast2-network-2.17.58/configure.in 2008-11-26 17:18:29.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-network, 2.17.56, http://bugs.opensuse.org/, yast2-network)
+AC_INIT(yast2-network, 2.17.57, 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.17.56"
+VERSION="2.17.57"
RPMNAME="yast2-network"
MAINTAINER="Michal Zugec "
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-network-2.17.57/src/lan/hardware.ycp new/yast2-network-2.17.58/src/lan/hardware.ycp
--- old/yast2-network-2.17.57/src/lan/hardware.ycp 2008-11-05 09:28:03.000000000 +0100
+++ new/yast2-network-2.17.58/src/lan/hardware.ycp 2008-11-26 17:22:11.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Hardware dialogs
* Authors: Michal Svec
*
- * $Id: hardware.ycp 52790 2008-10-31 12:48:50Z mzugec $
+ * $Id: hardware.ycp 53623 2008-11-26 15:22:06Z mzugec $
*/
{
@@ -457,37 +457,27 @@
}
if (ret == `ok){
string old_name = LanItems::GetItemUdev("NAME");
+ string new_name = (string)UI::QueryWidget(`dev_name, `Value);
// write new udev rule
-/*
- string rule_key = UI::QueryWidget(`udev_type, `CurrentButton)==`mac ? sformat("ATTR{address}==\"%1\"",
- LanItems::getCurrentItem()["hwinfo", "mac"]:"") : sformat("KERNELS==\"%1\"", LanItems::getCurrentItem()["hwinfo", "busid"]:"");
-*/
- string rule_key = UI::QueryWidget(`udev_type, `CurrentButton)==`mac ? "ATTR{address}" : "KERNELS";
- string rule_value = UI::QueryWidget(`udev_type, `CurrentButton)==`mac ? LanItems::getCurrentItem()["hwinfo", "mac"]:"" : LanItems::getCurrentItem()["hwinfo", "busid"]:"";
-// LanItems::Items[LanItems::current, "udev", "net"]=
+ string rule_key = UI::QueryWidget(`udev_type, `CurrentButton)==`mac ? "ATTR{address}" : "KERNELS";
+ string rule_value = UI::QueryWidget(`udev_type, `CurrentButton)==`mac ? LanItems::getCurrentItem()["hwinfo", "mac"]:"" : LanItems::getCurrentItem()["hwinfo", "busid"]:"";
y2internal("LanItems::GetReplacedItemUdev(%1, %2) %3",rule_key, rule_value, LanItems::GetReplacedItemUdev(rule_key, rule_value));
- if ((boolean)UI::QueryWidget(`change_dev_name, `Value)){
- y2internal("LanItems::GetReplacedItemUdev2 %1", LanItems::GetReplacedItemUdev("NAME", (string)UI::QueryWidget(`dev_name, `Value)));
- }
-/*
- LanItems::Items[LanItems::current, "udev", "net"]=
- ["SUBSYSTEM==\"net\"",
- "DRIVERS==\"?*\"",
- UI::QueryWidget(`udev_type, `CurrentButton)==`mac ? sformat("ATTR{address}==\"%1\"",
- LanItems::getCurrentItem()["hwinfo", "mac"]:"") : sformat("KERNELS==\"%1\"", LanItems::getCurrentItem()["hwinfo", "busid"]:""),
- sformat("NAME==\"%1\"", ((boolean)UI::QueryWidget(`change_dev_name, `Value))?UI::QueryWidget(`dev_name, `Value):LanItems::GetItemUdev("NAME"))
- ];
-*/
+ if ((boolean)UI::QueryWidget(`change_dev_name, `Value)){
// when dev_name changed, rename ifcfg (both in NetworkInterfaces and LanItems)
- if (LanItems::GetItemUdev("NAME")!=old_name){
- NetworkInterfaces::Delete2(old_name);
-// NetworkInterfaces::Commit();
- LanItems::Items[LanItems::current, "ifcfg"]=LanItems::GetItemUdev("NAME");
-// LanItems::Items[LanItems::current, "hwinfo", "dev_name"]=LanItems::GetItemUdev()[1]:"";
+ if (new_name!=old_name){
+ if (contains(NetworkInterfaces::List(""), new_name)){
+ Popup::Error(_("Configuration name already exists!"));
+ ret=nil;
+ } else{
+ y2internal("LanItems::GetReplacedItemUdev2 %1", LanItems::GetReplacedItemUdev("NAME", new_name));
+ NetworkInterfaces::Delete2(old_name);
+ LanItems::Items[LanItems::current, "ifcfg"]=LanItems::GetItemUdev("NAME");
+ }
+ }
}
}
UI::CloseDialog();
- UI::ChangeWidget(`device_name, `Value, LanItems::GetItemUdev("NAME"));
+ UI::ChangeWidget(`device_name, `Value, LanItems::Items[LanItems::current, "ifcfg"]:"");
}
return nil;
}
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-network-2.17.57/src/lan/help.ycp new/yast2-network-2.17.58/src/lan/help.ycp
--- old/yast2-network-2.17.57/src/lan/help.ycp 2008-10-13 11:58:58.000000000 +0200
+++ new/yast2-network-2.17.58/src/lan/help.ycp 2008-11-26 14:30:51.000000000 +0100
@@ -89,9 +89,9 @@
"write_hostname":
_("<p>Your hostname will be written to <tt>/etc/hosts</tt> and will be
-resolvable as a <tt>127.0.0.2</tt> IP address. This is the default behavior.
-To disable such option, uncheck <b>Write Hostname to /etc/hosts</b> box.
-In that case your hostname will not be resolvable without an active network.
+resolvable as <tt>127.0.0.2</tt> IP address. To disable this modification,
+uncheck <b>Write Hostname to /etc/hosts</b> box. In that case your
+hostname will not be resolvable without an active network.
</p>
"),
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-network-2.17.57/src/modules/DNS.ycp new/yast2-network-2.17.58/src/modules/DNS.ycp
--- old/yast2-network-2.17.57/src/modules/DNS.ycp 2008-11-05 09:28:03.000000000 +0100
+++ new/yast2-network-2.17.58/src/modules/DNS.ycp 2008-11-26 14:30:52.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Hostname and DNS data
* Authors: Michal Svec
*
- * $Id: DNS.ycp 52761 2008-10-30 15:52:37Z kmachalkova $
+ * $Id: DNS.ycp 53533 2008-11-21 17:48:37Z kmachalkova $
*
* Manages resolv.conf and (fully qualified) hostname, also
* respecting DHCP.
@@ -23,6 +23,7 @@
import "NetworkInterfaces";
import "Progress";
import "Service";
+import "String";
include "network/routines.ycp";
include "network/runtime.ycp";
@@ -163,7 +164,8 @@
if (SCR::Read (.target.size, "/etc/HOSTNAME") > 0)
{
fqhostname = (string) SCR::Read (.target.string, "/etc/HOSTNAME");
- fqhostname = substring(fqhostname, 0, findfirstof(fqhostname, "\n"));
+ //avoid passing nil argument when we get non-\n-terminated string (#445531)
+ fqhostname = String::FirstChunk( fqhostname, "\n" );
}
}
list<string> split = Hostname::SplitFQ (fqhostname);
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-network-2.17.57/src/modules/Lan.ycp new/yast2-network-2.17.58/src/modules/Lan.ycp
--- old/yast2-network-2.17.57/src/modules/Lan.ycp 2008-11-14 13:14:43.000000000 +0100
+++ new/yast2-network-2.17.58/src/modules/Lan.ycp 2008-11-26 14:30:52.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Network card data
* Authors: Michal Svec
*
- * $Id: Lan.ycp 53227 2008-11-12 15:55:11Z mzugec $
+ * $Id: Lan.ycp 53512 2008-11-21 13:24:58Z kmachalkova $
*
* Representation of the configuration of network cards.
* Input and output routines.
@@ -516,7 +516,7 @@
}
if (!network) Popup::Error(_("No network running"));
}
- if(!CheckNetworkManagerPlugin()) return false;
+
/* Final progress step */
ProgressNextStage(_("Finished"));
sleep(sl);
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-network-2.17.57/src/routines/routines.ycp new/yast2-network-2.17.58/src/routines/routines.ycp
--- old/yast2-network-2.17.57/src/routines/routines.ycp 2008-11-14 13:14:43.000000000 +0100
+++ new/yast2-network-2.17.58/src/routines/routines.ycp 2008-11-26 14:30:52.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Miscellaneous routines
* Authors: Michal Svec
*
- * $Id: routines.ycp 53181 2008-11-11 16:24:40Z kmachalkova $
+ * $Id: routines.ycp 53512 2008-11-21 13:24:58Z kmachalkova $
*/
{
@@ -21,7 +21,6 @@
import "Arch";
import "Confirm";
import "Map";
-import "DefaultDesktop";
import "Netmask";
import "Mode";
@@ -378,20 +377,6 @@
return hardware;
}
-boolean CheckNetworkManagerPlugin(){
- if (NetworkService::IsManaged()){
- list<string> nmp = [];
- y2milestone("Check what packages are needed to configure NetworkManager");
-// string nmp = ((string)SCR::Read(.sysconfig.windowmanager.DEFAULT_WM)=="kde")?"NetworkManager-kde":"NetworkManager-gnome";
- list<string> desktops = DefaultDesktop::SelectedDesktops();
- if (contains(desktops, "kde3")) nmp = add(nmp, "NetworkManager-kde");
- if (contains(desktops, "gnome")) nmp = add(nmp, "NetworkManager-gnome");
- y2milestone("Test for %1 if installed", nmp);
- PackageSystem::CheckAndInstallPackages(nmp);
- }
- return true;
-}
-
string getIfcName(string devicename){
string ifcfg="";
string interfacetype = NetworkInterfaces::device_type( devicename );
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-network-2.17.57/testsuite/tests/Host.out new/yast2-network-2.17.58/testsuite/tests/Host.out
--- old/yast2-network-2.17.57/testsuite/tests/Host.out 2008-09-15 16:39:21.000000000 +0200
+++ new/yast2-network-2.17.58/testsuite/tests/Host.out 2008-11-26 14:30:52.000000000 +0100
@@ -1,7 +1,4 @@
Read .target.tmpdir "/tmp"
-Read .target.stat "/y2update/control.xml" nil
-Read .target.size "/y2update/control.xml" 1
-Read .xml "/y2update/control.xml" nil
Dump Read
Read .target.size "/etc/hosts" 1
Dir .etc.hosts: ["10.20.1.29", "127.0.0.1"]
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-network-2.17.57/testsuite/tests/Proxy.out new/yast2-network-2.17.58/testsuite/tests/Proxy.out
--- old/yast2-network-2.17.57/testsuite/tests/Proxy.out 2008-09-22 11:00:32.000000000 +0200
+++ new/yast2-network-2.17.58/testsuite/tests/Proxy.out 2008-11-26 14:30:52.000000000 +0100
@@ -1,7 +1,4 @@
Read .target.tmpdir "/tmp"
-Read .target.stat "/y2update/control.xml" nil
-Read .target.size "/y2update/control.xml" 1
-Read .xml "/y2update/control.xml" nil
Dump Read
Read .sysconfig.proxy.HTTP_PROXY "h"
Read .sysconfig.proxy.HTTPS_PROXY "h"
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-network-2.17.57/testsuite/tests/routines.out new/yast2-network-2.17.58/testsuite/tests/routines.out
--- old/yast2-network-2.17.57/testsuite/tests/routines.out 2008-09-22 11:00:32.000000000 +0200
+++ new/yast2-network-2.17.58/testsuite/tests/routines.out 2008-11-26 14:30:52.000000000 +0100
@@ -1,10 +1,4 @@
Read .target.tmpdir "/tmp"
-Read .target.stat "/y2update/control.xml" $[]
-Read .target.stat "/control.xml" $[]
-Read .target.stat "/etc/YaST2/control.xml" $[]
-Read .target.stat "/usr/share/YaST2/control/control.xml" $[]
-Log No control file found
-Log control file missing
Dump list2items
Return [`item (`id (0), "x", true), `item (`id (1), "y", false)]
Dump hwlist2items
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-network-2.17.57/VERSION new/yast2-network-2.17.58/VERSION
--- old/yast2-network-2.17.57/VERSION 2008-11-20 15:27:39.000000000 +0100
+++ new/yast2-network-2.17.58/VERSION 2008-11-26 17:19:43.000000000 +0100
@@ -1 +1 @@
-2.17.57
+2.17.58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org