Hello community,
here is the log from the commit of package yast2
checked in at Wed Apr 9 22:13:14 CEST 2008.
--------
--- yast2/yast2.changes 2008-04-04 17:52:12.000000000 +0200
+++ yast2/yast2.changes 2008-04-09 16:23:21.180862000 +0200
@@ -1,0 +2,22 @@
+Wed Apr 9 14:57:17 CEST 2008 - jsrain@suse.cz
+
+- use only one 'tail' command in LogView if not using grep to
+ filter a log in order to avoid buffering (bnc #371983)
+- 2.16.47
+
+-------------------------------------------------------------------
+Wed Apr 9 10:33:04 CEST 2008 - locilka@suse.cz
+
+- Added support for Samba Broadcast Reply (FATE #300970).
+- Updated Firewall Services translations.
+- Renamed SuSEfirewall2 SCR agent to help to make SCR lazy.
+
+-------------------------------------------------------------------
+Tue Apr 8 12:14:52 CEST 2008 - lslezak@suse.cz
+
+- call Pkg::TargetInit() in PackageSystem::EnsureTargetInit()
+ to load installed packages
+- only PAE version of kernel-xen is shipped (kernel-xenpae is now
+ kernel-xen)
+
+-------------------------------------------------------------------
Old:
----
yast2-2.16.46.tar.bz2
New:
----
yast2-2.16.47.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2.spec ++++++
--- /var/tmp/diff_new_pack.o31052/_old 2008-04-09 22:10:00.000000000 +0200
+++ /var/tmp/diff_new_pack.o31052/_new 2008-04-09 22:10:00.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2 (Version 2.16.46)
+# spec file for package yast2 (Version 2.16.47)
#
# 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
-Version: 2.16.46
+Version: 2.16.47
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-2.16.46.tar.bz2
+Source0: yast2-2.16.47.tar.bz2
Prefix: /usr
Source1: yast2-rpmlintrc
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-perl-bindings yast2-testsuite
@@ -136,7 +136,7 @@
Steffen Winterfeldt
%prep
-%setup -n yast2-2.16.46
+%setup -n yast2-2.16.47
%build
%{prefix}/bin/y2tool y2autoconf
@@ -239,8 +239,20 @@
%doc %{prefix}/share/doc/packages/yast2/system
%doc %{prefix}/share/doc/packages/yast2/types
%doc %{prefix}/share/doc/packages/yast2/wizard
-
%changelog
+* Wed Apr 09 2008 jsrain@suse.cz
+- use only one 'tail' command in LogView if not using grep to
+ filter a log in order to avoid buffering (bnc #371983)
+- 2.16.47
+* Wed Apr 09 2008 locilka@suse.cz
+- Added support for Samba Broadcast Reply (FATE #300970).
+- Updated Firewall Services translations.
+- Renamed SuSEfirewall2 SCR agent to help to make SCR lazy.
+* Tue Apr 08 2008 lslezak@suse.cz
+- call Pkg::TargetInit() in PackageSystem::EnsureTargetInit()
+ to load installed packages
+- only PAE version of kernel-xen is shipped (kernel-xenpae is now
+ kernel-xen)
* Fri Apr 04 2008 locilka@suse.cz
- Added GetInstArgs::automatic_configuration for easier handling
of the automatic configuration process.
++++++ yast2-2.16.46.tar.bz2 -> yast2-2.16.47.tar.bz2 ++++++
++++ 6253 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-2.16.46/configure.in new/yast2-2.16.47/configure.in
--- old/yast2-2.16.46/configure.in 2008-04-04 14:10:18.000000000 +0200
+++ new/yast2-2.16.47/configure.in 2008-04-09 16:22:12.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2, 2.16.44, http://bugs.opensuse.org/, yast2)
+AC_INIT(yast2, 2.16.47, http://bugs.opensuse.org/, yast2)
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.16.44"
+VERSION="2.16.47"
RPMNAME="yast2"
MAINTAINER="Jiri Srain "
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-2.16.46/library/log/src/LogView.ycp new/yast2-2.16.47/library/log/src/LogView.ycp
--- old/yast2-2.16.46/library/log/src/LogView.ycp 2008-03-19 11:39:53.000000000 +0100
+++ new/yast2-2.16.47/library/log/src/LogView.ycp 2008-04-09 15:27:40.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Displaying a log with additional functionality
* Authors: Jiri Srain
*
- * $Id: LogView.ycp 45572 2008-03-18 19:33:31Z aschnell $
+ * $Id: LogView.ycp 46287 2008-04-09 13:27:39Z jsrain $
*
* All of these functions watch the log file and display
* added lines as the log grows.
@@ -75,6 +75,11 @@
*/
list<string> lines = [];
+/**
+ * ID of process for the process agent
+ */
+integer process_id = nil;
+
// local functions
@@ -97,11 +102,13 @@
}
/**
- * Starts the log reading command via background agent
+ * Starts the log reading command via process agent
* @param index integer the index of the log file
*/
define void InitLogReading (integer index) {
- SCR::Execute (.background.kill);
+ if (process_id != nil)
+ SCR::Execute (.process.kill, process_id);
+ process_id = nil;
map log_descr = Index2Descr (index);
integer max_lines = GetMaxLines (log_descr);
string command = (string) (log_descr["command"]:nil);
@@ -116,29 +123,38 @@
}
string grep = log_descr["grep"]:"";
if (grep != "" && grep != nil)
- grep = sformat ("| grep --line-buffered '%1'", grep);
+ grep = sformat ("| grep '%1'", grep);
string lc_command
= sformat ("cat %1 %2 | wc -l", log_descr["file"]:"", grep);
map bash_output = (map)SCR::Execute (.target.bash_output, lc_command);
- command = "tail -f -n +0 " + log_descr["file"]:"";
+ command = "tail -n +0 -f " + log_descr["file"]:"";
string addon = "";
+ integer lines_count = 0;
if (bash_output["exit"]:1 == 0)
{
string lc = bash_output["stdout"]:"";
lc = filterchars (lc, "1234567890");
- integer lines_count = tointeger (lc);
+ lines_count = tointeger (lc);
lines_count = lines_count - 2 * max_lines;
// don't know why without
// doubling it discards more lines, out of YaST2
// it works
+ if (lines_count < 0)
+ lines_count = 0;
if (max_lines != 0 && lines_count > 0)
addon = sformat ("| tail -n +%1", lines_count);
}
- command = sformat ("%1 %2 %3", command, grep, addon);
+ if (grep != "" && grep != nil)
+ command = sformat ("%1 %2 %3", command, grep, addon);
+ else if (addon != "")
+ command = sformat ("/usr/bin/tail -n +%2 -f %1", log_descr["file"]:"", lines_count);
+ else
+ command = sformat ("/usr/bin/tail -n +0 -f %1", log_descr["file"]:"");
}
- y2milestone ("Calling background agent with command %1", command);
- boolean cmdret = (boolean)SCR::Execute (.background.run_output, command);
- if (! cmdret)
+ y2milestone ("Calling process agent with command %1", command);
+
+ process_id = (integer)SCR::Execute (.process.start_shell, command);
+ if (process_id == nil)
{
// error report
Report::Error (_("Error occurred while reading the log."));
@@ -151,7 +167,9 @@
* @param key log widget key
*/
define void KillBackgroundProcess (string key) {
- SCR::Execute (.background.kill);
+ if (process_id != nil)
+ SCR::Execute (.process.kill, process_id);
+ process_id = nil;
}
/**
@@ -178,7 +196,7 @@
}
/**
- * Fills the log widget with initial data got from the background agent
+ * Fills the log widget with initial data got from the process agent
* @param index integer index of the log file
*/
define void FillWidgetWithData (integer index) {
@@ -186,11 +204,18 @@
map log = Index2Descr (index);
integer max_lines = GetMaxLines (log);
- integer count = (integer)SCR::Read (.background.newlines);
+ integer count = 0;
+ lines = [];
+ string line = (string)SCR::Read (.process.read_line, process_id);
+ while (line != nil)
+ {
+ count = count + 1;
+ lines = add (lines, line);
+ line = (string)SCR::Read (.process.read_line, process_id);
+ }
if (count > 0)
{
- lines = (list<string>) SCR::Read (.background.newout);
lines = DeleteOldLines (lines, max_lines);
UI::ChangeWidget (`id (`_cwm_log), `Value,
mergestring (lines, "\n") + "\n");
@@ -501,11 +526,17 @@
param = CWM::GetProcessedWidget ();
map log = Index2Descr (current_index);
integer max_lines = GetMaxLines (log);
- integer count = (integer)SCR::Read (.background.newlines);
+ list<string> new_lines = [];
+ integer count = 0;
+ string line = (string)SCR::Read (.process.read_line, process_id);
+ while (line != nil)
+ {
+ count = count + 1;
+ new_lines = add (new_lines, line);
+ line = (string)SCR::Read (.process.read_line, process_id);
+ }
if (count > 0)
{
- list<string> new_lines = (list<string>)
- SCR::Read (.background.newout);
foreach (string l, new_lines, {
UI::ChangeWidget (`id (`_cwm_log), `LastLine, l + "\n");
});
@@ -534,7 +565,7 @@
func ();
if (mb_actions[iret, 2]:nil == true)
{
- SCR::Execute (.background.kill);
+ KillBackgroundProcess (nil);
UI::ChangeWidget (`id (`_cwm_log), `Value, "");
InitLogReading (current_index);
}
@@ -722,7 +753,9 @@
LogHandle ("", event);
}
}
- SCR::Execute (.background.kill);
+ if (process_id != nil)
+ SCR::Execute (.process.kill, process_id);
+ process_id = nil;
UI::CloseDialog ();
return;
}
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-2.16.46/library/modules/Version.ycp new/yast2-2.16.47/library/modules/Version.ycp
--- old/yast2-2.16.46/library/modules/Version.ycp 2008-04-04 17:04:18.000000000 +0200
+++ new/yast2-2.16.47/library/modules/Version.ycp 2008-04-09 16:22:24.000000000 +0200
@@ -20,7 +20,7 @@
/**
* Version of the yast2 package
*/
-global string yast2 = "2.16.46";
+global string yast2 = "2.16.47";
/* 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-2.16.46/library/network/agents/cfg_firewall2.scr new/yast2-2.16.47/library/network/agents/cfg_firewall2.scr
--- old/yast2-2.16.46/library/network/agents/cfg_firewall2.scr 2008-01-28 16:28:57.000000000 +0100
+++ new/yast2-2.16.47/library/network/agents/cfg_firewall2.scr 1970-01-01 01:00:00.000000000 +0100
@@ -1,50 +0,0 @@
-/**
- * File: cfg_firewall2.scr
- * Summary: Agent for reading/writing /etc/sysconfig/SuSEfirewall2
- * Author: Lukas Ocilka
- * Access: read / write
- *
- * Example:
- * Dir(.sysconfig.SuSEfirewall2)
- * (["FW_ROUTE", ...])
- **
- * Read(.sysconfig.SuSEfirewall2.FW_ROUTE)
- * ("yes")
- **
- * Write(.sysconfig.SuSEfirewall2.FW_ROUTE, "no")
- * (true)
- **
- * // Don't forget to write nil to sync the settings!
- * Write(.sysconfig.SuSEfirewall2, nil)
- *
- * $Id: cfg_firewall2.scr 43934 2008-01-28 09:29:23Z locilka $
- *
- * Read/Sets the values defined in /etc/sysconfig/SuSEfirewall2
- * in an easy manner.
- */
-.sysconfig.SuSEfirewall2
-
-`ag_ini(
- `IniAgent (
- "/etc/sysconfig/SuSEfirewall2",
- $[
- // do not join_multiline, "\n" are replaced with " " later
- "options" : [ "line_can_continue", "global_values", "comments_last", "flat", ],
- "comments": [ "^[ \t]*#.*$", "#.*", "^[ \t]*$", ],
- "params" : [
- $[
- "match" : [ "([a-zA-Z0-9_]+)[ \t]*=[ \t]*\"([^\"]*)\"", "%s=\"%s\"" ],
- "multiline" : [ "([a-zA-Z0-9_]+)[ \t]*=[ \t]*\"([^\"]*)", "([^\"]*)\"", ],
- ],
- // also single quotes, bnc#327565
- $[
- "match" : [ "([a-zA-Z0-9_]+)[ \t]*=[ \t]*'([^']*)'", "%s=\"%s\"" ],
- "multiline" : [ "([a-zA-Z0-9_]+)[ \t]*=[ \t]*'([^']*)", "([^\']*)'", ],
- ],
- $[
- "match" : [ "([a-zA-Z0-9_]+)[ \t]*=[ \t]*([^\"]*[^ \t\"]|)[ \t]*$", "%s=\"%s\"",],
- ],
- ],
- ]
- )
-)
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-2.16.46/library/network/agents/Makefile.am new/yast2-2.16.47/library/network/agents/Makefile.am
--- old/yast2-2.16.46/library/network/agents/Makefile.am 2007-05-18 10:43:12.000000000 +0200
+++ new/yast2-2.16.47/library/network/agents/Makefile.am 2008-04-09 14:57:09.000000000 +0200
@@ -2,7 +2,6 @@
# Makefile.am for network/ifcfg agent
#
-scrconf_DATA = network.scr \
- cfg_firewall2.scr
+scrconf_DATA = $(wildcard *.scr)
EXTRA_DIST = $(scrconf_DATA)
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-2.16.46/library/network/agents/sysconfig_SuSEfirewall2.scr new/yast2-2.16.47/library/network/agents/sysconfig_SuSEfirewall2.scr
--- old/yast2-2.16.46/library/network/agents/sysconfig_SuSEfirewall2.scr 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-2.16.47/library/network/agents/sysconfig_SuSEfirewall2.scr 2008-04-09 14:57:09.000000000 +0200
@@ -0,0 +1,50 @@
+/**
+ * File: cfg_firewall2.scr
+ * Summary: Agent for reading/writing /etc/sysconfig/SuSEfirewall2
+ * Author: Lukas Ocilka
+ * Access: read / write
+ *
+ * Example:
+ * Dir(.sysconfig.SuSEfirewall2)
+ * (["FW_ROUTE", ...])
+ **
+ * Read(.sysconfig.SuSEfirewall2.FW_ROUTE)
+ * ("yes")
+ **
+ * Write(.sysconfig.SuSEfirewall2.FW_ROUTE, "no")
+ * (true)
+ **
+ * // Don't forget to write nil to sync the settings!
+ * Write(.sysconfig.SuSEfirewall2, nil)
+ *
+ * $Id: sysconfig_SuSEfirewall2.scr 46270 2008-04-09 08:34:03Z locilka $
+ *
+ * Read/Sets the values defined in /etc/sysconfig/SuSEfirewall2
+ * in an easy manner.
+ */
+.sysconfig.SuSEfirewall2
+
+`ag_ini(
+ `IniAgent (
+ "/etc/sysconfig/SuSEfirewall2",
+ $[
+ // do not join_multiline, "\n" are replaced with " " later
+ "options" : [ "line_can_continue", "global_values", "comments_last", "flat", ],
+ "comments": [ "^[ \t]*#.*$", "#.*", "^[ \t]*$", ],
+ "params" : [
+ $[
+ "match" : [ "([a-zA-Z0-9_]+)[ \t]*=[ \t]*\"([^\"]*)\"", "%s=\"%s\"" ],
+ "multiline" : [ "([a-zA-Z0-9_]+)[ \t]*=[ \t]*\"([^\"]*)", "([^\"]*)\"", ],
+ ],
+ // also single quotes, bnc#327565
+ $[
+ "match" : [ "([a-zA-Z0-9_]+)[ \t]*=[ \t]*'([^']*)'", "%s=\"%s\"" ],
+ "multiline" : [ "([a-zA-Z0-9_]+)[ \t]*=[ \t]*'([^']*)", "([^\']*)'", ],
+ ],
+ $[
+ "match" : [ "([a-zA-Z0-9_]+)[ \t]*=[ \t]*([^\"]*[^ \t\"]|)[ \t]*$", "%s=\"%s\"",],
+ ],
+ ],
+ ]
+ )
+)
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-2.16.46/library/network/src/PortRanges.ycp new/yast2-2.16.47/library/network/src/PortRanges.ycp
--- old/yast2-2.16.46/library/network/src/PortRanges.ycp 2007-05-18 10:43:12.000000000 +0200
+++ new/yast2-2.16.47/library/network/src/PortRanges.ycp 2008-04-09 16:21:59.000000000 +0200
@@ -98,13 +98,23 @@
*/
global boolean IsValidPortRange (string port_range) {
// not a port range
- if (! IsPortRange(port_range)) return false;
-
+ if (! IsPortRange(port_range)) {
+ string warning = sformat ("Not a port-range %1", port_range);
+ if (ReportOnlyOnce(warning)) y2milestone(warning);
+
+ return false;
+ }
+
integer min_pr = tointeger(regexpsub(port_range,"^([0123456789]+):.*$", "\\1"));
integer max_pr = tointeger(regexpsub(port_range,"^.*:([0123456789]+)$", "\\1"));
// couldn't extract two integers
- if (min_pr == nil && max_pr == nil) return false;
+ if (min_pr == nil && max_pr == nil) {
+ string warning = sformat ("Wrong port-range: '%1':'%2'", min_pr, max_pr);
+ if (ReportOnlyOnce(warning)) y2warning(warning);
+
+ return false;
+ }
// Checking the minimal port number in the port-range
// wrong range
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-2.16.46/library/network/src/SuSEFirewallExpertRules.ycp new/yast2-2.16.47/library/network/src/SuSEFirewallExpertRules.ycp
--- old/yast2-2.16.46/library/network/src/SuSEFirewallExpertRules.ycp 2007-07-02 15:15:31.000000000 +0200
+++ new/yast2-2.16.47/library/network/src/SuSEFirewallExpertRules.ycp 2008-04-09 16:21:59.000000000 +0200
@@ -42,7 +42,7 @@
}
// used to identify the IPv4 in regexp
- string type_ip4 = "[0123456789]\.[0123456789]\.[0123456789]\.[0123456789]";
+ string type_ip4 = "[0123456789]+\.[0123456789]+\.[0123456789]+\.[0123456789]+";
/**
* Returns whether the netmask bits are valid.
@@ -76,9 +76,9 @@
}
// A.B.C.D/1 - A.B.C.D/32 (IP with a numeric netmask)
- else if (regexpmatch(network, "^" + type_ip4 + "/[01234567890]$")) {
- string part_ip = regexpsub (network, "^(" + type_ip4 + ")/[01234567890]$", "\\1");
- string part_bits = regexpsub (network, "^" + type_ip4 + "(/[01234567890])$", "\\1");
+ else if (regexpmatch(network, "^" + type_ip4 + "/[01234567890]+$")) {
+ string part_ip = regexpsub (network, "^(" + type_ip4 + ")/[01234567890]+$", "\\1");
+ string part_bits = regexpsub (network, "^" + type_ip4 + "(/[01234567890])+$", "\\1");
return (IP::Check4(part_ip) && ValidNetmaskBits(tointeger(part_bits)));
}
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-2.16.46/library/network/src/SuSEFirewall.ycp new/yast2-2.16.47/library/network/src/SuSEFirewall.ycp
--- old/yast2-2.16.46/library/network/src/SuSEFirewall.ycp 2008-04-04 17:50:55.000000000 +0200
+++ new/yast2-2.16.47/library/network/src/SuSEFirewall.ycp 2008-04-09 16:21:59.000000000 +0200
@@ -129,6 +129,9 @@
"FW_ALLOW_FW_BROADCAST_EXT", "FW_ALLOW_FW_BROADCAST_INT", "FW_ALLOW_FW_BROADCAST_DMZ",
"FW_IGNORE_FW_BROADCAST_EXT", "FW_IGNORE_FW_BROADCAST_INT", "FW_IGNORE_FW_BROADCAST_DMZ",
+ // FATE #300970: Support for 'Samba & friends' browsing
+ "FW_SERVICES_ACCEPT_RELATED_EXT", "FW_SERVICES_ACCEPT_RELATED_INT", "FW_SERVICES_ACCEPT_RELATED_DMZ",
+
// logging
"FW_LOG_DROP_CRIT", "FW_LOG_DROP_ALL", "FW_LOG_ACCEPT_CRIT", "FW_LOG_ACCEPT_ALL",
@@ -147,6 +150,9 @@
"FW_CONFIGURATIONS_EXT", "FW_CONFIGURATIONS_INT", "FW_CONFIGURATIONS_DMZ",
];
+ // FATE #300970: Firewall support for SMB browsing
+ string broadcast_related_module = "nf_conntrack_netbios_ns";
+
# <!-- SuSEFirewall VARIABLES //-->
# <!-- SuSEFirewall GLOBAL FUNCTIONS USED BY LOCAL ONES //-->
@@ -2512,6 +2518,8 @@
return true;
}
+ void CheckKernelModules ();
+
/**
* Helper function for the backward compatibility.
* See WriteConfiguration(). Remove from code ASAP.
@@ -2527,6 +2535,7 @@
* @return boolean if succesfull
*/
global define boolean Write () {
+ CheckKernelModules();
// just disabled
if (! SuSEFirewallIsInstalled()) return true;
@@ -3200,6 +3209,53 @@
}
}
+ global list <string> GetServicesAcceptRelated (string zone) {
+ if (! IsKnownZone (zone)) {
+ y2error ("Uknown zone '%1'", zone);
+ return [];
+ }
+
+ return splitstring (SETTINGS["FW_SERVICES_ACCEPT_RELATED_" + zone]:"", " \t\n");
+ }
+
+ global void SetServicesAcceptRelated (string zone, list <string> ruleset) {
+ if (! IsKnownZone (zone)) {
+ y2error ("Uknown zone '%1'", zone);
+ return;
+ }
+
+ ruleset = filter (string one_rule, ruleset, {
+ return (one_rule != nil);
+ });
+
+ SetModified();
+
+ SETTINGS["FW_SERVICES_ACCEPT_RELATED_" + zone] = mergestring (ruleset, "\n");
+ }
+
+ void CheckKernelModules () {
+ boolean needs_additional_module = false;
+
+ foreach (string one_zone, GetKnownFirewallZones(), {
+ if (size (GetServicesAcceptRelated (one_zone)) >= 0) {
+ y2milestone ("Some ServicesAcceptRelated are defined");
+ needs_additional_module = true;
+ break;
+ }
+ });
+
+ if (needs_additional_module) {
+ list <string> k_modules = splitstring (SETTINGS["FW_LOAD_MODULES"]:"", " ");
+
+ if (! contains (k_modules, broadcast_related_module)) {
+ y2warning ("FW_LOAD_MODULES doesn't contain %1, adding", broadcast_related_module);
+ k_modules = add (k_modules, broadcast_related_module);
+ SETTINGS["FW_LOAD_MODULES"] = mergestring (k_modules, " ");
+ SetModified();
+ }
+ }
+ }
+
# <!-- SuSEFirewall GLOBAL FUNCTIONS //-->
/* 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-2.16.46/library/network/src/yast2-services-translations.ycp new/yast2-2.16.47/library/network/src/yast2-services-translations.ycp
--- old/yast2-2.16.46/library/network/src/yast2-services-translations.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-2.16.47/library/network/src/yast2-services-translations.ycp 2008-04-09 11:50:13.000000000 +0200
@@ -0,0 +1,268 @@
+{
+ /**
+ * This file contains only translations for
+ * FATE #300687: Ports for SuSEfirewall added via packages
+ *
+ * Translations are grabbed when 'make pot' is called.
+ */
+
+ textdomain "firewall-services";
+
+ string tmpstring = nil;
+
+ // TRANSLATORS: Name of Service (rpm: apache2), can be used as check box, item in multiple selection box...
+ tmpstring = _("Apache 2");
+
+ // TRANSLATORS: Description of a Service (rpm: apache2), used as a common label or an item in table
+ tmpstring = _("Opens ports for Apache Web Server.");
+
+ // TRANSLATORS: Name of Service (rpm: apache2-ssl), can be used as check box, item in multiple selection box...
+ tmpstring = _("Apache 2");
+
+ // TRANSLATORS: Description of a Service (rpm: apache2-ssl), used as a common label or an item in table
+ tmpstring = _("Opens ports for Apache Web Server.");
+
+ // TRANSLATORS: Name of Service (rpm: avahi), can be used as check box, item in multiple selection box...
+ tmpstring = _("Zeroconf/Bonjour Multicast DNS");
+
+ // TRANSLATORS: Description of a Service (rpm: avahi), used as a common label or an item in table
+ tmpstring = _("Zeroconf/Bonjour Multicast DNS (mDNS) ports for Service Discovery (DNS-SD)");
+
+ // TRANSLATORS: Description of a Service (rpm: bacula-dir), used as a common label or an item in table
+ tmpstring = _("Bacula Director ");
+
+ // TRANSLATORS: Description of a Service (rpm: bacula-fd), used as a common label or an item in table
+ tmpstring = _("Bacula File Daemon ");
+
+ // TRANSLATORS: Description of a Service (rpm: bacula-sd), used as a common label or an item in table
+ tmpstring = _("Bacula Storage Daemon ");
+
+ // TRANSLATORS: Name of Service (rpm: bind), can be used as check box, item in multiple selection box...
+ tmpstring = _("bind DNS server");
+
+ // TRANSLATORS: Description of a Service (rpm: bind), used as a common label or an item in table
+ tmpstring = _("Open ports for the bind DNS server");
+
+ // TRANSLATORS: Name of Service (rpm: courier-imap), can be used as check box, item in multiple selection box...
+ tmpstring = _("courier-imapd");
+
+ // TRANSLATORS: Description of a Service (rpm: courier-imap), used as a common label or an item in table
+ tmpstring = _("Opens ports for courier-imapd.");
+
+ // TRANSLATORS: Name of Service (rpm: courier-imap-ssl), can be used as check box, item in multiple selection box...
+ tmpstring = _("courier-imapd");
+
+ // TRANSLATORS: Description of a Service (rpm: courier-imap-ssl), used as a common label or an item in table
+ tmpstring = _("Opens ports for courier-imapd.");
+
+ // TRANSLATORS: Name of Service (rpm: cups), can be used as check box, item in multiple selection box...
+ tmpstring = _("cups");
+
+ // TRANSLATORS: Description of a Service (rpm: cups), used as a common label or an item in table
+ tmpstring = _("Firewall Configuration file for printing service CUPS");
+
+ // TRANSLATORS: Name of Service (rpm: cyrus-imapd), can be used as check box, item in multiple selection box...
+ tmpstring = _("cyrus-imapd Server");
+
+ // TRANSLATORS: Description of a Service (rpm: cyrus-imapd), used as a common label or an item in table
+ tmpstring = _("Opens ports for the cyrus-imapd Server.");
+
+ // TRANSLATORS: Name of Service (rpm: dhcp-server), can be used as check box, item in multiple selection box...
+ tmpstring = _("DHCP Server");
+
+ // TRANSLATORS: Description of a Service (rpm: dhcp-server), used as a common label or an item in table
+ tmpstring = _("Opens ports for ISC DHCP Server.");
+
+ // TRANSLATORS: Name of Service (rpm: dnsmasq-dhcp), can be used as check box, item in multiple selection box...
+ tmpstring = _("dnsmasq");
+
+ // TRANSLATORS: Description of a Service (rpm: dnsmasq-dhcp), used as a common label or an item in table
+ tmpstring = _("Open ports for the dnsmasq DNS/DHCP server");
+
+ // TRANSLATORS: Name of Service (rpm: dnsmasq-dns), can be used as check box, item in multiple selection box...
+ tmpstring = _("dnsmasq");
+
+ // TRANSLATORS: Description of a Service (rpm: dnsmasq-dns), used as a common label or an item in table
+ tmpstring = _("Open ports for the dnsmasq DNS/DHCP server");
+
+ // TRANSLATORS: Name of Service (rpm: finger-server), can be used as check box, item in multiple selection box...
+ tmpstring = _("Finger Server");
+
+ // TRANSLATORS: Description of a Service (rpm: finger-server), used as a common label or an item in table
+ tmpstring = _("Opens ports for Finger Server.");
+
+ // TRANSLATORS: Name of Service (rpm: iceccd), can be used as check box, item in multiple selection box...
+ tmpstring = _("icecream daemon");
+
+ // TRANSLATORS: Description of a Service (rpm: iceccd), used as a common label or an item in table
+ tmpstring = _("opens socket for the icecream compilation daemon");
+
+ // TRANSLATORS: Name of Service (rpm: icecream-scheduler), can be used as check box, item in multiple selection box...
+ tmpstring = _("icecream scheduler");
+
+ // TRANSLATORS: Description of a Service (rpm: icecream-scheduler), used as a common label or an item in table
+ tmpstring = _("opens ports for the Icecream scheduler");
+
+ // TRANSLATORS: Name of Service (rpm: imap), can be used as check box, item in multiple selection box...
+ tmpstring = _("imap Server");
+
+ // TRANSLATORS: Description of a Service (rpm: imap), used as a common label or an item in table
+ tmpstring = _("Opens ports for imap Server.");
+
+ // TRANSLATORS: Name of Service (rpm: iscsitarget), can be used as check box, item in multiple selection box...
+ tmpstring = _("iSCSI Target Daemon");
+
+ // TRANSLATORS: Description of a Service (rpm: iscsitarget), used as a common label or an item in table
+ tmpstring = _("Opens ports for iSCSI Target Daemon with broadcast allowed.");
+
+ // TRANSLATORS: Name of Service (rpm: isns), can be used as check box, item in multiple selection box...
+ tmpstring = _("iSNS Daemon");
+
+ // TRANSLATORS: Description of a Service (rpm: isns), used as a common label or an item in table
+ tmpstring = _("Opens ports for iSNS daemon with broadcast allowed.");
+
+ // TRANSLATORS: Name of Service (rpm: kadmind), can be used as check box, item in multiple selection box...
+ tmpstring = _("Kerberos Admin Server");
+
+ // TRANSLATORS: Description of a Service (rpm: kadmind), used as a common label or an item in table
+ tmpstring = _("Open ports for kadmind Server");
+
+ // TRANSLATORS: Name of Service (rpm: kdc), can be used as check box, item in multiple selection box...
+ tmpstring = _("Key Distribution Center");
+
+ // TRANSLATORS: Description of a Service (rpm: kdc), used as a common label or an item in table
+ tmpstring = _("Open ports for the Key Distribution Center");
+
+ // TRANSLATORS: Name of Service (rpm: lighttpd), can be used as check box, item in multiple selection box...
+ tmpstring = _("lighttpd");
+
+ // TRANSLATORS: Description of a Service (rpm: lighttpd), used as a common label or an item in table
+ tmpstring = _("Open the http port for lighttpd.");
+
+ // TRANSLATORS: Name of Service (rpm: lighttpd-ssl), can be used as check box, item in multiple selection box...
+ tmpstring = _("lighttpd");
+
+ // TRANSLATORS: Description of a Service (rpm: lighttpd-ssl), used as a common label or an item in table
+ tmpstring = _("Open the https port for lighttpd.");
+
+ // TRANSLATORS: Name of Service (rpm: mysql), can be used as check box, item in multiple selection box...
+ tmpstring = _("MySQL server");
+
+ // TRANSLATORS: Description of a Service (rpm: mysql), used as a common label or an item in table
+ tmpstring = _("opens ports for MySQL in order to allow other hosts connect to it");
+
+ // TRANSLATORS: Description of a Service (rpm: nfs-client), used as a common label or an item in table
+ tmpstring = _("Firewall Configuraion for nfs client. opens ports for foo in order to allow bar");
+
+ // TRANSLATORS: Description of a Service (rpm: nfs-kernel-server), used as a common label or an item in table
+ tmpstring = _("Firewall Configuraion for nfs kernel server. opens ports for foo in order to allow bar");
+
+ // TRANSLATORS: Name of Service (rpm: ntp), can be used as check box, item in multiple selection box...
+ tmpstring = _("xntp Server");
+
+ // TRANSLATORS: Description of a Service (rpm: ntp), used as a common label or an item in table
+ tmpstring = _("Opens ports for xntp.");
+
+ // TRANSLATORS: Name of Service (rpm: nut), can be used as check box, item in multiple selection box...
+ tmpstring = _("Network UPS Tools");
+
+ // TRANSLATORS: Description of a Service (rpm: nut), used as a common label or an item in table
+ tmpstring = _("Opens ports for remote UPS signalling for Network UPS Tools.");
+
+ // TRANSLATORS: Name of Service (rpm: openldap), can be used as check box, item in multiple selection box...
+ tmpstring = _("OpenLDAP Server");
+
+ // TRANSLATORS: Description of a Service (rpm: openldap), used as a common label or an item in table
+ tmpstring = _("Opens ports for the OpenLDAP Server (slapd).");
+
+ // TRANSLATORS: Description of a Service (rpm: postfix), used as a common label or an item in table
+ tmpstring = _("Firewall Configuration file for postfix");
+
+ // TRANSLATORS: Name of Service (rpm: postgresql), can be used as check box, item in multiple selection box...
+ tmpstring = _("PostgreSQL Server");
+
+ // TRANSLATORS: Description of a Service (rpm: postgresql), used as a common label or an item in table
+ tmpstring = _("Opens TCP port 5432 to allow remote connections to the PostgreSQL server.");
+
+ // TRANSLATORS: Name of Service (rpm: pure-ftpd), can be used as check box, item in multiple selection box...
+ tmpstring = _("pureftpd");
+
+ // TRANSLATORS: Description of a Service (rpm: pure-ftpd), used as a common label or an item in table
+ tmpstring = _("Opens ports for pureftpd with broadcast allowed.");
+
+ // TRANSLATORS: Description of a Service (rpm: sendmail), used as a common label or an item in table
+ tmpstring = _("Firewall Configuration file for postfix");
+
+ // TRANSLATORS: Name of Service (rpm: squid), can be used as check box, item in multiple selection box...
+ tmpstring = _("Squid Service");
+
+ // TRANSLATORS: Description of a Service (rpm: squid), used as a common label or an item in table
+ tmpstring = _("Opens ports for Squid");
+
+ // TRANSLATORS: Name of Service (rpm: sshd), can be used as check box, item in multiple selection box...
+ tmpstring = _("Secure Shell Server");
+
+ // TRANSLATORS: Description of a Service (rpm: sshd), used as a common label or an item in table
+ tmpstring = _("Open ports for Secure Shell Server");
+
+ // TRANSLATORS: Name of Service (rpm: svnserve), can be used as check box, item in multiple selection box...
+ tmpstring = _("svnserve");
+
+ // TRANSLATORS: Description of a Service (rpm: svnserve), used as a common label or an item in table
+ tmpstring = _("Open ports for svnserve");
+
+ // TRANSLATORS: Name of Service (rpm: talkd), can be used as check box, item in multiple selection box...
+ tmpstring = _("Talk Server");
+
+ // TRANSLATORS: Description of a Service (rpm: talkd), used as a common label or an item in table
+ tmpstring = _("Open ports for Talk Server");
+
+ // TRANSLATORS: Name of Service (rpm: telnet-server), can be used as check box, item in multiple selection box...
+ tmpstring = _("telnet-server Server");
+
+ // TRANSLATORS: Description of a Service (rpm: telnet-server), used as a common label or an item in table
+ tmpstring = _("Opens ports for telnet-server Server.");
+
+ // TRANSLATORS: Name of Service (rpm: tetrinet-server), can be used as check box, item in multiple selection box...
+ tmpstring = _("Tetrinet Server");
+
+ // TRANSLATORS: Description of a Service (rpm: tetrinet-server), used as a common label or an item in table
+ tmpstring = _("Opens ports in firewall to make possible to connect clients to your server. ");
+
+ // TRANSLATORS: Name of Service (rpm: vnc-httpd), can be used as check box, item in multiple selection box...
+ tmpstring = _("VNC mini-HTTP server");
+
+ // TRANSLATORS: Description of a Service (rpm: vnc-httpd), used as a common label or an item in table
+ tmpstring = _("Opens the VNC HTTP ports so that browsers can connect.");
+
+ // TRANSLATORS: Name of Service (rpm: vnc-server), can be used as check box, item in multiple selection box...
+ tmpstring = _("VNC");
+
+ // TRANSLATORS: Description of a Service (rpm: vnc-server), used as a common label or an item in table
+ tmpstring = _("Opens VNC server ports so that viewers can connect.");
+
+ // TRANSLATORS: Name of Service (rpm: vsftpd), can be used as check box, item in multiple selection box...
+ tmpstring = _("vsftpd Server");
+
+ // TRANSLATORS: Description of a Service (rpm: vsftpd), used as a common label or an item in table
+ tmpstring = _("Opens ports for vsftpd Server.");
+
+ // TRANSLATORS: Name of Service (rpm: xdmcp), can be used as check box, item in multiple selection box...
+ tmpstring = _("xdmcp");
+
+ // TRANSLATORS: Description of a Service (rpm: xdmcp), used as a common label or an item in table
+ tmpstring = _("allow other hosts to access your display manager via XDMCP");
+
+ // TRANSLATORS: Name of Service (rpm: ypbind), can be used as check box, item in multiple selection box...
+ tmpstring = _("NIS Client");
+
+ // TRANSLATORS: Description of a Service (rpm: ypbind), used as a common label or an item in table
+ tmpstring = _("The ypbind daemon binds NIS clients to an NIS domain");
+
+ // TRANSLATORS: Name of Service (rpm: ypserv), can be used as check box, item in multiple selection box...
+ tmpstring = _("NIS Server");
+
+ // TRANSLATORS: Description of a Service (rpm: ypserv), used as a common label or an item in table
+ tmpstring = _("Configuration for a NIS master/slave server");
+
+}
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-2.16.46/library/packages/src/PackageSystem.ycp new/yast2-2.16.47/library/packages/src/PackageSystem.ycp
--- old/yast2-2.16.46/library/packages/src/PackageSystem.ycp 2008-04-04 15:16:08.000000000 +0200
+++ new/yast2-2.16.47/library/packages/src/PackageSystem.ycp 2008-04-09 14:57:09.000000000 +0200
@@ -6,7 +6,7 @@
* Michal Svec
* Flags: Stable
*
- * $Id: PackageSystem.ycp 46095 2008-04-04 12:58:29Z jsrain $
+ * $Id: PackageSystem.ycp 46209 2008-04-08 10:16:29Z lslezak $
*
* The documentation is maintained at
* <a href="../index.html">.../docs/index.html</a>.
@@ -56,9 +56,8 @@
global void EnsureTargetInit() {
PackageLock::Check ();
PackageCallbacks::InitPackageCallbacks ();
- // target_initialized = target_initialized || Pkg::TargetInit ("/", false);
// always initizalize target, it should be cheap according to #45356
- Pkg::TargetInitialize ("/");
+ target_initialized = Pkg::TargetInit ("/", 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-2.16.46/library/system/src/Kernel.ycp new/yast2-2.16.47/library/system/src/Kernel.ycp
--- old/yast2-2.16.46/library/system/src/Kernel.ycp 2007-10-24 12:06:26.000000000 +0200
+++ new/yast2-2.16.47/library/system/src/Kernel.ycp 2008-04-09 14:57:10.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Klaus Kaempf
* Arvin Schnell
*
- * $Id: Kernel.ycp 41516 2007-10-23 06:14:05Z jsrain $
+ * $Id: Kernel.ycp 46213 2008-04-08 10:48:20Z lslezak $
*
* <ul>
* <li>determine kernel rpm</li>
@@ -356,19 +356,8 @@
}
else if (Arch::is_xen ())
{
- y2milestone ("ProbeKernel: XEN");
-
- // use xenpae kernel package if xenpae kernel is currently running
- boolean xenpae = false;
-
- map output = (map)SCR::Execute(.target.bash_output, "uname -r");
- if (output["exit"]:-1 == 0 && issubstring(output["stdout"]:"", "xenpae"))
- {
- xenpae = true;
- y2milestone("Running Xen PAE kernel detected");
- }
-
- kernel_packages = (xenpae) ? ["kernel-xenpae"] : ["kernel-xen"];
+ // kernel-xen contains PAE kernel (since oS11.0)
+ kernel_packages = ["kernel-xen"];
}
else if (Arch::i386 ())
{
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-2.16.46/VERSION new/yast2-2.16.47/VERSION
--- old/yast2-2.16.46/VERSION 2008-04-04 17:03:55.000000000 +0200
+++ new/yast2-2.16.47/VERSION 2008-04-09 15:48:24.000000000 +0200
@@ -1 +1 @@
-2.16.46
+2.16.47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org