Hello community,
here is the log from the commit of package yast2
checked in at Thu Mar 27 23:30:57 CET 2008.
--------
--- yast2/yast2.changes 2008-03-18 13:24:55.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2/yast2.changes 2008-03-26 16:32:54.257734000 +0100
@@ -1,0 +2,18 @@
+Wed Mar 26 16:19:46 CET 2008 - jsuchome@suse.cz
+
+- added new anyxml agent, now using perl-XML-Simple library
+ (bnc #366867)
+- 2.16.40
+
+-------------------------------------------------------------------
+Wed Mar 19 17:22:30 CET 2008 - locilka@suse.cz
+
+- anyxml agent renamed to barexml (bnc #366867)
+- 2.16.39
+
+-------------------------------------------------------------------
+Wed Mar 19 15:36:55 CET 2008 - jsrain@suse.cz
+
+- fixed efika detection (bnc #369045)
+
+-------------------------------------------------------------------
Old:
----
yast2-2.16.38.tar.bz2
New:
----
yast2-2.16.40.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2.spec ++++++
--- /var/tmp/diff_new_pack.Hr3281/_old 2008-03-27 23:30:34.000000000 +0100
+++ /var/tmp/diff_new_pack.Hr3281/_new 2008-03-27 23:30:34.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2 (Version 2.16.38)
+# spec file for package yast2 (Version 2.16.40)
#
# 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.38
+Version: 2.16.40
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-2.16.38.tar.bz2
+Source0: yast2-2.16.40.tar.bz2
Prefix: /usr
Source1: yast2-rpmlintrc
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-perl-bindings yast2-testsuite
@@ -40,8 +40,10 @@
Requires: yast2-xml yast2-hardware-detection
# for SLPAPI.pm
Requires: yast2-perl-bindings
-# for ag_anyxml
+# for ag_barexml
Requires: perl-XML-Bare
+# for ag_anyxml
+Requires: perl-XML-Simple
# moved cfg_security.scr
Conflicts: yast2-security <= 2.13.2
# moved ag_netd, cfg_netd.scr, cfg_xinetd.scr
@@ -132,7 +134,7 @@
Steffen Winterfeldt
%prep
-%setup -n yast2-2.16.38
+%setup -n yast2-2.16.40
%build
%{prefix}/bin/y2tool y2autoconf
@@ -236,6 +238,15 @@
%doc %{prefix}/share/doc/packages/yast2/types
%doc %{prefix}/share/doc/packages/yast2/wizard
%changelog
+* Wed Mar 26 2008 jsuchome@suse.cz
+- added new anyxml agent, now using perl-XML-Simple library
+ (bnc #366867)
+- 2.16.40
+* Wed Mar 19 2008 locilka@suse.cz
+- anyxml agent renamed to barexml (bnc #366867)
+- 2.16.39
+* Wed Mar 19 2008 jsrain@suse.cz
+- fixed efika detection (bnc #369045)
* Tue Mar 18 2008 locilka@suse.cz
- Changed the default value for use-automatic-configuration in
ProductControl module, now it's false (Also because of AutoYaST).
++++++ yast2-2.16.38.tar.bz2 -> yast2-2.16.40.tar.bz2 ++++++
++++ 4881 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.38/configure.in new/yast2-2.16.40/configure.in
--- old/yast2-2.16.38/configure.in 2008-03-05 16:05:11.000000000 +0100
+++ new/yast2-2.16.40/configure.in 2007-12-07 11:18:01.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2
dnl
-dnl -- This file is generated by y2autoconf 2.16.3 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.15.9 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2, 2.16.31, http://bugs.opensuse.org/, yast2)
+AC_INIT(yast2, 2.16.16, http://bugs.opensuse.org/, yast2)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -14,11 +14,10 @@
AC_PREFIX_DEFAULT(/usr)
-dnl long filenames; we use GNU Make extensions and that's ok
-AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
+AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.16.31"
+VERSION="2.16.16"
RPMNAME="yast2"
MAINTAINER="Jiri Srain "
@@ -118,7 +117,7 @@
dnl no need for AC_ARG_VAR
AC_PATH_PROG(XGETTEXT, xgettext)
if test -z "$XGETTEXT" ; then
- AC_MSG_ERROR(xgettext is missing; please install gettext-tools.)
+ AC_MSG_ERROR(xgettext is missing; please install gettext-devel.)
fi
Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools`
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.38/COPYRIGHT.english new/yast2-2.16.40/COPYRIGHT.english
--- old/yast2-2.16.38/COPYRIGHT.english 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-2.16.40/COPYRIGHT.english 2008-03-26 16:20:59.000000000 +0100
@@ -0,0 +1,340 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General
+Public License instead of this License.
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.38/library/agents/ag_anyxml new/yast2-2.16.40/library/agents/ag_anyxml
--- old/yast2-2.16.38/library/agents/ag_anyxml 2007-11-16 10:42:09.000000000 +0100
+++ new/yast2-2.16.40/library/agents/ag_anyxml 2008-03-25 15:08:13.000000000 +0100
@@ -1,20 +1,72 @@
#!/usr/bin/perl -w
#
-# Name: ag_xmlrepos
-# Authors: Lukas Ocilka
-# Summary: Agent for parsing any XML files
+# Name: ag_anyxml
+# Authors: Jiri Suchomel
+# Summary: Agent for reading and writing simple XML files using
+# XML::Simple. Write is supported, but see the limitations
+# at XML-Simple page (e.g. order of elements is lost in the
+# maps)
#
+# Example of usage:
+#
+# map config = (map)SCR::Read (.anyxml, file);
+#
+# Alternative way of reading is using the map as an argument. This way it is
+# possible to specify non-default read options in the "args" submap:
+#
+# map config = (map)SCR::Read (.anyxml, $[
+# "file" : "/tmp/in.xml",
+# "args" : $[
+# "ForceArray" : 0,
+# "KeepRoot" : 1
+# ]
+# ]);
+#
+# Writing with the default options:
+#
+# SCR::Write (.anyxml, $[
+# "file" : "/tmp/config.xml",
+# "xml" : config,
+# ]);
+#
+# Non-default write options could be used by passing extra submap with
+# "args" key in the write map:
+#
+# SCR::Write (.anyxml, $[ "file": "c.xml", "xml" : conf, "args: $[
+# "XMLDecl" : <?xml version="123456789"?>,
+# "RootName" : "test"
+# ]);
+#
+# See http://search.cpan.org/dist/XML-Simple/lib/XML/Simple.pm
+# for the description of the arguments.
+
use strict;
use lib "/usr/lib/YaST2/agents_non_y2";
use ycp;
-use XML::Bare;
+use XML::Simple;
while (<STDIN>) {
- my ($command, $path, $file) = ycp::ParseCommand ($_);
+ my ($command, $path, $arg) = ycp::ParseCommand ($_);
if ($command eq "Read") {
+
+ my $file = $arg;
+
+ # Default read arguments
+ my %in_args = (
+ ForceContent => 1,
+ ForceArray => 1,
+ KeepRoot => 1,
+ KeyAttr => [],
+ );
+ if (ref ($arg) eq "HASH") {
+ $file = $arg->{"file"};
+ if (defined $arg->{"args"} && ref ($arg->{"args"}) eq "HASH") {
+ %in_args = %{$arg->{"args"}};
+ }
+ }
if (! defined $file || $file eq "") {
y2error ("No file defined!");
ycp::Return (undef);
@@ -25,19 +77,53 @@
next;
}
- y2milestone ("Reading: '".$file."'");
- open (FILE, $file) || do {
- y2error ("Cannot open file ".$file.": ".$!);
- next;
- };
- my @lines = <FILE>;
- close FILE;
-
- my $xml = new XML::Bare ('text' => join ('', @lines));
- my $root = $xml->parse();
+ my $xml = new XML::Simple (%in_args);
+ my $root = $xml->XMLin ($file);
undef $xml;
ycp::Return ($root);
+ } elsif ($command eq "Write") {
+ if (ref ($arg) ne "HASH") {
+ y2error ("argument must be a hash");
+ ycp::Return ("false");
+ next;
+ }
+ my $file = $arg->{"file"};
+ if (! defined $file || $file eq "") {
+ y2error ("No file defined!");
+ ycp::Return ("false");
+ next;
+ }
+ my $content = $arg->{"xml"};
+ if (! defined $content || ref ($content) ne "HASH") {
+ y2error ("XML content not defined or not a hash");
+ ycp::Return ("false");
+ next;
+ }
+
+ my $o = open my $fh, "> $file";
+ if (!defined $o) {
+ y2error ("$file cannot be opened for writing!");
+ ycp::Return ("false");
+ next;
+ }
+
+ # Default write arguments
+ my %out_args = (
+ ForceContent => 1,
+ ForceArray => 1,
+ KeepRoot => 1,
+ KeyAttr => [],
+ XMLDecl => '<?xml version="1.0"?>'
+ );
+ if (defined $arg->{"args"} && ref ($arg->{"args"}) eq "HASH") {
+ %out_args = %{$arg->{"args"}};
+ }
+ my $xml = new XML::Simple (%out_args);
+ $xml->XMLout ($content, OutputFile => $fh);
+ close $fh;
+ undef $xml;
+ ycp::Return ("true");
} elsif ($command eq "result") {
exit 0;
} else {
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.38/library/agents/ag_barexml new/yast2-2.16.40/library/agents/ag_barexml
--- old/yast2-2.16.38/library/agents/ag_barexml 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-2.16.40/library/agents/ag_barexml 2008-03-25 08:34:34.000000000 +0100
@@ -0,0 +1,49 @@
+#!/usr/bin/perl -w
+
+#
+# Name: ag_barexml
+# Authors: Lukas Ocilka
+# Summary: Agent for parsing any XML files using XML::Bare.
+# Please, make sure it fits your needs before using it.
+# XML::Bare is a bit buggy when handling comments.
+#
+
+use strict;
+use lib "/usr/lib/YaST2/agents_non_y2";
+use ycp;
+use XML::Bare;
+
+while (<STDIN>) {
+ my ($command, $path, $file) = ycp::ParseCommand ($_);
+
+ if ($command eq "Read") {
+ if (! defined $file || $file eq "") {
+ y2error ("No file defined!");
+ ycp::Return (undef);
+ next;
+ } elsif (! -e $file) {
+ y2error ("File ".$file." doesn't exist!");
+ ycp::Return (undef);
+ next;
+ }
+
+ y2milestone ("Reading: '".$file."'");
+ open (FILE, $file) || do {
+ y2error ("Cannot open file ".$file.": ".$!);
+ next;
+ };
+ my @lines = <FILE>;
+ close FILE;
+
+ my $xml = new XML::Bare ('text' => join ('', @lines));
+ my $root = $xml->parse();
+ undef $xml;
+
+ ycp::Return ($root);
+ } elsif ($command eq "result") {
+ exit 0;
+ } else {
+ my $return_value = sprintf( "Unknown instruction %s", $command);
+ ycp::Return ($return_value);
+ }
+}
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.38/library/agents/anyxml.scr new/yast2-2.16.40/library/agents/anyxml.scr
--- old/yast2-2.16.38/library/agents/anyxml.scr 2007-11-16 10:41:51.000000000 +0100
+++ new/yast2-2.16.40/library/agents/anyxml.scr 1970-01-01 01:00:00.000000000 +0100
@@ -1,15 +0,0 @@
-/**
- * File: anyxml.scr
- *
- * Summary: Agent for reading any XML files
- *
- * Authors: Lukas Ocilka
- *
- * Example: SCR::Read (.anyxml, "/root/some_file.xml")
- *
- * $Id:$
- */
-
-.anyxml
-
-`ag_anyxml ()
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.38/library/agents/barexml.scr new/yast2-2.16.40/library/agents/barexml.scr
--- old/yast2-2.16.38/library/agents/barexml.scr 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-2.16.40/library/agents/barexml.scr 2008-03-25 08:34:34.000000000 +0100
@@ -0,0 +1,16 @@
+/**
+ * File: barexml.scr
+ *
+ * Summary: Agent for reading any XML files.
+ * It's buggy in case of comments in the XML file.
+ *
+ * Authors: Lukas Ocilka
+ *
+ * Example: SCR::Read (.barexml, "/root/some_file.xml")
+ *
+ * $Id:$
+ */
+
+.barexml
+
+`ag_barexml ()
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.38/library/agents/Makefile.am new/yast2-2.16.40/library/agents/Makefile.am
--- old/yast2-2.16.38/library/agents/Makefile.am 2007-11-16 11:05:38.000000000 +0100
+++ new/yast2-2.16.40/library/agents/Makefile.am 2008-03-25 10:10:26.000000000 +0100
@@ -1,8 +1,9 @@
# Makefile.am for yast2/library/agents
-# $Id: Makefile.am 42108 2007-11-16 10:05:37Z locilka $
+# $Id: Makefile.am 45624 2008-03-19 16:24:18Z locilka $
agent_SCRIPTS = \
ag_netd \
- ag_anyxml
+ ag_anyxml \
+ ag_barexml
scrconf_DATA = $(wildcard *.scr)
EXTRA_DIST = $(agent_SCRIPTS) $(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.38/library/control/src/ProductControl.ycp new/yast2-2.16.40/library/control/src/ProductControl.ycp
--- old/yast2-2.16.38/library/control/src/ProductControl.ycp 2008-03-18 13:25:15.000000000 +0100
+++ new/yast2-2.16.40/library/control/src/ProductControl.ycp 2008-03-25 08:34:33.000000000 +0100
@@ -7,7 +7,7 @@
* Jiri Srain
* Lukas Ocilka
*
- * $Id: ProductControl.ycp 45549 2008-03-18 12:25:14Z locilka $
+ * $Id: ProductControl.ycp 45601 2008-03-19 12:12:06Z locilka $
*/
{
textdomain "base";
@@ -554,6 +554,9 @@
return false;
});
+ // for debugging purposes
+ y2milestone ("Enabled: (%1) %2", size (modules), modules);
+
return (size (modules) > 0);
}
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.38/library/log/src/LogViewCore.ycp new/yast2-2.16.40/library/log/src/LogViewCore.ycp
--- old/yast2-2.16.38/library/log/src/LogViewCore.ycp 2008-03-18 12:56:22.000000000 +0100
+++ new/yast2-2.16.40/library/log/src/LogViewCore.ycp 2008-03-25 08:34:33.000000000 +0100
@@ -12,7 +12,6 @@
textdomain "base";
-
import "Report";
@@ -29,7 +28,7 @@
/**
- * data describing log: file, grep, command, max_lines etc.
+ * data describing log: widget, file, max_lines etc.
*/
map data = $[];
@@ -41,22 +40,56 @@
/**
+ * flag indicating if background process is (or should be) running
+ */
+ boolean is_running = false;
+
+
+ list<string> GetNewLines()
+ {
+ if (!is_running)
+ {
+ return [];
+ }
+
+ if (!(boolean) SCR::Read(.process.running, id))
+ {
+ is_running = false;
+ Report::Error(_("Error occurred while reading the log."));
+ return [];
+ }
+
+ list<string> new_lines = [];
+
+ while(true)
+ {
+ string line = (string) SCR::Read(.process.read_line, id);
+ if (line == nil)
+ break;
+
+ new_lines = add(new_lines, line);
+ }
+
+ return new_lines;
+ }
+
+
+ /**
* Remove unneeded items from a list of lines
* If max_lines is 0, then don't remove anything
*/
void DeleteOldLines()
{
integer max_lines = data["max_lines"]:max_lines_default;
-
if (max_lines == 0)
return;
- integer sl = size (lines);
+ integer sl = size(lines);
if (sl > max_lines)
{
- lines = filter (string l, lines, {
- sl = sl - 1;
- return sl < max_lines;
+ lines = filter(string l, lines, {
+ sl = sl - 1;
+ return sl < max_lines;
});
}
}
@@ -66,86 +99,47 @@
* Starts the log reading command via process agent.
*
* The LogView widget must exist when calling this function.
+ *
+ * Note: This function has less functionality than InitLogReading in LogView.ycp.
+ * The extra functionality was removed here since it was broken (bnc #371983).
*/
global void Start(map d)
{
data = d;
- lines = [];
- integer max_lines = data["max_lines"]:max_lines_default;
-
- string command = (string) data["command"]:nil;
- if (command == nil || command == "")
- {
- string file = data["file"]:"";
- if (file == nil || file == "")
- {
- // error report
- Report::Error (_("Error occurred while reading the log."));
- return;
- }
-
- string grep = data["grep"]:"";
- if (grep != "" && grep != nil)
- grep = sformat ("| grep --line-buffered '%1'", grep);
- string lc_command = sformat ("cat '%1' %2 | wc -l", data["file"]:"", grep);
- map bash_output = (map) SCR::Execute (.target.bash_output, lc_command);
- command = sformat("tail -f -n +0 '%1'", data["file"]:"");
- string addon = "";
- if (bash_output["exit"]:1 == 0)
- {
- string lc = bash_output["stdout"]:"";
- lc = filterchars (lc, "1234567890");
- integer 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 (max_lines != 0 && lines_count > 0)
- addon = sformat ("| tail -n +%1", lines_count);
- }
- command = sformat ("%1 %2 %3", command, grep, addon);
- }
-
- y2milestone ("Calling background process with command %1", command);
- id = (integer) SCR::Execute (.process.start_shell, command);
-
- sleep (100);
-
- while(true)
- {
- string line = (string) SCR::Read(.process.read_line, id);
- if (line == nil)
- break;
+ list<string> args = [ "--retry", "-n", sformat("%1", data["max_lines"]:max_lines_default),
+ "-f", data["file"]:"" ];
+ id = (integer) SCR::Execute (.process.start, "/usr/bin/tail", $[ "args" : args ]);
+ is_running = true;
+ y2debug("started tail with args %1", args);
- lines = add(lines, line);
- }
+ sleep(100);
+ lines = GetNewLines();
DeleteOldLines();
- UI::ChangeWidget(`id(data["widget"]:nil), `Value, mergestring (lines, "\n") + "\n");
+ UI::ChangeWidget(`id(data["widget"]:nil), `Value, mergestring(
+ maplist(string line, lines, { return line + "\n"; } ), ""));
}
global void Update()
{
- while(true)
+ list<string> new_lines = GetNewLines();
+ if (size(new_lines) > 0)
{
- string line = (string) SCR::Read(.process.read_line, id);
- if (line == nil)
- break;
+ lines = (list<string>) merge(lines, new_lines);
+ DeleteOldLines();
- lines = add(lines, line);
- UI::ChangeWidget(`id(data["widget"]:nil), `LastLine, line + "\n");
+ UI::ChangeWidget(`id(data["widget"]:nil), `LastLine, mergestring(
+ maplist(string line, new_lines, { return line + "\n"; } ), ""));
}
-
- DeleteOldLines();
}
global void Stop()
{
- SCR::Execute(.process.kill, id);
+ SCR::Execute(.process.release, id);
}
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.38/library/log/src/LogView.ycp new/yast2-2.16.40/library/log/src/LogView.ycp
--- old/yast2-2.16.38/library/log/src/LogView.ycp 2008-03-18 12:56:22.000000000 +0100
+++ new/yast2-2.16.40/library/log/src/LogView.ycp 2008-03-25 08:34:33.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Displaying a log with additional functionality
* Authors: Jiri Srain
*
- * $Id: LogView.ycp 45527 2008-03-17 13:32:04Z aschnell $
+ * $Id: LogView.ycp 45572 2008-03-18 19:33:31Z aschnell $
*
* All of these functions watch the log file and display
* added lines as the log grows.
@@ -24,7 +24,7 @@
* ]);
* </pre>
*
- * TODO: Use LogViewCore.ycp
+ * TODO: Use LogViewCore.ycp (but it has less functionality)
*/
{
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.38/library/modules/Arch.ycp new/yast2-2.16.40/library/modules/Arch.ycp
--- old/yast2-2.16.38/library/modules/Arch.ycp 2008-03-03 15:12:08.000000000 +0100
+++ new/yast2-2.16.40/library/modules/Arch.ycp 2008-03-25 08:34:35.000000000 +0100
@@ -5,7 +5,7 @@
* Authors: Klaus Kaempf
* Flags: Stable
*
- * $Id: Arch.ycp 45143 2008-02-29 16:28:24Z olh $
+ * $Id: Arch.ycp 45610 2008-03-19 14:37:54Z jsrain $
*/
{
@@ -246,12 +246,14 @@
_board_compatible = "CHRP";
}
// Pegasos has CHRP in /proc/cpuinfo and 'chrp' in /proc/device-tree/device_type
- if (board == "Pegasos2")
+ if (board == "Pegasos2"
+ || issubstring (tolower (device_type["stdout"]:""), "pegasos2"))
{
_board_compatible = "Pegasos";
}
// Efika has CHRP in /proc/cpuinfo and 'efika' in /proc/device-tree/device_type
- if (board == "efika")
+ if (issubstring (tolower (board), "efika")
+ || issubstring (tolower (device_type["stdout"]:""), "efika"))
{
_board_compatible = "Pegasos";
}
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.38/library/modules/Version.ycp new/yast2-2.16.40/library/modules/Version.ycp
--- old/yast2-2.16.38/library/modules/Version.ycp 2008-03-18 13:25:31.000000000 +0100
+++ new/yast2-2.16.40/library/modules/Version.ycp 2008-03-26 16:20:43.000000000 +0100
@@ -20,7 +20,7 @@
/**
* Version of the yast2 package
*/
-global string yast2 = "2.16.38";
+global string yast2 = "2.16.40";
/* 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.38/library/network/src/yast2-services-translations.ycp new/yast2-2.16.40/library/network/src/yast2-services-translations.ycp
--- old/yast2-2.16.38/library/network/src/yast2-services-translations.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-2.16.40/library/network/src/yast2-services-translations.ycp 2008-03-25 08:34:34.000000000 +0100
@@ -0,0 +1,256 @@
+{
+ /**
+ * 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: 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: 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.38/library/types/src/String.ycp new/yast2-2.16.40/library/types/src/String.ycp
--- old/yast2-2.16.38/library/types/src/String.ycp 2008-03-12 16:20:22.000000000 +0100
+++ new/yast2-2.16.40/library/types/src/String.ycp 2008-03-26 16:18:58.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: String manipulation routines
* Authors: Michal Svec
*
- * $Id: String.ycp 45340 2008-03-11 12:13:53Z lslezak $
+ * $Id: String.ycp 45745 2008-03-26 13:08:35Z mvidner $
*/
{
@@ -618,70 +618,70 @@
string cprint = cspace + cgraph;
/**
- * @return the 26 uppercase ASCII letters
+ * The 26 uppercase ASCII letters
*/
global string CUpper () {
return cupper;
}
/**
- * @return the 26 lowercase ASCII letters
+ * The 26 lowercase ASCII letters
*/
global string CLower () {
return clower;
}
/**
- * @return the 52 upper and lowercase ASCII letters
+ * The 52 upper and lowercase ASCII letters
*/
global string CAlpha () {
return calpha;
}
/**
- * @return 0123456789
+ * Digits: 0123456789
*/
global string CDigit () {
return cdigit;
}
/**
- * @return hexadecimal digits: 0123456789ABCDEFabcdef
+ * Hexadecimal digits: 0123456789ABCDEFabcdef
*/
global string CXdigit () {
return cxdigit;
}
/**
- * @return the 52 upper and lowercase ASCII letters and digits
+ * The 62 upper and lowercase ASCII letters and digits
*/
global string CAlnum () {
return calnum;
}
/**
- * @return the ASCII printable non-blank non-alphanumeric characters
+ * The ASCII printable non-blank non-alphanumeric characters
*/
global string CPunct () {
return cpunct;
}
/**
- * @return printable ASCII charcters except whitespace
+ * Printable ASCII charcters except whitespace, 33-126
*/
global string CGraph () {
return cgraph;
}
/**
- * @return ASCII whitespace
+ * ASCII whitespace: SPACE CR LF HT VT FF
*/
global string CSpace () {
return cspace;
}
/**
- * @return printable ASCII characters including whitespace
+ * Printable ASCII characters including whitespace
*/
global string CPrint () {
return cprint;
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.38/Makefile.am new/yast2-2.16.40/Makefile.am
--- old/yast2-2.16.38/Makefile.am 2008-03-05 16:05:11.000000000 +0100
+++ new/yast2-2.16.40/Makefile.am 2007-12-07 11:18:01.000000000 +0100
@@ -23,14 +23,13 @@
ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages
LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl)
-COPYRIGHT_files_gpl = README COPYING
+COPYRIGHT_files_gpl = README COPYING COPYRIGHT.english
COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \
COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish
extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl))
-# less strict; prefer bzip2
AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip
# where devtools instal m4 snippets
# argh, executed literally
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.38/README new/yast2-2.16.40/README
--- old/yast2-2.16.38/README 2008-03-18 13:26:32.000000000 +0100
+++ new/yast2-2.16.40/README 2008-03-26 16:20:59.000000000 +0100
@@ -1,2 +1,2 @@
This program/library is part of YaST2
-See the file COPYING for license terms
+See the file COPYRIGHT.english for license terms
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.38/VERSION new/yast2-2.16.40/VERSION
--- old/yast2-2.16.38/VERSION 2008-03-18 13:25:07.000000000 +0100
+++ new/yast2-2.16.40/VERSION 2008-03-26 16:20:26.000000000 +0100
@@ -1 +1 @@
-2.16.38
+2.16.40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org