Hello community,
here is the log from the commit of package yast2-network
checked in at Tue Dec 4 00:00:14 CET 2007.
--------
--- yast2-network/yast2-network.changes 2007-11-29 15:42:12.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-network/yast2-network.changes 2007-12-03 18:55:48.000000000 +0100
@@ -1,0 +2,12 @@
+Mon Dec 3 18:54:09 CET 2007 - mzugec@suse.cz
+
+- modprobe ndiswrapper before hwinfo when needed (#343893)
+- 2.16.13
+
+-------------------------------------------------------------------
+Mon Dec 3 13:14:15 CET 2007 - mzugec@suse.cz
+
+- warning for NM and password (#225793)
+- 2.16.12
+
+-------------------------------------------------------------------
Old:
----
yast2-network-2.16.11.tar.bz2
New:
----
yast2-network-2.16.13.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.wW4042/_old 2007-12-03 23:58:56.000000000 +0100
+++ /var/tmp/diff_new_pack.wW4042/_new 2007-12-03 23:58:56.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-network (Version 2.16.11)
+# spec file for package yast2-network (Version 2.16.13)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-network
-Version: 2.16.11
+Version: 2.16.13
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-network-2.16.11.tar.bz2
+Source0: yast2-network-2.16.13.tar.bz2
Prefix: /usr
# should be required by devtools
BuildRequires: perl-XML-Writer pkgconfig rpm
@@ -45,12 +45,12 @@
Summary: YaST2 - Network Configuration
%package devel-doc
-Version: 2.16.11
+Version: 2.16.13
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-network-2.16.11.tar.bz2
+Source0: yast2-network-2.16.13.tar.bz2
Prefix: /usr
Requires: yast2-network >= 2.15.53
Summary: YaST2 - Developer documentation for yast2-network
@@ -74,7 +74,7 @@
Michal Svec
%prep
-%setup -n yast2-network-2.16.11
+%setup -n yast2-network-2.16.13
%build
%{prefix}/bin/y2tool y2autoconf
@@ -138,6 +138,12 @@
%exclude %{prefix}/share/doc/packages/yast2-network/COPYING
%exclude %{prefix}/share/doc/packages/yast2-network/README
%changelog
+* Mon Dec 03 2007 - mzugec@suse.cz
+- modprobe ndiswrapper before hwinfo when needed (#343893)
+- 2.16.13
+* Mon Dec 03 2007 - mzugec@suse.cz
+- warning for NM and password (#225793)
+- 2.16.12
* Thu Nov 29 2007 - mzugec@suse.cz
- when user change BOOTPROTO to NONE, set STARTMODE to off
- for hotplug devices set STARTMODE=hotplug (#132583)
++++++ yast2-network-2.16.11.tar.bz2 -> yast2-network-2.16.13.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.16.11/configure new/yast2-network-2.16.13/configure
--- old/yast2-network-2.16.11/configure 2007-11-29 15:36:54.000000000 +0100
+++ new/yast2-network-2.16.13/configure 2007-12-03 18:52:39.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-network 2.16.10.
+# Generated by GNU Autoconf 2.61 for yast2-network 2.16.12.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-network'
PACKAGE_TARNAME='yast2-network'
-PACKAGE_VERSION='2.16.10'
-PACKAGE_STRING='yast2-network 2.16.10'
+PACKAGE_VERSION='2.16.12'
+PACKAGE_STRING='yast2-network 2.16.12'
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-network 2.16.10 to adapt to many kinds of systems.
+\`configure' configures yast2-network 2.16.12 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-network 2.16.10:";;
+ short | recursive ) echo "Configuration of yast2-network 2.16.12:";;
esac
cat <<\_ACEOF
@@ -1346,7 +1346,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-network configure 2.16.10
+yast2-network configure 2.16.12
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-network $as_me 2.16.10, which was
+It was created by yast2-network $as_me 2.16.12, 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-network'
- VERSION='2.16.10'
+ VERSION='2.16.12'
cat >>confdefs.h <<_ACEOF
@@ -2408,7 +2408,7 @@
-VERSION="2.16.10"
+VERSION="2.16.12"
RPMNAME="yast2-network"
MAINTAINER="Michal Zugec "
@@ -3303,7 +3303,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.16.10, which was
+This file was extended by yast2-network $as_me 2.16.12, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3346,7 +3346,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-network config.status 2.16.10
+yast2-network config.status 2.16.12
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-network-2.16.11/configure.in new/yast2-network-2.16.13/configure.in
--- old/yast2-network-2.16.11/configure.in 2007-11-29 15:36:47.000000000 +0100
+++ new/yast2-network-2.16.13/configure.in 2007-12-03 18:52:33.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.15.9 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-network, 2.16.10, http://bugs.opensuse.org/, yast2-network)
+AC_INIT(yast2-network, 2.16.12, http://bugs.opensuse.org/, yast2-network)
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.16.10"
+VERSION="2.16.12"
RPMNAME="yast2-network"
MAINTAINER="Michal Zugec "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.16.11/src/modules/LanItems.ycp new/yast2-network-2.16.13/src/modules/LanItems.ycp
--- old/yast2-network-2.16.11/src/modules/LanItems.ycp 2007-11-29 14:43:20.000000000 +0100
+++ new/yast2-network-2.16.13/src/modules/LanItems.ycp 2007-12-03 18:52:24.000000000 +0100
@@ -238,10 +238,6 @@
});
}
-// temporary used for reading configurations without hwinfo
-global void ReadNetworkModules(){
-}
-
// get list of all configurations for "netcard" macro in NetworkDevices module
list<string> getNetworkDevices(){
list<string> confs=[];
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.16.11/src/modules/Lan.ycp new/yast2-network-2.16.13/src/modules/Lan.ycp
--- old/yast2-network-2.16.11/src/modules/Lan.ycp 2007-10-29 10:03:47.000000000 +0100
+++ new/yast2-network-2.16.13/src/modules/Lan.ycp 2007-12-03 18:54:29.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Network card data
* Authors: Michal Svec
*
- * $Id: Lan.ycp 41079 2007-09-25 10:44:52Z mzugec $
+ * $Id: Lan.ycp 42633 2007-12-03 17:54:28Z mzugec $
*
* Representation of the configuration of network cards.
* Input and output routines.
@@ -38,6 +38,7 @@
import "FileUtils";
import "PackageSystem";
import "LanItems";
+import "ModuleLoading";
include "network/complex.ycp";
include "network/runtime.ycp";
@@ -199,14 +200,22 @@
if(!Confirm::MustBeRoot()) return false;
+ if(Abort()) return false;
/* Progress step 1/9 */
- ProgressNextStage(_("Detecting network devices..."));
- // if(!Arch::s390 ()) /* FIXME: Temporary hack until the detection is functional */
-
- // Dont read hardware data in config mode
- if(!Mode::config ()) {
- if(!NetHwDetection::running) NetHwDetection::Start();
- LanItems::ReadHw();
+ ProgressNextStage(_("Detecting for ndiswrapper..."));
+ // modprobe ndiswrapper before hwinfo when needed (#343893)
+ if (!Mode::autoinst() && PackageSystem::Installed("ndiswrapper")){
+ y2milestone("ndiswrapper: installed");
+ if (size((list<string>)SCR::Read(.target.dir, "/etc/ndiswrapper"))>0){
+ y2milestone("ndiswrapper: configuration found");
+ if ((integer)SCR::Execute(.target.bash, "lsmod |grep -q ndiswrapper")!=0
+ && Popup::YesNo(_("There is ndiswrapper configuration detected
+but kernel module wasn't modprobed.
+Should I modprobe ndiswrapper?"))) {
+ if (ModuleLoading::Load("ndiswrapper", "", "", "", false, true)==`fail) Popup::Error(_("ndiswrapper kernel module wasn't loaded.
+Check configuration manually."));
+ }
+ }
}
/* ReadHardware(""); /* TESTING */
@@ -214,9 +223,13 @@
if(Abort()) return false;
/* Progress step 2/9 */
- ProgressNextStage(_("Reading /etc/modprobe.conf..."));
+ ProgressNextStage(_("Detecting network devices..."));
// FIXME: MOD // ReadModules(NetworkDevices::CardRegex["netcard"]:"");
- LanItems::ReadNetworkModules();
+ // Dont read hardware data in config mode
+ if(!Mode::config ()) {
+ if(!NetHwDetection::running) NetHwDetection::Start();
+ LanItems::ReadHw();
+ }
sleep(sl);
if(Abort()) return false;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.16.11/src/provider/provider.ycp new/yast2-network-2.16.13/src/provider/provider.ycp
--- old/yast2-network-2.16.11/src/provider/provider.ycp 2007-10-29 10:03:49.000000000 +0100
+++ new/yast2-network-2.16.13/src/provider/provider.ycp 2007-12-03 13:15:40.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Provider dialogs
* Authors: Michal Svec
*
- * $Id: provider.ycp 24934 2005-08-15 14:34:12Z mvidner $
+ * $Id: provider.ycp 42593 2007-12-03 12:15:39Z mzugec $
*/
{
@@ -503,6 +503,12 @@
Popup::Message(_("Enter the password."));
UI::SetFocus(`id(`passwd));
} */
+ // NM doesn't ask for password (#225793)
+ else if(ask_pass && NetworkService::IsManaged ()){
+ Popup::Warning(_("NetworkManager doesn't have ability to ask for password.
+Use KInternet (without NetworkManager) or store password on the system."));
+ continue;
+ }
else if(filterchars(phone, phonevalidchars) != phone &&
/* Popup::YesNo text */
!Popup::YesNo(_("You have entered some characters that are not numbers in the phone field.\n\nContinue?")))
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.16.11/VERSION new/yast2-network-2.16.13/VERSION
--- old/yast2-network-2.16.11/VERSION 2007-11-29 15:38:11.000000000 +0100
+++ new/yast2-network-2.16.13/VERSION 2007-12-03 18:53:51.000000000 +0100
@@ -1 +1 @@
-2.16.11
+2.16.13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org