Hello community, here is the log from the commit of package yast2-network checked in at Thu Apr 26 15:40:48 CEST 2007. -------- --- yast2-network/yast2-network.changes 2007-04-22 12:40:54.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-network/yast2-network.changes 2007-04-26 10:57:18.000000000 +0200 @@ -1,0 +2,10 @@ +Thu Apr 26 10:56:03 CEST 2007 - mzugec@suse.cz + +- changed "Stupid Mode" to "Ignore Prompts" in modem + +------------------------------------------------------------------- +Thu Apr 26 10:26:34 CEST 2007 - mzugec@suse.cz + +- "change hostname via dhcp" not selected by default (#264915) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-network.spec ++++++ --- /var/tmp/diff_new_pack.V30124/_old 2007-04-26 15:40:27.000000000 +0200 +++ /var/tmp/diff_new_pack.V30124/_new 2007-04-26 15:40:27.000000000 +0200 @@ -12,7 +12,7 @@ Name: yast2-network Version: 2.15.28 -Release: 1 +Release: 5 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -107,6 +107,10 @@ /usr/share/YaST2/schema/autoyast/rnc/proxy.rnc %changelog +* Thu Apr 26 2007 - mzugec@suse.cz +- changed "Stupid Mode" to "Ignore Prompts" in modem +* Thu Apr 26 2007 - mzugec@suse.cz +- "change hostname via dhcp" not selected by default (#264915) * Sun Apr 22 2007 - mzugec@suse.de - hardware dialog moved to tab - additional addreses moved to address tab ++++++ yast2-network-2.15.28.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.28/configure new/yast2-network-2.15.28/configure --- old/yast2-network-2.15.28/configure 2007-04-22 12:18:05.000000000 +0200 +++ new/yast2-network-2.15.28/configure 2007-04-26 10:55:15.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for yast2-network 2.15.27. +# Generated by GNU Autoconf 2.60 for yast2-network 2.15.28. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='yast2-network' PACKAGE_TARNAME='yast2-network' -PACKAGE_VERSION='2.15.27' -PACKAGE_STRING='yast2-network 2.15.27' +PACKAGE_VERSION='2.15.28' +PACKAGE_STRING='yast2-network 2.15.28' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1181,7 +1181,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.27 to adapt to many kinds of systems. +\`configure' configures yast2-network 2.15.28 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1252,7 +1252,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-network 2.15.27:";; + short | recursive ) echo "Configuration of yast2-network 2.15.28:";; esac cat <<\_ACEOF @@ -1330,7 +1330,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-network configure 2.15.27 +yast2-network configure 2.15.28 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1344,7 +1344,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.27, which was +It was created by yast2-network $as_me 2.15.28, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -2145,7 +2145,7 @@ # Define the identity of the package. PACKAGE='yast2-network' - VERSION='2.15.27' + VERSION='2.15.28' cat >>confdefs.h <<_ACEOF @@ -2372,7 +2372,7 @@ -VERSION="2.15.27" +VERSION="2.15.28" RPMNAME="yast2-network" MAINTAINER="Michal Zugec <mzugec@suse.cz>" @@ -3258,7 +3258,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.27, which was +This file was extended by yast2-network $as_me 2.15.28, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3301,7 +3301,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-network config.status 2.15.27 +yast2-network config.status 2.15.28 configured by $0, generated by GNU Autoconf 2.60, 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.28/configure.in new/yast2-network-2.15.28/configure.in --- old/yast2-network-2.15.28/configure.in 2007-04-22 12:17:59.000000000 +0200 +++ new/yast2-network-2.15.28/configure.in 2007-04-26 10:55:12.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-network, 2.15.27, http://bugs.opensuse.org/, yast2-network) +AC_INIT(yast2-network, 2.15.28, 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.27" +VERSION="2.15.28" RPMNAME="yast2-network" MAINTAINER="Michal Zugec <mzugec@suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.28/src/lan/address.ycp new/yast2-network-2.15.28/src/lan/address.ycp --- old/yast2-network-2.15.28/src/lan/address.ycp 2007-04-22 12:43:43.000000000 +0200 +++ new/yast2-network-2.15.28/src/lan/address.ycp 2007-04-26 10:28:04.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Network card adresss configuration dialogs * Authors: Michal Svec <msvec@suse.cz> * - * $Id: address.ycp 37643 2007-04-22 10:40:07Z mzugec $ + * $Id: address.ycp 37685 2007-04-24 11:10:06Z kmachalkova $ */ { @@ -45,6 +45,8 @@ string fwzone_initial = ""; +boolean force_static_ip = ProductFeatures::GetBooleanFeature ("network", "force_static_ip"); + /** * `RadioButtonGroup uses CurrentButton instead of Value, grrr * @param key widget id @@ -433,11 +435,8 @@ "_DIALOG": $[ "widget": `empty, "help": - /* Address dialog help 7/8 */ - _("<p>Clicking <b>Next</b> completes the configuration.</p>") + /* Address dialog help 8/8 */ - _("<p>Contact your <b>network administrator</b> for more information about -the network configuration.</p>"), + _("<p>Clicking <b>Next</b> completes the configuration.</p>"), "validate_type": `function, "validate_function": ValidateDialog, // "init": InitDialog, @@ -559,7 +558,7 @@ ) ) ), - "help": help["bootproto"]:"", + "help": force_static_ip ? help["force_static_ip"]:"" : help["bootproto"]:"" + help["netmask"]:"", "init": initBootProto, "handle": handleBootProto, "store": storeBootProto, @@ -708,7 +707,6 @@ if(settings["BOOTPROTO"]:"" == "static" && settings["IPADDR"]:"" == "" && !no_dhcp) settings["BOOTPROTO"] = "dhcp"; - boolean force_static_ip = ProductFeatures::GetBooleanFeature ("network", "force_static_ip"); // #65524 if (Lan::operation == `add && force_static_ip) { @@ -728,13 +726,6 @@ map<string, map<string,any> > wd = (map<string, map<string,any> >) union (widget_descr, widget_descr_local); - if (force_static_ip) - { - wd["BOOTPROTO_dhcp", "help"] = - /* Address dialog help 2-6/8: static address preferred */ - _("<p>DHCP configuration is not recommended for this product. -Components of this product might not work with DHCP.</p>"); - } wd["STARTMODE"] = MakeStartmode ( ["auto", "ifplugd", "hotplug", "manual", "off", "nfsroot" ]); @@ -925,7 +916,8 @@ `VSpacing(0.4), `Frame(_("Device Control"), `HBox(("USERCONTROL"), `HStretch())) , `VSpacing (0.4), - `Frame(_("Maximum Transfer Unit (MTU)"), `HBox(("MTU"), `HStretch())) + `Frame(_("Maximum Transfer Unit (MTU)"), `HBox(("MTU"), `HStretch())), + `VStretch() ) ) ) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.28/src/lan/help.ycp new/yast2-network-2.15.28/src/lan/help.ycp --- old/yast2-network-2.15.28/src/lan/help.ycp 2007-04-21 23:04:23.000000000 +0200 +++ new/yast2-network-2.15.28/src/lan/help.ycp 2007-04-26 10:28:04.000000000 +0200 @@ -131,23 +131,25 @@ "bootproto": /* Address dialog help 1-6/8: dynamic address preferred */ /* Address dialog help 1/8 */ - _("<p><b><big>Address Setup</big></b></p> -<p>You can select dynamic address assignment -if you have a <b>DHCP server</b> running on your local network.</p> -") + +<p>Select <b>No Address Setup</b> if you don't want any IP address for this device. +This is particularly useful for bonding ethernet devices.</p>") + + /* Address dialog help 2/8 */ - _("<p>Also select this if you do not have a static IP address assigned -by the system administrator or your cable or DSL provider.</p>") + + _("<p>Select <b>Dynamic address</b> if you do not have a static IP address +assigned by the system administrator or your cable or DSL provider.</p>") + + /* Address dialog help 3/8 */ - _("<p>Network addresses are then obtained -<b>automatically</b> from the server.</p> -") + + _("<p>You can choose one of dynamic address assignment method. Select <b>DHCP</b> +if you have a DHCP server running on your local network. Network addresses are then +obtained automatically from the server.<p>") + + /* Address dialog help 4/8 */ - _("<p>Otherwise, network addresses must be assigned <b>manually</b>.</p>") + _("To automatically search for free IP and then assign it statically, select +<b>Zeroconf</b>. To use DHCP and fall back to zeroconf, select <b>DHCP + Zeroconf +</b>. Otherwise, network addresses must be assigned <b>statically</b>.</p>"), /* Address dialog help 5/8 */ - + _("<p>You can select <b>No Address Setup</b> if you don't want any IP address.</p>"), "remoteip": _("<p>Enter <b>IP Address</b> (e.g., 192.168.100.99) @@ -157,7 +159,15 @@ /* Address dialog help 6/8 */ "netmask": _("<p>For <b>Static Address Setup</b> enter static IP address (e.g., 192.168.100.99) -for your computer and the network mask (usually 255.255.255.0)</p>"), +for your computer and the network mask (usually 255.255.255.0)</p>") + + + /* Address dialog help 8/8 */ + _("<p>Contact your <b>network administrator</b> for more information about +the network configuration.</p>"), + +"force_static_ip": + _("<p>DHCP configuration is not recommended for this product. +Components of this product might not work with DHCP.</p>"), "fwzone": _("<p><b><big>Firewall Zone</big></b></p> @@ -208,7 +218,8 @@ "additional": /* Aliases dialog help 1/3 */ - _("<p>Configure additional addresses of an interface (its aliases) in this dialog.</p>") + + _("<p><b><big>Additional addresses</big></b></p> +<p>Configure additional addresses of an interface (its aliases) in this table.</p>") + /* Aliases dialog help 2/3 */ _("<p>Enter an <b>Alias Name</b>, an <b>IP Address</b>, and diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.28/src/provider/connection.ycp new/yast2-network-2.15.28/src/provider/connection.ycp --- old/yast2-network-2.15.28/src/provider/connection.ycp 2007-01-04 16:33:30.000000000 +0100 +++ new/yast2-network-2.15.28/src/provider/connection.ycp 2007-04-26 10:56:55.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Connection configuration dialogs * Authors: Michal Svec <msvec@suse.cz> * - * $Id: connection.ycp 35084 2007-01-04 15:32:49Z mzugec $ + * $Id: connection.ycp 37727 2007-04-26 08:56:52Z mzugec $ */ { @@ -126,7 +126,7 @@ if (type == "modem") helptext = helptext + /* Connection dialog help 5/8 */ -_("<p><b>Stupid Mode</b> disables the detection of any prompts from the dial-up +_("<p><b>Ignore Prompts</b> disables the detection of any prompts from the dial-up server. If the connection build-up is slow or does not work at all, try this option.</p> "); @@ -170,7 +170,7 @@ term StupidMode = `VSpacing(0.1); if (type == "modem") /* Checkbox label */ - StupidMode = `Left(`CheckBox(`id(`stupidmode), _("S&tupid Mode"), stupidmode)); + StupidMode = `Left(`CheckBox(`id(`stupidmode), _("I&gnore Prompts"), stupidmode)); term details = `VSpacing(0.1); // FIXME if(type == "isdn") diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.28/src/services/dns.ycp new/yast2-network-2.15.28/src/services/dns.ycp --- old/yast2-network-2.15.28/src/services/dns.ycp 2007-04-05 09:59:27.000000000 +0200 +++ new/yast2-network-2.15.28/src/services/dns.ycp 2007-04-26 10:27:09.000000000 +0200 @@ -5,7 +5,7 @@ * Authors: Michal Svec <msvec@suse.cz> * Martin Vidner <mvidner@suse.cz> * - * $Id: dns.ycp 37319 2007-04-05 07:56:12Z mzugec $ + * $Id: dns.ycp 37726 2007-04-26 08:27:08Z mzugec $ */ { @@ -63,7 +63,7 @@ * @return initial settings for this dialog in one map, from DNS:: */ define map InitSettings () { - boolean write_hostname = true; +// boolean write_hostname = true; map settings = $[ "HOSTNAME": DNS::hostname, @@ -345,7 +345,7 @@ "DHCP_HOSTNAME": $[ "widget": `custom, "custom_widget" : `HBox( - `CheckBox(`id("DHCP_HOSTNAME"), _("&Change Hostname via DHCP")), + `CheckBox(`id("DHCP_HOSTNAME"), _("&Change Hostname via DHCP"), true), `ReplacePoint( `id("dh_host_text"), `Empty() ) ), // help ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org