Hello community,
here is the log from the commit of package yast2-network
checked in at Wed Jul 9 02:25:26 CEST 2008.
--------
--- yast2-network/yast2-network.changes 2008-06-21 19:26:04.000000000 +0200
+++ yast2-network/yast2-network.changes 2008-07-01 17:55:34.000000000 +0200
@@ -1,0 +2,14 @@
+Tue Jul 1 17:51:19 CEST 2008 - mzugec@suse.de
+
+- support for "/PREFIXLEN" in aliases
+- common mask/prefix validator
+- IPv6 support in aliases
+- 2.17.6
+
+-------------------------------------------------------------------
+Tue Jun 24 16:38:56 CEST 2008 - mzugec@suse.cz
+
+- correctly show bonding slaves (bnc#401719)
+- 2.17.5
+
+-------------------------------------------------------------------
Old:
----
yast2-network-2.17.4.tar.bz2
New:
----
yast2-network-2.17.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.C24742/_old 2008-07-09 02:21:56.000000000 +0200
+++ /var/tmp/diff_new_pack.C24742/_new 2008-07-09 02:21:56.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-network (Version 2.17.4)
+# spec file for package yast2-network (Version 2.17.6)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,12 +12,12 @@
Name: yast2-network
-Version: 2.17.4
+Version: 2.17.6
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-network-2.17.4.tar.bz2
+Source0: yast2-network-2.17.6.tar.bz2
Prefix: /usr
# should be required by devtools
BuildRequires: perl-XML-Writer pkgconfig rpm
@@ -27,8 +27,8 @@
BuildRequires: yast2-installation >= 2.15.27
BuildRequires: yast2 >= 2.16.6
BuildRequires: yast2-packager >= 2.16.37
-# needed for prefixlen support
-Requires: yast2 >= 2.17.1
+# needed for prefixlen support in aliases
+Requires: yast2 >= 2.17.5
Requires: sysconfig
Requires: yast2-packager >= 2.16.37
#GetLanguageCountry
@@ -71,7 +71,7 @@
Michal Svec
%prep
-%setup -n yast2-network-2.17.4
+%setup -n yast2-network-2.17.6
%build
%{prefix}/bin/y2tool y2autoconf
@@ -135,6 +135,14 @@
%exclude %{prefix}/share/doc/packages/yast2-network/COPYING
%exclude %{prefix}/share/doc/packages/yast2-network/README
%changelog
+* Tue Jul 01 2008 mzugec@suse.de
+- support for "/PREFIXLEN" in aliases
+- common mask/prefix validator
+- IPv6 support in aliases
+- 2.17.6
+* Tue Jun 24 2008 mzugec@suse.cz
+- correctly show bonding slaves (bnc#401719)
+- 2.17.5
* Sat Jun 21 2008 mzugec@suse.cz
- enable smpppd when dsl connection configured (bnc#397966)
- 2.17.4
++++++ yast2-network-2.17.4.tar.bz2 -> yast2-network-2.17.6.tar.bz2 ++++++
++++ 6579 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.4/configure.in new/yast2-network-2.17.6/configure.in
--- old/yast2-network-2.17.4/configure.in 2008-06-21 19:20:14.000000000 +0200
+++ new/yast2-network-2.17.6/configure.in 2008-07-01 19:22:34.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-network
dnl
-dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.17.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-network, 2.17.3, http://bugs.opensuse.org/, yast2-network)
+AC_INIT(yast2-network, 2.17.5, 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.3"
+VERSION="2.17.5"
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.4/src/lan/address.ycp new/yast2-network-2.17.6/src/lan/address.ycp
--- old/yast2-network-2.17.4/src/lan/address.ycp 2008-06-18 13:29:45.000000000 +0200
+++ new/yast2-network-2.17.6/src/lan/address.ycp 2008-07-01 17:53:38.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Network card adresss configuration dialogs
* Authors: Michal Svec
*
- * $Id: address.ycp 48381 2008-06-18 10:17:20Z mzugec $
+ * $Id: address.ycp 48737 2008-07-01 15:53:37Z mzugec $
*/
{
@@ -153,19 +153,18 @@
{
// UI::ChangeWidget(`id(key), `SelectedItems, settings["SLAVES"]:[]);
list items = createUnconfigured(settings["SLAVES"]:[]);
-
map configurations = NetworkInterfaces::FilterDevices("netcard");
foreach(string devtype, splitstring(NetworkInterfaces::CardRegex["netcard"]:"", "|"), {
foreach(string devname, (list<string>) Map::Keys(configurations[devtype]:$[]), {
-
//filter the eth devices (BOOT_PROTO=none && START_MODE=off)
if (((string)configurations[devtype, devname, "BOOTPROTO"]:"" == "none") && ((string)configurations[devtype, devname, "STARTMODE"]:"" == "off"))
- items = add (items, [ devname ] );
+ items = add (items, `item(`id(devname), sformat("%1 - %2", devname, configurations[devtype, devname, "NAME"]:""), contains(settings["SLAVES"]:[], devname)) );
});
});
UI::ChangeWidget(`id(key), `Items, items);
+y2internal("slaves %1", settings["SLAVES"]:[]);
}
/**
@@ -400,13 +399,7 @@
}
string mask=(string) UI::QueryWidget (`netmask, `Value);
- boolean valid_mask=false;
- if (Netmask::Check4(mask)) valid_mask=true;
- else if (regexpmatch(mask, "^/[[:digit:]]{1,2}$")) valid_mask=true;
- else if (Netmask::Check6(mask)) valid_mask=true;
- else if (regexpmatch(mask, "^/[[:digit:]]{1,3}$")) valid_mask=true;
-
- if(!valid_mask){
+ if(!validPrefixOrNetmask(mask)){
Popup::Error(_("No valid netmask or prefix lenght."));
UI::SetFocus(`netmask);
return false;
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.4/src/lan/bridge.ycp new/yast2-network-2.17.6/src/lan/bridge.ycp
--- old/yast2-network-2.17.4/src/lan/bridge.ycp 2008-04-21 12:32:11.000000000 +0200
+++ new/yast2-network-2.17.6/src/lan/bridge.ycp 2008-07-01 15:35:31.000000000 +0200
@@ -56,7 +56,7 @@
if ((string)configurations[NetworkInterfaces::GetType(device), device, "IPADDR"]:"" != "0.0.0.0") {
if(!confirmed) {
valid = Popup::ContinueCancel(_("At least one selected device is already configured.
-Remove the configuration.
+Remove the configuration?
"));
confirmed=true;
}
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.4/src/lan/virtual.ycp new/yast2-network-2.17.6/src/lan/virtual.ycp
--- old/yast2-network-2.17.4/src/lan/virtual.ycp 2008-01-24 14:41:27.000000000 +0100
+++ new/yast2-network-2.17.6/src/lan/virtual.ycp 2008-07-01 17:53:38.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Multiple addresses dialogs
* Authors: Michal Svec
*
- * $Id: virtual.ycp 43483 2008-01-08 17:49:13Z mzugec $
+ * $Id: virtual.ycp 48737 2008-07-01 15:53:37Z mzugec $
*/
{
@@ -67,7 +67,10 @@
list<term> table_items = [];
/* make ui items from the aliases list */
maplist(string alias, map data, (map) LanItems::aliases, {
- table_items = add(table_items, `item(`id(size(table_items)), alias, data["IPADDR"]:"", data["NETMASK"]:""));
+ string ip = data["IPADDR"]:"";
+ string mask = data["NETMASK"]:"";
+ if (size(data["PREFIXLEN"]:"")>0) mask=sformat("/%1", data["PREFIXLEN"]:"");
+ table_items = add(table_items, `item(`id(size(table_items)), alias, ip, mask));
});
UI::ChangeWidget(`id(`table), `Items, table_items);
@@ -134,7 +137,8 @@
maplist(term e, table_items, {
map alias = $[];
alias["IPADDR"] = e[2]:"";
- alias["NETMASK"] = e[3]:"";
+ if(substring(e[3]:"", 0,1)=="/") alias["PREFIXLEN"]=substring(e[3]:"", 1);
+ else alias["NETMASK"]=e[3]:"";
LanItems::aliases[e[1]:""] = alias;
aliases_to_delete[e[1]:""] = nil;
});
@@ -178,7 +182,7 @@
UI::ChangeWidget(`id(`name), `ValidChars, "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ");
UI::ChangeWidget(`id(`ipaddr), `ValidChars, IP::ValidChars);
- UI::ChangeWidget(`id(`netmask), `ValidChars, Netmask::ValidChars);
+// UI::ChangeWidget(`id(`netmask), `ValidChars, Netmask::ValidChars);
if(entry == `empty())
UI::SetFocus(`id(`name));
@@ -219,7 +223,7 @@
host = add(host, val);
val = (string) UI::QueryWidget(`id(`netmask), `Value);
- if(!Netmask::Check(val)) {
+ if(!validPrefixOrNetmask(val)) {
/* Popup::Error text */
Popup::Error(_("The subnet mask is invalid."));
UI::SetFocus(`id(`netmask));
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.4/src/routines/routines.ycp new/yast2-network-2.17.6/src/routines/routines.ycp
--- old/yast2-network-2.17.4/src/routines/routines.ycp 2008-04-22 16:27:13.000000000 +0200
+++ new/yast2-network-2.17.6/src/routines/routines.ycp 2008-07-01 17:53:38.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Miscellaneous routines
* Authors: Michal Svec
*
- * $Id: routines.ycp 46908 2008-04-21 13:18:21Z mzugec $
+ * $Id: routines.ycp 48737 2008-07-01 15:53:37Z mzugec $
*/
{
@@ -22,6 +22,7 @@
import "Confirm";
import "Map";
import "DefaultDesktop";
+import "Netmask";
/**
* Abort function
@@ -784,5 +785,19 @@
y2debug("Hardware=%1", Hardware);
return Hardware;
}
+
+boolean validPrefixOrNetmask(string val){
+
+ boolean valid_mask=false;
+ if (Netmask::Check4(val)) valid_mask=true;
+ else
+ if (regexpmatch(val, "^/[[:digit:]]{1,2}$") && tointeger(substring(val, 1))<=32) valid_mask=true;
+ else
+ if (Netmask::Check6(val)) valid_mask=true;
+ else
+ if (regexpmatch(val, "^/[[:digit:]]{1,3}$") && tointeger(substring(val, 1))<=128) valid_mask=true;
+ return valid_mask;
+}
+
/* EOF */
}
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.4/src/routines/runtime.ycp new/yast2-network-2.17.6/src/routines/runtime.ycp
--- old/yast2-network-2.17.4/src/routines/runtime.ycp 2008-06-21 19:25:24.000000000 +0200
+++ new/yast2-network-2.17.6/src/routines/runtime.ycp 2008-07-01 15:35:31.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Runtime routines
* Authors: Michal Svec
*
- * $Id: runtime.ycp 48472 2008-06-21 17:25:23Z mzugec $
+ * $Id: runtime.ycp 48531 2008-06-25 12:55:38Z kmachalkova $
*/
{
@@ -96,7 +96,7 @@
{
string message =
// notification about package needed 1/2
- _("<p>The <b>%1</b> packages must be installed because device control for non-root users has benn established.</p>") +
+ _("<p>The <b>%1</b> packages must be installed because device control for non-root users has been established.</p>") +
// notification about package needed 2/2
_("<p>Do you want to install it now?</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.4/src/routines/widgets.ycp new/yast2-network-2.17.6/src/routines/widgets.ycp
--- old/yast2-network-2.17.4/src/routines/widgets.ycp 2008-06-13 16:14:38.000000000 +0200
+++ new/yast2-network-2.17.6/src/routines/widgets.ycp 2008-07-01 15:35:31.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Widgets for CWM
* Authors: Martin Vidner
*
- * $Id: widgets.ycp 46855 2008-04-18 13:48:54Z jsrain $
+ * $Id: widgets.ycp 48531 2008-06-25 12:55:38Z kmachalkova $
*/
{
@@ -116,8 +116,8 @@
// Combo box option for Device Activation
"label": _("Manually"),
// help text for Device Activation
- "help": _("<p>Press <b>Manually</b> tocontrol the interface manually
-via ifup or KInternet (See <b>User Controlled</b> below).
+ "help": _("<p><b>Manually</b>: You control the interface manually
+via 'ifup' or 'kinternet' (see 'User Controlled' below)</p>.
"),
],
"ifplugd": $[
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.4/VERSION new/yast2-network-2.17.6/VERSION
--- old/yast2-network-2.17.4/VERSION 2008-06-21 19:23:31.000000000 +0200
+++ new/yast2-network-2.17.6/VERSION 2008-07-01 17:50:52.000000000 +0200
@@ -1 +1 @@
-2.17.4
+2.17.6
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org