Hello community,
here is the log from the commit of package yast2-dhcp-server
checked in at Wed Aug 2 12:54:06 CEST 2006.
--------
--- yast2-dhcp-server/yast2-dhcp-server.changes 2006-06-05 11:06:12.000000000 +0200
+++ yast2-dhcp-server/yast2-dhcp-server.changes 2006-08-02 11:35:07.000000000 +0200
@@ -1,0 +2,27 @@
+Wed Aug 2 11:34:37 CEST 2006 - locilka@suse.cz
+
+- Limit displayed interface name to 40 characters.
+- 2.13.6
+
+-------------------------------------------------------------------
+Tue Jul 18 15:43:26 CEST 2006 - locilka@suse.cz
+
+- Card selection dialog changed to provide buttons [Select] and
+ [Unselect] and table header item to Selected to better reflect
+ the status of the network interfaces that are selected for
+ DHCP Server to run on (#164242).
+- These buttons are enabled or disabled by the current status of
+ the selected interface. Active interface can be deactivated only
+ and vice versa.
+- Different help for expert and simple UI in the Card Selection
+ dialog.
+
+-------------------------------------------------------------------
+Thu Jul 13 11:46:21 CEST 2006 - locilka@suse.cz
+
+- Do not complain about blank DHCPD_INTERFACE in case of
+ (auto)installation. All interfaces will be used instead
+ by the dhcpd (#173861).
+- 2.13.5
+
+-------------------------------------------------------------------
Old:
----
yast2-dhcp-server-2.13.4.tar.bz2
New:
----
yast2-dhcp-server-2.13.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-dhcp-server.spec ++++++
--- /var/tmp/diff_new_pack.CyTcGa/_old 2006-08-02 12:53:59.000000000 +0200
+++ /var/tmp/diff_new_pack.CyTcGa/_new 2006-08-02 12:53:59.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-dhcp-server (Version 2.13.4)
+# spec file for package yast2-dhcp-server (Version 2.13.6)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-dhcp-server
-Version: 2.13.4
+Version: 2.13.6
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-dhcp-server-2.13.4.tar.bz2
+Source0: yast2-dhcp-server-2.13.6.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-Digest-SHA1 perl-X500-DN perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-perl-bindings yast2-testsuite
Requires: yast2 perl-gettext yast2-perl-bindings bind-utils perl-X500-DN yast2-ldap perl-Digest-SHA1 perl-Parse-RecDescent
@@ -34,7 +34,7 @@
Jiri Srain
%prep
-%setup -n yast2-dhcp-server-2.13.4
+%setup -n yast2-dhcp-server-2.13.6
%build
%{prefix}/bin/y2tool y2autoconf
@@ -71,6 +71,24 @@
%doc %{prefix}/share/doc/packages/yast2-dhcp-server
%changelog -n yast2-dhcp-server
+* Wed Aug 02 2006 - locilka@suse.cz
+- Limit displayed interface name to 40 characters.
+- 2.13.6
+* Tue Jul 18 2006 - locilka@suse.cz
+- Card selection dialog changed to provide buttons [Select] and
+ [Unselect] and table header item to Selected to better reflect
+ the status of the network interfaces that are selected for
+ DHCP Server to run on (#164242).
+- These buttons are enabled or disabled by the current status of
+ the selected interface. Active interface can be deactivated only
+ and vice versa.
+- Different help for expert and simple UI in the Card Selection
+ dialog.
+* Thu Jul 13 2006 - locilka@suse.cz
+- Do not complain about blank DHCPD_INTERFACE in case of
+ (auto)installation. All interfaces will be used instead
+ by the dhcpd (#173861).
+- 2.13.5
* Mon Jun 05 2006 - locilka@suse.cz
- Fixing UI visibility, especially Time Units ComboBox (#181146).
- 2.13.4
++++++ yast2-dhcp-server-2.13.4.tar.bz2 -> yast2-dhcp-server-2.13.6.tar.bz2 ++++++
++++ 1950 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-dhcp-server-2.13.4/VERSION new/yast2-dhcp-server-2.13.6/VERSION
--- old/yast2-dhcp-server-2.13.4/VERSION 2006-06-05 11:00:30.000000000 +0200
+++ new/yast2-dhcp-server-2.13.6/VERSION 2006-08-02 11:35:13.000000000 +0200
@@ -1 +1 @@
-2.13.4
+2.13.6
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-dhcp-server-2.13.4/configure.in new/yast2-dhcp-server-2.13.6/configure.in
--- old/yast2-dhcp-server-2.13.4/configure.in 2006-06-05 11:06:41.000000000 +0200
+++ new/yast2-dhcp-server-2.13.6/configure.in 2006-08-02 11:38:12.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-dhcp-server
dnl
-dnl -- This file is generated by y2autoconf 2.13.17 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.13.19 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-dhcp-server, 2.13.4, http://www.suse.de/feedback, yast2-dhcp-server)
+AC_INIT(yast2-dhcp-server, 2.13.6, http://bugs.opensuse.org/, yast2-dhcp-server)
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.13.4"
+VERSION="2.13.6"
RPMNAME="yast2-dhcp-server"
MAINTAINER="Lukas Ocilka "
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-dhcp-server-2.13.4/src/DhcpServer.pm new/yast2-dhcp-server-2.13.6/src/DhcpServer.pm
--- old/yast2-dhcp-server-2.13.4/src/DhcpServer.pm 2006-05-17 09:20:12.000000000 +0200
+++ new/yast2-dhcp-server-2.13.6/src/DhcpServer.pm 2006-07-19 10:15:52.000000000 +0200
@@ -1337,7 +1337,7 @@
return {
"install" => ["dhcp-server"],
- "remote" => [],
+ "remove" => [],
}
}
@@ -1502,7 +1502,11 @@
if (scalar (@allowed_interfaces) == 0)
{
y2milestone ("No interface was set to listen to!");
- $was_configured = 0;
+ # Bugzilla 173861
+ # Permit empty list of interfaces
+ if (!Mode->autoinst() && !Mode->installation()) {
+ $was_configured = 0;
+ }
}
if (scalar (keys (%{SCR->Read (".target.stat", Directory->vardir () . "/dhcp_server_done_once") || {}})) == 0)
{
@@ -1655,7 +1659,15 @@
Progress->NextStage ();
SCR->Write (".sysconfig.dhcpd.DHCPD_RUN_CHROOTED", $chroot ? "yes" : "no");
+
my $ifaces_list = join (" ", @allowed_interfaces);
+ # in (auto)installation only
+ if ((Mode->autoinst() || Mode->installation()) && scalar(@allowed_interfaces) == 0) {
+ # bug #173861
+ # " " means ANY interface
+ y2warning("Activating \" \" for DHCPD_INTERFACE");
+ $ifaces_list = " ";
+ }
SCR->Write (".sysconfig.dhcpd.DHCPD_INTERFACE", $ifaces_list);
SCR->Write (".sysconfig.dhcpd", undef);
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-dhcp-server-2.13.4/src/dialogs2.ycp new/yast2-dhcp-server-2.13.6/src/dialogs2.ycp
--- old/yast2-dhcp-server-2.13.4/src/dialogs2.ycp 2006-06-05 11:01:29.000000000 +0200
+++ new/yast2-dhcp-server-2.13.6/src/dialogs2.ycp 2006-08-02 11:35:38.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Dialogs definitions
* Authors: Vladimír Bobek
*
- * $Id: dialogs2.ycp 31309 2006-06-05 09:01:23Z locilka $
+ * $Id: dialogs2.ycp 32100 2006-08-02 09:37:08Z locilka $
*/
{
@@ -25,6 +25,7 @@
import "ProductFeatures";
import "NetworkDevices";
import "Report";
+import "Mode";
include "dhcp-server/helps.ycp";
include "dhcp-server/widgets.ycp";
@@ -119,9 +120,10 @@
`Left( `Label( _("Network Cards for DHCP Server") ) ),
`Table (
`id("nic_selection"),
+ `opt(`notify, `immediate),
`header (
// TRANSLATORS: table header item
- _("Active"),
+ _("Selected"),
// TRANSLATORS: table header item
_("Interface Name"),
// TRANSLATORS: table header item
@@ -133,8 +135,10 @@
)
),
`HBox (
- `PushButton(`id("add"), Label::AddButton()),
- `PushButton(`id("remove"), Label::RemoveButton())
+ // TRANSLATORS: a push-button
+ `PushButton(`id("add"), _("&Select")),
+ // TRANSLATORS: a push-button
+ `PushButton(`id("remove"), _("&Unselect"))
),
`VStretch()
);
@@ -142,6 +146,20 @@
return dialog;
}
+void SetInterfacesTableButtons () {
+ string current_item = (string) UI::QueryWidget(`id("nic_selection"), `CurrentItem);
+
+ // The currently selected item is active, can be deactivated
+ if ((boolean) DhcpServerUI::ifaces[current_item, "active"]:nil == true) {
+ UI::ChangeWidget(`id("add"), `Enabled, false);
+ UI::ChangeWidget(`id("remove"), `Enabled, true);
+ // and vice versa
+ } else {
+ UI::ChangeWidget(`id("add"), `Enabled, true);
+ UI::ChangeWidget(`id("remove"), `Enabled, false);
+ }
+}
+
void RedrawInterfacesTable () {
list <term> table_items = [];
foreach (string iface, map settings, DhcpServerUI::ifaces, {
@@ -153,10 +171,13 @@
settings["ipaddr"]:""
));
});
+
UI::ChangeWidget(`id("nic_selection"), `Items, table_items);
if (current_item_iface != nil) {
UI::ChangeWidget(`id("nic_selection"), `CurrentItem, current_item_iface);
}
+
+ SetInterfacesTableButtons();
}
void CardSelectionInit (string key)
@@ -165,8 +186,13 @@
foreach (string iface, NetworkDevices::List(""), {
if (iface != "" && !issubstring(iface, "lo") && !issubstring(iface, "sit")) {
+ string device_name = NetworkDevices::GetValue(iface, "NAME");
+ if (size(device_name) > 40) {
+ device_name = substring (device_name, 0, 37) + "...";
+ }
+
DhcpServerUI::ifaces[iface] = $[
- "device" : NetworkDevices::GetValue(iface, "NAME"),
+ "device" : device_name,
"ipaddr" : (NetworkDevices::GetValue(iface, "BOOTPROTO") == "dhcp" ?
// TRANSLATORS: Table items; Informs that the IP is a DHCP Address
_("DHCP address")
@@ -201,6 +227,8 @@
symbol CardSelectionHandle (string key, map event) {
string item_id = (string) UI::QueryWidget(`id("nic_selection"), `CurrentItem);
+ SetInterfacesTableButtons();
+
current_item_iface = item_id;
if (expert_ui) {
@@ -220,6 +248,7 @@
DhcpServerUI::ifaces[item_id,"active"] = false;
}
}
+
RedrawInterfacesTable();
return nil;
@@ -303,12 +332,12 @@
`Left(
`HBox(
// Textentry with default lease time of IP address from dhcp server
- `TextEntry(`id("defaultleasetime"), `opt(`hsquash), _("Default &Lease Time")),
+ `HSquash(`TextEntry(`id("defaultleasetime"), _("Default &Lease Time"))),
`HSpacing(0.1),
`MinWidth(
TimeComboLabelLength(),
// Units for defaultleasetime
- `ComboBox(`id("defaultleasetimeunits"), `opt(`hsquash), "", time_combo_items)
+ `HSquash(`ComboBox(`id("defaultleasetimeunits"), _("&Units"), time_combo_items))
)
)
)
@@ -634,13 +663,13 @@
`opt(`hstretch),
`HWeight(
// Textentry label - lease time for IPs in the range
- 3, `TextEntry(`id("defaultleasetime"), `opt(`hsquash), _("&Default"))
+ 3, `TextEntry(`id("defaultleasetime"), _("&Default"))
),
`HWeight(
2, `MinWidth(
TimeComboLabelLength(),
// Combobox - type of units for lease time
- `ComboBox(`id("defaultleasetimeunits"), `opt(`hsquash), "",
+ `ComboBox(`id("defaultleasetimeunits"), _("&Units"),
time_combo_items
)
)
@@ -648,13 +677,13 @@
`HSpacing(1),
`HWeight(
// TextEntryLabel - max. time for leasing of IPs from the range
- 3, `TextEntry(`id("maxleasetime"), `opt(`hsquash), _("&Maximum"))
+ 3, `TextEntry(`id("maxleasetime"), _("&Maximum"))
),
`HWeight(
2, `MinWidth(
TimeComboLabelLength(),
// Combobox - type of units for max lease time
- `ComboBox(`id("maxleasetimeunits"), `opt(`hsquash), "",
+ `ComboBox(`id("maxleasetimeunits"), `opt(`hsquash), _("Uni&ts"),
time_combo_items
)
)
@@ -1518,7 +1547,7 @@
"store" : CardSelectionStore,
"validate_type" : `function,
"validate_function" : CardSelectionValidate,
- "help" : HELPS["card_selection"]:"",
+ "help" : (expert_ui ? HELPS["card_selection_expert"]:"" : HELPS["card_selection_simple"]:""),
],
"global_settings" : $[
"widget" : `custom,
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-dhcp-server-2.13.4/src/helps.ycp new/yast2-dhcp-server-2.13.6/src/helps.ycp
--- old/yast2-dhcp-server-2.13.4/src/helps.ycp 2006-04-28 10:23:42.000000000 +0200
+++ new/yast2-dhcp-server-2.13.6/src/helps.ycp 2006-07-19 09:10:01.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Help texts of all the dialogs
* Authors: Jiri Srain
*
- * $Id: helps.ycp 24963 2005-08-16 09:47:20Z locilka $
+ * $Id: helps.ycp 31946 2006-07-19 07:11:33Z locilka $
*/
{
@@ -128,8 +128,12 @@
their primary name server. If the name server runs on the same host as the DHCP
server, you can leave the fields empty.</p>"),
- // Wizard Installation - Step 1
- "card_selection" : _("<p><b><big>Network Card Selection</big></b><br>
+ // Wizard Installation - Step 1 (version for expert UI)
+ "card_selection_expert" : _("<p><b><big>Network Card Selection</big></b><br>
+Select one or more of listed network cards to use for the DHCP server.</p>"),
+
+ // Wizard Installation - Step 1 (version for simple UI)
+ "card_selection_simple" : _("<p><b><big>Network Card Selection</big></b><br>
Select one of listed network cards to use for the DHCP server.</p>"),
// Wizard Installation - Step 2 1/9
@@ -215,7 +219,7 @@
* @param possible list of declarations that can be selected
* @return string the help
*/
- global define string getSelectDeclarationTypeHelp (list possible) ``{
+ define string getSelectDeclarationTypeHelp (list possible) ``{
// help text 1/7
string ret = _("<p>Select the type of declaration to add.</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-dhcp-server-2.13.4/src/widgets.ycp new/yast2-dhcp-server-2.13.6/src/widgets.ycp
--- old/yast2-dhcp-server-2.13.4/src/widgets.ycp 2006-04-28 10:23:42.000000000 +0200
+++ new/yast2-dhcp-server-2.13.6/src/widgets.ycp 2006-07-19 09:10:01.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Widgets
* Authors: Jiri Srain
*
- * $Id: widgets.ycp 24963 2005-08-16 09:47:20Z locilka $
+ * $Id: widgets.ycp 31946 2006-07-19 07:11:33Z locilka $
*/
{
@@ -21,6 +21,7 @@
import "Popup";
import "TablePopup";
import "SuSEFirewall";
+ import "Mode";
// pre-declarations
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...