Hello community,
here is the log from the commit of package yast2
checked in at Fri May 4 17:39:14 CEST 2007.
--------
--- yast2/yast2.changes 2007-05-03 23:28:21.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2/yast2.changes 2007-05-04 16:46:32.000000000 +0200
@@ -1,0 +2,14 @@
+Fri May 4 15:28:26 CEST 2007 - locilka@suse.cz
+
+- Added new refresh-srv-def-by-pkgs-trans.sh script that creates
+ a YCP file containing translations for services defined by
+ packages (FATE #30068).
+- Added yast2-services-translations.ycp file with translations,
+ textdomain is "firewall-services".
+- Changed SuSEFirewallProposal to use new definition of services
+ instead the old one from SuSEFirewallServices.
+- Fixed BuildRequires (yast2-perl-bindings) after moving
+ Mail-related perl modules to yast2 package.
+- 2.15.32
+
+-------------------------------------------------------------------
@@ -4 +18,2 @@
-- Add new modul file MailAlias.ycp (269867 - build cycle between yast2-users and yast2-mail)
+- Add new module file MailAlias.ycp (269867 - build cycle between
+ yast2-users and yast2-mail)
Old:
----
yast2-2.15.31.tar.bz2
New:
----
yast2-2.15.32.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2.spec ++++++
--- /var/tmp/diff_new_pack.M32095/_old 2007-05-04 17:38:36.000000000 +0200
+++ /var/tmp/diff_new_pack.M32095/_new 2007-05-04 17:38:36.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2 (Version 2.15.31)
+# spec file for package yast2 (Version 2.15.32)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,14 +11,14 @@
# norootforbuild
Name: yast2
-Version: 2.15.31
+Version: 2.15.32
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-2.15.31.tar.bz2
+Source0: yast2-2.15.32.tar.bz2
prefix: /usr
-BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-pkg-bindings yast2-testsuite
+BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-perl-bindings yast2-pkg-bindings yast2-testsuite
# SCR::RegisterNewAgents()
Requires: yast2-core >= 2.15.4
# Pkg::CallbackAuthentication()
@@ -101,7 +101,7 @@
Steffen Winterfeldt
%prep
-%setup -n yast2-2.15.31
+%setup -n yast2-2.15.32
%build
%{prefix}/bin/y2tool y2autoconf
@@ -209,8 +209,20 @@
%doc %{prefix}/share/doc/packages/yast2/wizard
%changelog
+* Fri May 04 2007 - locilka@suse.cz
+- Added new refresh-srv-def-by-pkgs-trans.sh script that creates
+ a YCP file containing translations for services defined by
+ packages (FATE #30068).
+- Added yast2-services-translations.ycp file with translations,
+ textdomain is "firewall-services".
+- Changed SuSEFirewallProposal to use new definition of services
+ instead the old one from SuSEFirewallServices.
+- Fixed BuildRequires (yast2-perl-bindings) after moving
+ Mail-related perl modules to yast2 package.
+- 2.15.32
* Thu May 03 2007 - varkoly@suse.de
-- Add new modul file MailAlias.ycp (269867 - build cycle between yast2-users and yast2-mail)
+- Add new module file MailAlias.ycp (269867 - build cycle between
+ yast2-users and yast2-mail)
- 2.15.31
* Thu May 03 2007 - locilka@suse.cz
- Present more information to the user when calling a YaST client
++++++ yast2-2.15.31.tar.bz2 -> yast2-2.15.32.tar.bz2 ++++++
++++ 14293 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.15.31/configure.in new/yast2-2.15.32/configure.in
--- old/yast2-2.15.31/configure.in 2007-05-03 14:53:42.000000000 +0200
+++ new/yast2-2.15.32/configure.in 2007-05-04 16:35:23.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2
dnl
-dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2, 2.15.31, http://bugs.opensuse.org/, yast2)
+AC_INIT(yast2, 2.15.32, http://bugs.opensuse.org/, yast2)
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.31"
+VERSION="2.15.32"
RPMNAME="yast2"
MAINTAINER="Jiri Srain "
@@ -120,6 +120,8 @@
AC_MSG_ERROR(xgettext is missing; please install gettext-devel.)
fi
+Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools`
+AC_SUBST(Y2DEVTOOLS_PREFIX)
devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools`
devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools`
@@ -152,6 +154,9 @@
if test "$YCPC" = "false"; then
AC_MSG_ERROR([ycpc is not installed])
fi
+AC_CHECK_FILE($devtools_yast2dir/data/testsuite/Makefile.testsuite, [], [
+ AC_MSG_WARN([yast2-testsuite.rpm is not installed])
+])
dnl Check packages expect and dejagnu
AC_PATH_PROG(MYEXPECT, expect, 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.15.31/library/modules/MailTableInclude.pm new/yast2-2.15.32/library/modules/MailTableInclude.pm
--- old/yast2-2.15.31/library/modules/MailTableInclude.pm 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-2.15.32/library/modules/MailTableInclude.pm 2007-05-04 15:28:12.000000000 +0200
@@ -0,0 +1,243 @@
+#!/usr/bin/perl -w
+#
+# Author: Martin Vidner
+# $Id: MailTableInclude.pm 35036 2007-01-02 14:40:18Z mvidner $
+# to be included via "do 'MailTableInclude.pm'"
+
+
+use strict;
+
+# the including file must declare these
+our $filename;
+our $continue_escaped_newline;
+our $continue_leading_blanks;
+our $colon;
+
+use Errno qw(ENOENT);
+use YaST::YCP qw(:LOGGING);
+
+# Global variables:
+# The file specifies a map, but we represent it as a list to preserve
+# preceding comments and the order of entries.
+# list entries:
+# { "comment" => " foo\n bar\n", "key" => "root", "value" => "joe, \\root" }
+# that is, comments have the leading '#' stripped but not the newline.
+# Before the first entry, there can be a leading comment, separated by
+# a blank line.
+our $leading_comment;
+our @table;
+our $trailing_comment;
+
+# Parser features:
+
+my $modified = 0;
+my $linenum;
+my $line_comment;
+my $line = "";
+my $backslashed_line;
+
+my $separator;
+my $oseparator;
+
+my $debug = defined($ARGV[0]) && $ARGV[0] eq "-d";
+
+#
+# routine to log and return error
+#
+sub log_error ( $ ) {
+ my ($err_msg) = @_;
+ y2error ($err_msg);
+ return 0;
+}
+
+sub dumpit () {
+ print STDERR "line: '$line' line_comment: '$line_comment'\n";
+}
+
+# create a map entry after it has been composed of split lines
+sub parse_line ($)
+{
+ my $line = shift;
+
+ # is this the first line?
+ if ($line ne "")
+ {
+ if ($line =~ /^(.*?)$separator(.*)$/s)
+ {
+ push (@table, { "comment" => $line_comment,
+ "key" => $1,
+ "value" => $2 });
+ }
+ else
+ {
+ log_error ("No separator, $filename:$linenum '$line'");
+ }
+ }
+}
+
+#
+sub parse_file ()
+{
+ $linenum = 0;
+ $line = "";
+ $line_comment = "";
+ $backslashed_line = "";
+ my $leading_comment_allowed = 1;
+
+ $leading_comment = "";
+ @table = ();
+ $trailing_comment = "";
+
+ if (!open (FILE, $filename))
+ {
+ y2error ("$filename: $!") unless ($! == ENOENT);
+ # a missing file will be fixed by the module anyway
+ # and y2cc starts all agents :(
+ return;
+ }
+
+ while (<FILE>)
+ {
+ chomp; # \n
+ ++$linenum;
+ dumpit () if ($debug);
+
+ # Escaped newlines: merge them before any other processing.
+ # Is this one escaped?
+ if ($continue_escaped_newline && /\\$/)
+ {
+ print STDERR "$linenum:continued\n" if ($debug);
+ chop; # \\
+ $backslashed_line .= "$_ ";
+ next;
+ }
+ # Was there one already?
+ if ($backslashed_line ne "")
+ {
+ $_ = $backslashed_line . $_;
+ $backslashed_line = "";
+ }
+
+
+ # Accept comments
+ if (/^\#(.*)/)
+ {
+ print STDERR "$linenum:comment\n" if ($debug);
+ $trailing_comment .= "$1\n";
+ }
+ elsif (/^$/)
+ {
+ if ($leading_comment_allowed)
+ {
+ $leading_comment .= $trailing_comment;
+ $trailing_comment = "";
+ }
+ }
+ else
+ {
+ $leading_comment_allowed = 0;
+ # $line is the previous line, $_ is the current one
+ if (/^\s+(.*)/)
+ {
+ if ($continue_leading_blanks)
+ {
+ print STDERR "$linenum:leading blanks\n" if ($debug);
+ $line .= $_;
+ $line_comment .= $trailing_comment;
+ $trailing_comment = "";
+ }
+ else
+ {
+ log_error ("Leading whitespace, $filename:$linenum");
+ }
+ }
+ else
+ {
+ print STDERR "$linenum:regular\n" if ($debug);
+ # a regular line. process the _previous_ one
+ # because this one might continue
+
+ parse_line ($line);
+
+ # next buffer
+ $line = $_;
+ $line_comment = $trailing_comment;
+ $trailing_comment = "";
+ }
+ }
+ }
+ # end of file, but we must not forget to process the buffer!
+ parse_line ($line);
+ # only a comment: make it a leading one
+ if ($leading_comment_allowed)
+ {
+ $leading_comment .= $trailing_comment;
+ $trailing_comment = "";
+ }
+
+ close (FILE);
+}
+
+# take a multiline string and write it to FILE with a hash before each line
+sub write_comment ($)
+{
+ my $comment = shift;
+ foreach my $line (split /\n/, $comment)
+ {
+ print FILE "\#$line\n";
+ }
+}
+#
+sub write_file ()
+{
+ return 1 if (! $modified);
+
+ open (FILE, ">$filename.YaST2.new") or return log_error ("Creating file: $!");
+ if ($leading_comment)
+ {
+ write_comment ($leading_comment);
+ print FILE "\n";
+ }
+ foreach my $entry (@table)
+ {
+ write_comment ($entry->{"comment"});
+ print FILE $entry->{"key"}, $oseparator, $entry->{"value"}, "\n";
+ }
+ write_comment ($trailing_comment);
+ close (FILE);
+
+ if (-f $filename)
+ {
+ rename $filename, "$filename.YaST2.save" or return log_error ("Creating backup: $!");
+ }
+ rename "$filename.YaST2.new", $filename or return log_error ("Moving temp file: $!");
+
+ $modified = 0;
+ return 1;
+}
+
+# interface with MailTable.pm
+
+sub Read ()
+{
+ $separator = $colon ? qr/:\s+/ : qr/\s+/;
+ $oseparator = $colon ? ":\t" : "\t";
+
+ parse_file ();
+ $modified = 0;
+
+ return \@table;
+}
+
+sub Write ()
+{
+ my $value = shift;
+ @table = @{$value};
+ $modified = 1;
+ return 1;
+}
+
+sub Flush ()
+{
+ return write_file();
+}
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.15.31/library/modules/MailTable.pm new/yast2-2.15.32/library/modules/MailTable.pm
--- old/yast2-2.15.31/library/modules/MailTable.pm 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-2.15.32/library/modules/MailTable.pm 2007-05-04 15:28:12.000000000 +0200
@@ -0,0 +1,149 @@
+#!/usr/bin/perl -w
+#
+# Author: Martin Vidner
+# $Id: MailTable.pm 35039 2007-01-03 12:39:54Z mvidner $
+#
+# Accessing sendmail and postfix maps described in
+# makemap(8) and postmap(1)
+
+use strict;
+
+package MailTable;
+use YaST::YCP qw(:LOGGING);
+
+# type information for YCP
+our %TYPEINFO;
+
+my %modules =
+ (
+ "aliases" => "Aliases",
+ "postfix.sendercanonical" => "PostfixSenderCanonical",
+ "postfix.virtual" => "PostfixVirtual",
+ "sendmail.generics" => "SendmailGenerics",
+ "sendmail.virtuser" => "SendmailVirtuser",
+ );
+
+BEGIN {$TYPEINFO{Read} = ["function", ["list", ["map", "string", "any"]], "string kind"];}
+sub Read
+{
+ my $class = shift;
+ my $kind = shift;
+
+ if (!exists $modules{$kind}) {
+ y2internal ("No module defined for $kind");
+ return [];
+ }
+ no strict "refs";
+ return &{"MailTable::$modules{$kind}::Read"}();
+}
+
+
+BEGIN {$TYPEINFO{Write} = ["function", "boolean", "string kind", ["list", ["map", "any", "any"]]];}
+sub Write
+{
+ my $class = shift;
+ my $kind = shift;
+ my $value = shift;
+
+ if (!exists $modules{$kind}) {
+ y2internal ("No module defined for $kind");
+ return 0;
+ }
+ no strict "refs";
+ return &{"MailTable::$modules{$kind}::Write"}($value);
+}
+
+BEGIN {$TYPEINFO{Flush} = ["function", "boolean", "string kind"];}
+sub Flush
+{
+ my $class = shift;
+ my $kind = shift;
+
+ if (!exists $modules{$kind}) {
+ y2internal ("No module defined for $kind");
+ return 0;
+ }
+ no strict "refs";
+ return &{"MailTable::$modules{$kind}::Flush"}();
+}
+
+BEGIN {$TYPEINFO{FileName} = ["function", "string", "string kind"];}
+sub FileName
+{
+ my $class = shift;
+ my $kind = shift;
+
+ if (!exists $modules{$kind}) {
+ y2internal ("No module defined for $kind");
+ return "FIXME $kind";
+ }
+ no strict "refs";
+ return ${"MailTable::$modules{$kind}::filename"};
+}
+
+# For testing purposes only
+# Sets filename, returns previous one
+BEGIN {$TYPEINFO{SetFileName} = ["function", "string", "string kind", "string new"];}
+sub SetFileName
+{
+ my $class = shift;
+ my $kind = shift;
+ my $new = shift;
+
+ if (!exists $modules{$kind}) {
+ y2internal ("No module defined for $kind");
+ return "FIXME $kind";
+ }
+ no strict "refs";
+ my $fn_ref = "MailTable::$modules{$kind}::filename";
+ my $old = ${$fn_ref};
+ ${$fn_ref} = $new;
+ return $old;
+}
+
+package MailTable::Aliases;
+
+our $filename = "/etc/aliases";
+our $continue_escaped_newline = 1;
+our $continue_leading_blanks = 1;
+our $colon = 1;
+
+do 'MailTableInclude.pm';
+
+package MailTable::PostfixSenderCanonical;
+
+our $filename = "/etc/postfix/sender_canonical";
+our $continue_escaped_newline = 0;
+our $continue_leading_blanks = 1;
+our $colon = 0;
+
+do 'MailTableInclude.pm';
+
+package MailTable::PostfixVirtual;
+
+our $filename = "/etc/postfix/virtual";
+our $continue_escaped_newline = 0;
+our $continue_leading_blanks = 1;
+our $colon = 0;
+
+do 'MailTableInclude.pm';
+
+package MailTable::SendmailGenerics;
+
+our $filename = "/etc/mail/genericstable";
+our $continue_escaped_newline = 0;
+our $continue_leading_blanks = 0;
+our $colon = 0;
+
+do 'MailTableInclude.pm';
+
+package MailTable::SendmailVirtuser;
+
+our $filename = "/etc/mail/virtusertable";
+our $continue_escaped_newline = 0;
+our $continue_leading_blanks = 0;
+our $colon = 0;
+
+do 'MailTableInclude.pm';
+
+1;
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.15.31/library/modules/Makefile.am new/yast2-2.15.32/library/modules/Makefile.am
--- old/yast2-2.15.31/library/modules/Makefile.am 2007-01-09 11:34:46.000000000 +0100
+++ new/yast2-2.15.32/library/modules/Makefile.am 2007-05-04 16:32:13.000000000 +0200
@@ -2,7 +2,7 @@
SUBDIRS = . testsuite
-module_DATA = $(wildcard *.ycp) Version.ycp
+module_DATA = MailTableInclude.pm MailTable.pm $(wildcard *.ycp)
EXTRA_DIST = $(module_DATA) Version.ycp.in
YCPCFLAGS = -M ../types/src
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.15.31/library/modules/Version.ycp new/yast2-2.15.32/library/modules/Version.ycp
--- old/yast2-2.15.31/library/modules/Version.ycp 2007-05-03 14:54:04.000000000 +0200
+++ new/yast2-2.15.32/library/modules/Version.ycp 2007-05-04 16:35:40.000000000 +0200
@@ -20,7 +20,7 @@
/**
* Version of the yast2 package
*/
-global string yast2 = "2.15.31";
+global string yast2 = "2.15.32";
/* 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.15.31/library/network/src/SuSEFirewallProposal.ycp new/yast2-2.15.32/library/network/src/SuSEFirewallProposal.ycp
--- old/yast2-2.15.31/library/network/src/SuSEFirewallProposal.ycp 2007-05-02 08:31:35.000000000 +0200
+++ new/yast2-2.15.32/library/network/src/SuSEFirewallProposal.ycp 2007-05-04 16:08:04.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Functional interface for SuSEFirewall installation proposal
* Authors: Lukas Ocilka
*
- * $Id: SuSEFirewallProposal.ycp 37245 2007-04-02 09:10:55Z locilka $
+ * $Id: SuSEFirewallProposal.ycp 37840 2007-05-04 14:08:03Z locilka $
*
* This module provides a functional API for Installation proposal of SuSEfirewall2
*/
@@ -159,7 +159,7 @@
* function opens the service for the zone supporting that feature. If there
* are only dial-up interfaces, function opens the service for them.
*
- * @param string service such as "ssh" or "vnc"
+ * @param string service such as "service:sshd" or "service:xorg-x11-Xvnc"
*/
global define void OpenServiceOnNonDialUpInterfaces (string service) {
list <string> non_dial_up_interfaces = SuSEFirewall::GetAllNonDialUpInterfaces();
@@ -240,19 +240,19 @@
SetInterfacesToZone(non_dup_interfaces, "INT");
SetInterfacesToZone(dial_up_interfaces, "EXT");
if (ProductFeatures::GetBooleanFeature ("globals", "firewall_enable_ssh"))
- SuSEFirewall::SetServicesForZones(["ssh"], ["INT","EXT"], true);
+ SuSEFirewall::SetServicesForZones(["service:sshd"], ["INT","EXT"], true);
// has non-dial-up and doesn't have dial-up interfaces
} else if (size(non_dup_interfaces)>0 && size(dial_up_interfaces)==0) {
SetInterfacesToZone(non_dup_interfaces, "EXT");
if (ProductFeatures::GetBooleanFeature ("globals", "firewall_enable_ssh"))
- SuSEFirewall::SetServicesForZones(["ssh"], ["EXT"], true);
+ SuSEFirewall::SetServicesForZones(["service:sshd"], ["EXT"], true);
// doesn't have non-dial-up and has dial-up interfaces
} else if (size(non_dup_interfaces)==0 && size(dial_up_interfaces)>0) {
SetInterfacesToZone(dial_up_interfaces, "EXT");
if (ProductFeatures::GetBooleanFeature ("globals", "firewall_enable_ssh"))
- SuSEFirewall::SetServicesForZones(["ssh"], ["EXT"], true);
+ SuSEFirewall::SetServicesForZones(["service:sshd"], ["EXT"], true);
}
/*
@@ -265,11 +265,11 @@
*/
if (Linuxrc::vnc()) {
y2milestone("This is an installation over VNC, opening VNC on all non-dial-up interfaces...");
- OpenServiceOnNonDialUpInterfaces("vnc");
+ OpenServiceOnNonDialUpInterfaces("service:xorg-x11-Xvnc");
}
if (Linuxrc::usessh()) {
y2milestone("This is an installation over SSH, opening SSH on all non-dial-up interfaces...");
- OpenServiceOnNonDialUpInterfaces("ssh");
+ OpenServiceOnNonDialUpInterfaces("service:sshd");
}
/*
@@ -412,7 +412,7 @@
y2milestone("Zones used by firewall: %1", used_zones);
foreach (string zone, used_zones, {
- if (SuSEFirewall::IsServiceSupportedInZone ("ssh", zone)) {
+ if (SuSEFirewall::IsServiceSupportedInZone ("service:sshd", zone)) {
is_ssh_enabled = true;
}
});
@@ -431,7 +431,7 @@
// and ssh is enabled there
} else if (
SuSEFirewall::IsAnyNetworkInterfaceSupported() &&
- SuSEFirewall::IsServiceSupportedInZone ("ssh", SuSEFirewall::special_all_interface_zone)
+ SuSEFirewall::IsServiceSupportedInZone ("service:sshd", SuSEFirewall::special_all_interface_zone)
) {
is_ssh_enabled = true;
// TRANSLATORS: Network proposal informative text with link around
@@ -452,7 +452,7 @@
boolean is_vnc_enabled = false;
if (size(known_interfaces)>0) {
foreach (string zone, SuSEFirewall::GetZonesOfInterfacesWithAnyFeatureSupported(known_interfaces), {
- if (SuSEFirewall::IsServiceSupportedInZone ("vnc", zone))
+ if (SuSEFirewall::IsServiceSupportedInZone ("service:xorg-x11-Xvnc", zone))
is_vnc_enabled = 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-2.15.31/library/network/src/SuSEFirewallServices.ycp new/yast2-2.15.32/library/network/src/SuSEFirewallServices.ycp
--- old/yast2-2.15.31/library/network/src/SuSEFirewallServices.ycp 2007-05-02 08:31:35.000000000 +0200
+++ new/yast2-2.15.32/library/network/src/SuSEFirewallServices.ycp 2007-05-04 16:08:04.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Definition of Supported Firewall Services and Port Aliases.
* Authors: Lukas Ocilka
*
- * $Id: SuSEFirewallServices.ycp 37457 2007-04-13 14:42:00Z locilka $
+ * $Id: SuSEFirewallServices.ycp 37840 2007-05-04 14:08:03Z locilka $
*
* Global Definition of Firewall Services
* Defined using TCP, UDP and RPC ports and IP protocols and Broadcast UDP
@@ -14,7 +14,7 @@
{
module "SuSEFirewallServices";
textdomain "base";
-
+
import "FileUtils";
//
@@ -57,6 +57,9 @@
string services_definitions_in = "/etc/sysconfig/SuSEfirewall2.d/services/";
+ // please, check it with configuration in refresh-srv-def-by-pkgs-trans.sh script
+ string fw_services_textdomain = "firewall-services";
+
// firewall needs restarting
boolean sfws_modified = false;
@@ -373,7 +376,8 @@
foreach (string metadata_feature, string metadata_key, known_metadata, {
definition = (string) SCR::Read (add(.firewall_service_metadata, metadata_feature));
if (definition == nil || definition == "") return;
- SERVICES[one_definition, metadata_key] = definition;
+ // call gettext to translate the metadata
+ SERVICES[one_definition, metadata_key] = dgettext (fw_services_textdomain, definition);
});
SCR::UnregisterAgent (.firewall_service_metadata);
@@ -381,8 +385,7 @@
y2error ("Cannot register agent for %1 (metadata)", filefullpath);
}
- // can be removed later
- y2milestone ("'%1' -> %2", filename, SERVICES[one_definition]:$[]);
+ y2debug ("'%1' -> %2", filename, SERVICES[one_definition]:$[]);
});
return 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-2.15.31/Makefile.am new/yast2-2.15.32/Makefile.am
--- old/yast2-2.15.31/Makefile.am 2007-05-03 14:53:42.000000000 +0200
+++ new/yast2-2.15.32/Makefile.am 2007-05-04 16:35:23.000000000 +0200
@@ -7,8 +7,7 @@
#
#where devtools are
-PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools)
-Y2TOOL = $(PREFIX)/bin/y2tool
+Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool
VERSION = $(shell cat $(srcdir)/VERSION)
RPMNAME = $(shell cat $(srcdir)/RPMNAME)
@@ -20,7 +19,7 @@
# do we do Makefile.am for devtools? It is a little special...
IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME))
-DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(PREFIX)/share/YaST2/data/devtools)
+DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools)
ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages
LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl)
@@ -34,7 +33,7 @@
AUTOMAKE_OPTIONS = foreign dist-bzip2
# where devtools instal m4 snippets
# argh, executed literally
-#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal
+#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal
ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal
Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common
@@ -67,7 +66,7 @@
# because the prerequisite is made here (not anymore!)
# and we don't want any paths in y2autoconf
# info '(autoconf)config.status Invocation'
-$(RPMNAME).pc: $(RPMNAME).pc.in
+$(RPMNAME).pc: $(RPMNAME).pc.in config.status
./config.status --file=$@:$<
if CREATE_PKGCONFIG_NOARCH
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.15.31/Makefile.am.common new/yast2-2.15.32/Makefile.am.common
--- old/yast2-2.15.31/Makefile.am.common 2007-05-03 14:53:42.000000000 +0200
+++ new/yast2-2.15.32/Makefile.am.common 2007-05-04 16:35:23.000000000 +0200
@@ -29,7 +29,19 @@
dist-hook: check-syntax
+CHECK_SYNTAX = true
check-syntax: $(client_DATA) $(ycpchook)
- if test "$(client_DATA)"; then $(bindir)/ycpc -qE -M. -I. $(YCPCFLAGS) $(filter %.ycp,$^) || exit 1; fi
+ @if test "$(client_DATA)"; then \
+ if $(CHECK_SYNTAX); then \
+ TO_CHECK="$(filter %.ycp,$^)"; \
+ echo "Checking syntax of $${TO_CHECK}"; \
+ if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \
+ echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \
+ exit 1; \
+ fi; \
+ else \
+ echo "Syntax check disabled"; \
+ fi; \
+ fi
-include .dep
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.15.31/VERSION new/yast2-2.15.32/VERSION
--- old/yast2-2.15.31/VERSION 2007-05-03 14:44:01.000000000 +0200
+++ new/yast2-2.15.32/VERSION 2007-05-04 15:31:00.000000000 +0200
@@ -1 +1 @@
-2.15.31
+2.15.32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org