Hello community,
here is the log from the commit of package yast2-network
checked in at Wed Aug 15 20:41:10 CEST 2007.
--------
--- yast2-network/yast2-network.changes 2007-08-13 18:34:30.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-network/yast2-network.changes 2007-08-15 16:51:59.000000000 +0200
@@ -1,0 +2,13 @@
+Wed Aug 15 16:55:49 CEST 2007 - mzugec@suse.cz
+
+- for NM enable to change default gateway (#299448)
+- 2.15.62
+
+-------------------------------------------------------------------
+Tue Aug 14 23:06:13 CEST 2007 - mzugec@suse.de
+
+- save network configuration also when smpppd/kinternet not available
+ for USERCONTROL enabled devices (#299033)
+- 2.15.61
+
+-------------------------------------------------------------------
Old:
----
yast2-network-2.15.60.tar.bz2
New:
----
yast2-network-2.15.62.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.K26523/_old 2007-08-15 20:41:04.000000000 +0200
+++ /var/tmp/diff_new_pack.K26523/_new 2007-08-15 20:41:04.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-network (Version 2.15.60)
+# spec file for package yast2-network (Version 2.15.62)
#
# 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.15.60
+Version: 2.15.62
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-network-2.15.60.tar.bz2
+Source0: yast2-network-2.15.62.tar.bz2
prefix: /usr
# should be required by devtools
BuildRequires: perl-XML-Writer pkgconfig rpm
@@ -43,12 +43,12 @@
Conflicts: yast2-core < 2.10.6
Summary: YaST2 - Network Configuration
%package devel-doc
-Version: 2.15.60
+Version: 2.15.62
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-network-2.15.60.tar.bz2
+Source0: yast2-network-2.15.62.tar.bz2
prefix: /usr
Requires: yast2-network >= 2.15.53
Summary: YaST2 - Developer documentation for yast2-network
@@ -73,7 +73,7 @@
Michal Svec
%prep
-%setup -n yast2-network-2.15.60
+%setup -n yast2-network-2.15.62
%build
%{prefix}/bin/y2tool y2autoconf
@@ -141,6 +141,13 @@
%exclude %{prefix}/share/doc/packages/yast2-network/README
%changelog
+* Wed Aug 15 2007 - mzugec@suse.cz
+- for NM enable to change default gateway (#299448)
+- 2.15.62
+* Tue Aug 14 2007 - mzugec@suse.de
+- save network configuration also when smpppd/kinternet not available
+ for USERCONTROL enabled devices (#299033)
+- 2.15.61
* Mon Aug 13 2007 - mzugec@suse.cz
- autoyast support for aliases (F302300)
- 2.15.60
++++++ yast2-network-2.15.60.tar.bz2 -> yast2-network-2.15.62.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.60/configure new/yast2-network-2.15.62/configure
--- old/yast2-network-2.15.60/configure 2007-08-13 18:33:32.000000000 +0200
+++ new/yast2-network-2.15.62/configure 2007-08-15 16:22:47.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-network 2.15.59.
+# Generated by GNU Autoconf 2.61 for yast2-network 2.15.61.
#
# 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.15.59'
-PACKAGE_STRING='yast2-network 2.15.59'
+PACKAGE_VERSION='2.15.61'
+PACKAGE_STRING='yast2-network 2.15.61'
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.15.59 to adapt to many kinds of systems.
+\`configure' configures yast2-network 2.15.61 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.15.59:";;
+ short | recursive ) echo "Configuration of yast2-network 2.15.61:";;
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.15.59
+yast2-network configure 2.15.61
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.15.59, which was
+It was created by yast2-network $as_me 2.15.61, 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.15.59'
+ VERSION='2.15.61'
cat >>confdefs.h <<_ACEOF
@@ -2408,7 +2408,7 @@
-VERSION="2.15.59"
+VERSION="2.15.61"
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.15.59, which was
+This file was extended by yast2-network $as_me 2.15.61, 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.15.59
+yast2-network config.status 2.15.61
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.15.60/configure.in new/yast2-network-2.15.62/configure.in
--- old/yast2-network-2.15.60/configure.in 2007-08-13 18:33:27.000000000 +0200
+++ new/yast2-network-2.15.62/configure.in 2007-08-15 16:22:40.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.15.2 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-network, 2.15.59, http://bugs.opensuse.org/, yast2-network)
+AC_INIT(yast2-network, 2.15.61, 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.15.59"
+VERSION="2.15.61"
RPMNAME="yast2-network"
MAINTAINER="Michal Zugec "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.60/src/modules/DSL.ycp new/yast2-network-2.15.62/src/modules/DSL.ycp
--- old/yast2-network-2.15.60/src/modules/DSL.ycp 2007-08-10 17:24:04.000000000 +0200
+++ new/yast2-network-2.15.62/src/modules/DSL.ycp 2007-08-15 13:06:46.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: DSL data
* Authors: Michal Svec
*
- * $Id: DSL.ycp 38235 2007-06-01 09:16:46Z mzugec $
+ * $Id: DSL.ycp 40271 2007-08-14 21:21:48Z mzugec $
*
* Representation of the configuration of DSL.
* Input and output routines.
@@ -295,7 +295,7 @@
if(Abort()) return false;
/* Progress step 6/7 */
ProgressNextStage(_("Setting up smpppd(8)..."));
- SetupSMPPPD();
+ SetupSMPPPD(true);
sleep(sl);
if(Abort()) return false;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.60/src/modules/ISDN.ycp new/yast2-network-2.15.62/src/modules/ISDN.ycp
--- old/yast2-network-2.15.60/src/modules/ISDN.ycp 2007-08-10 17:24:04.000000000 +0200
+++ new/yast2-network-2.15.62/src/modules/ISDN.ycp 2007-08-15 13:06:46.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Michal Svec
* Karsten Keil
*
- * $Id: ISDN.ycp 38361 2007-06-08 11:40:22Z mzugec $
+ * $Id: ISDN.ycp 40271 2007-08-14 21:21:48Z mzugec $
*
* Representation of the configuration of ISDN.
* Input and output routines.
@@ -499,7 +499,7 @@
if(Abort()) return false;
// step 11 in writing current ISDN setup
ProgressNextStage(_("Setting up smpppd(8)..."));
- SetupSMPPPD();
+ SetupSMPPPD(true);
sleep(sl);
if(Abort()) return false;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.60/src/modules/Lan.ycp new/yast2-network-2.15.62/src/modules/Lan.ycp
--- old/yast2-network-2.15.60/src/modules/Lan.ycp 2007-08-13 18:38:59.000000000 +0200
+++ new/yast2-network-2.15.62/src/modules/Lan.ycp 2007-08-15 13:06:46.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Network card data
* Authors: Michal Svec
*
- * $Id: Lan.ycp 40239 2007-08-13 16:33:42Z mzugec $
+ * $Id: Lan.ycp 40271 2007-08-14 21:21:48Z mzugec $
*
* Representation of the configuration of network cards.
* Input and output routines.
@@ -424,13 +424,13 @@
if(!write_only) RunSuSEconfig();
sleep(sl);
- if (!NetworkService::IsManaged() && (boolean) SCR::Read(.init.scripts.exists, "smpppd") && !write_only && needKInternet())
+ if (!NetworkService::IsManaged() /*&& (boolean) SCR::Read(.init.scripts.exists, "smpppd")*/ && !write_only && needKInternet())
{
if(Abort()) return false;
/* Progress step 11 */
ProgressNextStage(_("Setting up smpppd(8)..."));
// takes care of autoinst by itself
- SetupSMPPPD();
+ SetupSMPPPD(false);
sleep(sl);
if(Abort()) return false;
@@ -1079,10 +1079,13 @@
*/
global list<string> Packages () {
list<string> pkgs = [];
+ // #299033 - don't install smpppd now, do it later (with some tests)
+/*
if (NetworkDevices::Locate ("USERCONTROL", "yes") != [])
{
if (!PackageSystem::Installed("smpppd")) pkgs = add (pkgs, "smpppd");
}
+*/
if (NetworkDevices::Locate ("STARTMODE", "ifplugd") != [])
{
if (!PackageSystem::Installed("ifplugd")) pkgs = add (pkgs, "ifplugd");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.60/src/modules/Modem.ycp new/yast2-network-2.15.62/src/modules/Modem.ycp
--- old/yast2-network-2.15.60/src/modules/Modem.ycp 2007-08-10 17:24:04.000000000 +0200
+++ new/yast2-network-2.15.62/src/modules/Modem.ycp 2007-08-15 13:06:46.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Modem data
* Authors: Michal Svec
*
- * $Id: Modem.ycp 38170 2007-05-29 10:58:19Z mzugec $
+ * $Id: Modem.ycp 40271 2007-08-14 21:21:48Z mzugec $
*
* Representation of the configuration of modem.
* Input and output routines.
@@ -261,7 +261,7 @@
if(Abort()) return false;
/* Progress step 5/6 */
ProgressNextStage(_("Setting up smpppd(8)..."));
- SetupSMPPPD();
+ SetupSMPPPD(true);
sleep(sl);
if(Abort()) return false;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.60/src/routines/runtime.ycp new/yast2-network-2.15.62/src/routines/runtime.ycp
--- old/yast2-network-2.15.60/src/routines/runtime.ycp 2007-08-10 17:24:04.000000000 +0200
+++ new/yast2-network-2.15.62/src/routines/runtime.ycp 2007-08-15 13:06:46.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Runtime routines
* Authors: Michal Svec
*
- * $Id: runtime.ycp 38494 2007-06-18 08:13:34Z mzugec $
+ * $Id: runtime.ycp 40271 2007-08-14 21:21:48Z mzugec $
*/
{
@@ -16,6 +16,7 @@
import "NetworkDevices";
import "Package";
import "Service";
+import "PackageSystem";
textdomain "network";
@@ -82,7 +83,7 @@
* Setup smpppd(8)
* @return true if success
*/
-define boolean SetupSMPPPD() {
+define boolean SetupSMPPPD(boolean install_force) {
boolean ret = true;
/* Stop and disable */
if (!HaveDialupLikeInterfaces ()) {
@@ -91,11 +92,19 @@
}
/* Start and enable */
else {
- Package::InstallAllMsg(["smpppd", "kinternet"],
+ if (!PackageSystem::Installed("smpppd") || !PackageSystem::Installed("kinternet"))
+ {
+ string message =
// notification about package needed 1/2
_("<p>Because Device Control for Non-root User has been enabled, the <b>%1</b> packages must be installed.</p>") +
// notification about package needed 2/2
- _("<p>Do you want to install it now?</p>"));
+ _("<p>Do you want to install it now?</p>");
+
+ // (#299033) - if not forced, user can continue also without packages
+ if (!install_force) PackageSystem::CheckAndInstallPackages(["smpppd", "kinternet"]);
+ else
+ Package::InstallAllMsg(["smpppd", "kinternet"], message);
+
ret = Service::Enable("smpppd") && ret;
@@ -106,6 +115,7 @@
else
ret = Service::Start("smpppd") && ret;
}
+ }
}
return ret;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.60/src/services/routing.ycp new/yast2-network-2.15.62/src/services/routing.ycp
--- old/yast2-network-2.15.60/src/services/routing.ycp 2007-08-10 17:24:03.000000000 +0200
+++ new/yast2-network-2.15.62/src/services/routing.ycp 2007-08-15 16:56:38.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Routing configuration dialogs
* Authors: Michal Svec
*
- * $Id: routing.ycp 38161 2007-05-28 15:09:18Z mzugec $
+ * $Id: routing.ycp 40299 2007-08-15 14:51:06Z mzugec $
*
* Routing configuration dialogs
*/
@@ -167,9 +167,10 @@
UI::SetFocus(`id(`gw));
// #178538 - disable routing dialog when NetworkManager is used
+ // but instead of default route (#299448) - NM reads it
boolean enabled = !(boolean)NetworkService::IsManaged();
- UI::ChangeWidget(`id(`gw), `Enabled, enabled);
+// UI::ChangeWidget(`id(`gw), `Enabled, enabled);
UI::ChangeWidget(`id(`table), `Enabled, enabled);
UI::ChangeWidget(`id(`forward), `Enabled, enabled);
UI::ChangeWidget(`id(`add), `Enabled, enabled);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.60/testsuite/tests/runtime.ycp new/yast2-network-2.15.62/testsuite/tests/runtime.ycp
--- old/yast2-network-2.15.60/testsuite/tests/runtime.ycp 2007-08-10 17:24:04.000000000 +0200
+++ new/yast2-network-2.15.62/testsuite/tests/runtime.ycp 2007-08-15 13:06:46.000000000 +0200
@@ -80,7 +80,7 @@
TEST(``(RunKInternet()), [READ,$[],EXEC1], nil);
DUMP("SetupSMPPPD");
-TEST(``(SetupSMPPPD()), [READ,$[],EXEC0], nil);
-TEST(``(SetupSMPPPD()), [READ,$[],EXEC1], nil);
+TEST(``(SetupSMPPPD(true)), [READ,$[],EXEC0], nil);
+TEST(``(SetupSMPPPD(false)), [READ,$[],EXEC1], nil);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.60/VERSION new/yast2-network-2.15.62/VERSION
--- old/yast2-network-2.15.60/VERSION 2007-08-13 18:36:27.000000000 +0200
+++ new/yast2-network-2.15.62/VERSION 2007-08-15 16:55:46.000000000 +0200
@@ -1 +1 @@
-2.15.60
+2.15.62
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org