Hello community,
here is the log from the commit of package yast2
checked in at Fri Nov 23 17:16:26 CET 2007.
--------
--- yast2/yast2.changes 2007-11-16 11:13:02.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2/yast2.changes 2007-11-23 16:23:53.000000000 +0100
@@ -1,0 +2,29 @@
+Fri Nov 23 16:21:28 CET 2007 - mzugec@suse.cz
+
+- fixed URL module for "smb" type
+- 2.16.12
+
+-------------------------------------------------------------------
+Thu Nov 22 17:45:45 CET 2007 - locilka@suse.cz
+
+- Fixed URL.ycp documentation, added some examples.
+
+-------------------------------------------------------------------
+Wed Nov 21 15:36:03 CET 2007 - mzugec@suse.cz
+
+- title-style capitalization of GetDeviceType() (#223873)
+
+-------------------------------------------------------------------
+Tue Nov 20 10:50:24 CET 2007 - locilka@suse.cz
+
+- Added new Internet::ShutdownAllLocalDHCPClients function
+ for killing dhcpcd (#308577).
+
+-------------------------------------------------------------------
+Mon Nov 19 17:58:09 CET 2007 - kmachalkova@suse.cz
+
+- Initialize locale variables (UTF-8 or not) properly to prevent
+ displaying garbled characters in console (#335246) (thanks, mfabian
+ and werner)
+
+-------------------------------------------------------------------
Old:
----
yast2-2.16.11.tar.bz2
New:
----
yast2-2.16.12.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2.spec ++++++
--- /var/tmp/diff_new_pack.a25408/_old 2007-11-23 17:15:57.000000000 +0100
+++ /var/tmp/diff_new_pack.a25408/_new 2007-11-23 17:15:57.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2 (Version 2.16.11)
+# spec file for package yast2 (Version 2.16.12)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2
-Version: 2.16.11
+Version: 2.16.12
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-2.16.11.tar.bz2
+Source0: yast2-2.16.12.tar.bz2
Prefix: /usr
Source1: yast2-rpmlintrc
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-perl-bindings yast2-pkg-bindings yast2-testsuite
@@ -123,7 +123,7 @@
Steffen Winterfeldt
%prep
-%setup -n yast2-2.16.11
+%setup -n yast2-2.16.12
%build
%{prefix}/bin/y2tool y2autoconf
@@ -226,6 +226,20 @@
%doc %{prefix}/share/doc/packages/yast2/types
%doc %{prefix}/share/doc/packages/yast2/wizard
%changelog
+* Fri Nov 23 2007 - mzugec@suse.cz
+- fixed URL module for "smb" type
+- 2.16.12
+* Thu Nov 22 2007 - locilka@suse.cz
+- Fixed URL.ycp documentation, added some examples.
+* Wed Nov 21 2007 - mzugec@suse.cz
+- title-style capitalization of GetDeviceType() (#223873)
+* Tue Nov 20 2007 - locilka@suse.cz
+- Added new Internet::ShutdownAllLocalDHCPClients function
+ for killing dhcpcd (#308577).
+* Mon Nov 19 2007 - kmachalkova@suse.cz
+- Initialize locale variables (UTF-8 or not) properly to prevent
+ displaying garbled characters in console (#335246) (thanks, mfabian
+ and werner)
* Fri Nov 16 2007 - locilka@suse.cz
- SCR agent for any_XML has been moved from yast2-packager-2.16.5
to yast2-2.16.11 (#332187).
++++++ yast2-2.16.11.tar.bz2 -> yast2-2.16.12.tar.bz2 ++++++
++++ 4469 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.11/configure.in new/yast2-2.16.12/configure.in
--- old/yast2-2.16.11/configure.in 2007-11-16 11:15:28.000000000 +0100
+++ new/yast2-2.16.12/configure.in 2007-11-23 16:17:31.000000000 +0100
@@ -1,6 +1,6 @@
dnl configure.in for yast2
dnl
-dnl -- This file is generated by y2autoconf 2.16.2 - 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.11, http://bugs.opensuse.org/, yast2)
@@ -14,8 +14,7 @@
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.11"
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.11/COPYRIGHT.english new/yast2-2.16.12/COPYRIGHT.english
--- old/yast2-2.16.11/COPYRIGHT.english 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-2.16.12/COPYRIGHT.english 2007-11-23 16:23:04.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.11/library/control/src/WorkflowManager.ycp new/yast2-2.16.12/library/control/src/WorkflowManager.ycp
--- old/yast2-2.16.11/library/control/src/WorkflowManager.ycp 2007-10-11 14:48:47.000000000 +0200
+++ new/yast2-2.16.12/library/control/src/WorkflowManager.ycp 2007-11-23 16:16:32.000000000 +0100
@@ -79,7 +79,8 @@
* Returns list of additional inst_finish steps requested by
* additional workflows.
*
- * @param string which type of finish ("before_chroot", "after_chroot" or "before_umount")
+ * @param string which_steps (type) of finish ("before_chroot", "after_chroot" or "before_umount")
+ * @return list <string> steps to be called ...see which_steps parameter
*/
global list <string> GetAdditionalFinishSteps (string which_steps) {
if (which_steps == "before_chroot") {
@@ -300,6 +301,9 @@
string control_files_dir = "additional-control-files";
+ /**
+ * Returns the current (default) directory where workflows are stored in.
+ */
string GetWorkflowDirectory () {
return sformat ("%1/%2", Directory::tmpdir, control_files_dir);
}
@@ -310,6 +314,7 @@
*
* @param integer src_id with source ID
* @param string ident with pattern name (or another unique identification), empty for Add-Ons
+ * @return string path to a control file based on src_id and ident params
*/
string GenerateAdditionalControlFilePath (integer src_id, string ident) {
// special handling for Add-Ons (they have no special ident)
@@ -366,6 +371,7 @@
* @param type `addon or `pattern
* @param src_id with Source ID
* @param string name with unique identification
+ * @return string path to already cached workflow file, control file is downloaded if not yet chached
*/
string GetCachedWorkflowFilename (symbol type, integer src_id, string name) {
if (type == `addon) {
@@ -1134,6 +1140,8 @@
/**
* Returns whether some additional control files were added or removed
* from the last time MergeWorkflows() was called.
+ *
+ * @return boolen see description
*/
global boolean SomeWorkflowsWereChanged () {
return unmerged_changes;
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.11/library/modules/Version.ycp new/yast2-2.16.12/library/modules/Version.ycp
--- old/yast2-2.16.11/library/modules/Version.ycp 2007-11-16 11:15:41.000000000 +0100
+++ new/yast2-2.16.12/library/modules/Version.ycp 2007-11-23 16:22:29.000000000 +0100
@@ -20,7 +20,7 @@
/**
* Version of the yast2 package
*/
-global string yast2 = "2.16.11";
+global string yast2 = "2.16.12";
/* 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.11/library/network/src/Internet.ycp new/yast2-2.16.12/library/network/src/Internet.ycp
--- old/yast2-2.16.11/library/network/src/Internet.ycp 2007-11-02 15:35:22.000000000 +0100
+++ new/yast2-2.16.12/library/network/src/Internet.ycp 2007-11-21 15:26:04.000000000 +0100
@@ -5,7 +5,7 @@
* Authors: Michal Svec
* Arvin Schnell
*
- * $Id: Internet.ycp 41747 2007-11-02 14:35:21Z locilka $
+ * $Id: Internet.ycp 42201 2007-11-20 09:52:49Z locilka $
*/
{
@@ -196,5 +196,35 @@
SCR::Write(.sysconfig.network.providers, nil);
}
+/**
+ * DANGEROUS function. Searches for all standard PID files of dhcpcd,
+ * then kills all dhcpcds running (first SIGHUP, then SIGKILL).
+ * Works via WFM (only for local dhcpcd).
+ */
+global boolean ShutdownAllLocalDHCPClients () {
+ string pid_directory = "/var/run/";
+
+ list <string> dhcp_pidfiles = (list <string>) WFM::Read (.local.dir, pid_directory);
+ // only dhcpcd files
+ dhcp_pidfiles = filter (string one_pidfile, dhcp_pidfiles, {
+ return (regexpmatch (one_pidfile, "dhcpcd-.*\.pid"));
+ });
+
+ y2milestone ("DHCPCD uses these file under %1 directory: %2", pid_directory, dhcp_pidfiles);
+
+ if (size (dhcp_pidfiles) == 0) return true;
+
+ foreach (string one_pidfile, dhcp_pidfiles, {
+ string process_ID = (string) WFM::Read (.local.string, sformat ("%1%2", pid_directory, one_pidfile));
+ y2milestone ("Killing process ID: %1", process_ID);
+
+ // Calls a correct kill command for SIGHUP and waits
+ // Then a confirmation SIGKILL is called (should be ignored because process has hopefully already ended)
+ WFM::Execute (.local.bash, sformat ("(kill -1 %1 && sleep 1); kill -9 %1 2>/dev/null;", process_ID));
+ });
+
+ return true;
+}
+
/* 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.11/library/network/src/NetworkDevices.ycp new/yast2-2.16.12/library/network/src/NetworkDevices.ycp
--- old/yast2-2.16.11/library/network/src/NetworkDevices.ycp 2007-11-08 10:02:25.000000000 +0100
+++ new/yast2-2.16.12/library/network/src/NetworkDevices.ycp 2007-11-21 15:38:03.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Interface manipulation (/etc/sysconfig/network/ifcfg-*)
* Authors: Michal Svec
*
- * $Id: NetworkDevices.ycp 41867 2007-11-07 20:00:38Z mzugec $
+ * $Id: NetworkDevices.ycp 42282 2007-11-21 14:38:02Z mzugec $
*
* The new sysconfig naming is interface (eg. eth0) vs. device
* (eg. NE2000 card), but historically yast has called them device
@@ -184,15 +184,15 @@
* Return device type in human readable form :-)
* @param dev device
* @return device type
- * @example GetDeviceType(eth-bus-pci-0000:01:07.0) -> "network card"
- * @example GetDeviceType(modem0) -> "modem"
+ * @example GetDeviceType(eth-bus-pci-0000:01:07.0) -> "Network Card"
+ * @example GetDeviceType(modem0) -> "Modem"
*/
global string GetDeviceType(string dev) {
if (regexpmatch(dev,"^" + DeviceRegex["netcard"]:"")) {
- return(_("network card"));
+ return(_("Network Card"));
}
else if (regexpmatch(dev,"^" + DeviceRegex["modem"]:"")) {
- return(_("modem"));
+ return(_("Modem"));
}
else if (regexpmatch(dev,"^" + DeviceRegex["isdn"]:"")) {
return(_("ISDN"));
@@ -200,7 +200,7 @@
else if (regexpmatch(dev,"^" + DeviceRegex["dsl"]:"")) {
return(_("DSL"));
}
- else return(_("unknown"));
+ else return(_("Unknown"));
}
/**
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.11/library/network/src/yast2-services-translations.ycp new/yast2-2.16.12/library/network/src/yast2-services-translations.ycp
--- old/yast2-2.16.11/library/network/src/yast2-services-translations.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-2.16.12/library/network/src/yast2-services-translations.ycp 2007-11-07 10:53:43.000000000 +0100
@@ -0,0 +1,226 @@
+{
+ /**
+ * 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: 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: 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: 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: xntp), can be used as check box, item in multiple selection box...
+ tmpstring = _("xntp Server");
+
+ // TRANSLATORS: Description of a Service (rpm: xntp), used as a common label or an item in table
+ tmpstring = _("Opens ports for xntp.");
+
+ // 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.11/library/types/src/URL.ycp new/yast2-2.16.12/library/types/src/URL.ycp
--- old/yast2-2.16.11/library/types/src/URL.ycp 2007-06-19 08:28:47.000000000 +0200
+++ new/yast2-2.16.12/library/types/src/URL.ycp 2007-11-23 16:22:15.000000000 +0100
@@ -6,7 +6,7 @@
* Anas Nashif
* Flags: Stable
*
- * $Id: URL.ycp 38509 2007-06-18 15:14:57Z jsrain $
+ * $Id: URL.ycp 42370 2007-11-23 15:22:14Z mzugec $
*/
{
@@ -85,10 +85,15 @@
];
/**
- * Escape reserved characters in string used as a part of URL (e.g. '%' => '%25', '@' => '%40'...)
+ * Escape reserved characters in string used as a part of URL (e.g. '%25' => '%', '%40' => '@'...)
*
* @param in input string to escape
- * @return string escaped string
+ * @param transformation map
+ * @return string unescaped string
+ *
+ * @example
+ * URL::UnEscapeString ("http%3a%2f%2fsome.nice.url%2f%3awith%3a%2f%24p#ci%26l%2fch%40rs%2f", URL::transform_map_passwd)
+ * -> http://some.nice.url/:with:/$p#ci&l/ch@rs/
*/
global string UnEscapeString(string in, map transform) {
@@ -116,7 +121,12 @@
* Escape reserved characters in string used as a part of URL (e.g. '%' => '%25', '@' => '%40'...)
*
* @param in input string to escape
+ * @param transformation map
* @return string escaped string
+ *
+ * @example
+ * URL::EscapeString ("http://some.nice.url/:with:/$p#ci&l/ch@rs/", URL::transform_map_passwd)
+ * -> http%3a%2f%2fsome.nice.url%2f%3awith%3a%2f%24p#ci%26l%2fch%40rs%2f
*/
global string EscapeString(string in, map transform) {
@@ -176,7 +186,6 @@
"(#(.*))?"
);
y2debug("rawtokens=%1", rawtokens);
-
map tokens = $[];
tokens["scheme"] = rawtokens[1]:"";
string pth = rawtokens[3]:"";
@@ -216,6 +225,16 @@
else
tokens["host"] = userpass[7]:"";
+ // some exceptions for samba scheme (there is optional extra option "domain")
+ if (tokens["scheme"]:""=="samba" || tokens["scheme"]:""=="smb"){
+ list<string> tmp_list = filter(string row, splitstring(tokens["path"]:"", "/"), {return (size(row)>0);});
+ if (size(tmp_list)>1){
+ tokens["domain"] = tokens["host"]:"";
+ tokens["host"] = tmp_list[0]:"";
+ tokens["path"] = tmp_list[1]:"";
+ }
+ else tokens["path"] = deletechars(tokens["path"]:"", "/");
+ }
y2debug("tokens=%1", tokens);
return tokens;
}
@@ -271,16 +290,15 @@
* @see also perl-URI: URI(3)
*/
global define string Build (map tokens) ``{
-
string url = "";
string userpass = "";
if(regexpmatch(tokens["scheme"]:"", "^[[:alpha:]]*$"))
{
- url = tokens["scheme"]:"";
+ if (tokens["scheme"]:"" == "samba") url="smb";
+ else url = tokens["scheme"]:"";
}
y2debug("url: %1", url);
-
if (tokens["user"]:"" != "")
{
userpass = EscapeString(tokens["user"]:"", transform_map_passwd);
@@ -290,12 +308,15 @@
{
userpass = sformat("%1:%2", userpass, EscapeString(tokens["pass"]:"", transform_map_passwd) );
}
- if (size(userpass) > 0 )
- userpass = userpass + "@";
+ if (size(userpass) > 0 ) userpass = userpass + "@";
url = sformat("%1://%2", url, userpass);
y2debug("url: %1", url);
+ if (tokens["scheme"]:"" == "samba" && size(tokens["domain"]:"")>0 ){
+ url = sformat("%1%2/", url, tokens["domain"]:"");
+ }
+
if(Hostname::CheckFQ(tokens["host"]:"") || IP::Check(tokens["host"]:""))
{
url = sformat("%1%2", url, tokens["host"]:"");
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.11/Makefile.am new/yast2-2.16.12/Makefile.am
--- old/yast2-2.16.11/Makefile.am 2007-11-16 11:15:28.000000000 +0100
+++ new/yast2-2.16.12/Makefile.am 2007-11-23 16:17:32.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.11/README new/yast2-2.16.12/README
--- old/yast2-2.16.11/README 2007-11-16 11:24:58.000000000 +0100
+++ new/yast2-2.16.12/README 2007-11-23 16:23:04.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.11/scripts/yast2 new/yast2-2.16.12/scripts/yast2
--- old/yast2-2.16.11/scripts/yast2 2007-09-03 09:06:57.000000000 +0200
+++ new/yast2-2.16.12/scripts/yast2 2007-11-21 15:26:04.000000000 +0100
@@ -232,55 +232,99 @@
if [ "$SELECTED_GUI" = "ncurses" ]; then
if check_ncurses ; then
- TTY=`/usr/bin/tty`
+ TTY=$(/usr/bin/tty)
+ TTY=${TTY#/dev/}
+ case "$TTY" in
+ tty[0-9]|tty[0-9][0-9])
+ TTY=console
+ ;;
+ esac
+ UC_STARTED=no
+ UTF8STATUS=0
+ UTF8TESTED=no
+ if test -x /bin/testutf8 ; then
+ # binary /bin/testutf8 is missing at least on s390x, #158001
+ # return code of the /bin/testutf8 (more info in bug #179989)
+ # 0=stdin does not support utf8, 1=not utf8, 2=utf8
+ /bin/testutf8
+ UTF8STATUS=$?
+ UTF8TESTED=yes
+ fi
# on console, start yast in UTF-8 locale (only on a 'local' console)
- if [ "$TERM" = "linux" -a \( "$TTY" = /dev/console -o "$TTY" != "${TTY#/dev/tty[0-9]}" \) ] ; then
+ if test "$TERM" = "linux" -a "$TTY" = "console" ; then
case "$LANG" in
# if it is known that a language doesn't yet work well with ncurses
# on console use English instead:
ja*|ko*|zh*)
export LANG=en_US.UTF-8
export LC_CTYPE=en_US.UTF-8
+ export LC_ALL=en_US.UTF-8 # just to make sure.
;;
*)
- # get rid of encoding and/or modifier
- # but not for POSIX and C locale
- # (POSIX.UTF-8 doesn't make sense)
- if [ "$LANG" != "POSIX" ] && [ $LANG != "C" ]; then
- export LANG=${LANG%%[.@]*}.UTF-8
- fi
- export LC_CTYPE=${LC_CTYPE%%[.@]*}.UTF-8
+ # get rid of encoding and/or modifier from all the
+ # locale environment variables and add .UTF-8.
+ # But leave those which are empty or set to POSIX or C alone,
+ # POSIX.UTF-8, C.UTF-8, or .UTF-8 doesn't make sense (bug #285178).
+ for lc in LANG LC_CTYPE LC_NUMERIC LC_TIME \
+ LC_COLLATE LC_MONETARY LC_MESSAGES \
+ LC_PAPER LC_NAME LC_ADDRESS \
+ LC_TELEPHONE LC_MEASUREMENT \
+ LC_IDENTIFICATION LC_ALL
+ do
+ eval val="\$$lc"
+ if [ -n "$val" -a "$val" != "POSIX" -a "$val" != "C" ] ; then
+ eval $lc=\${val%%[.@]*}.UTF-8
+ eval export $lc
+ fi
+ done
+
;;
esac
- if /bin/testutf8 ; [ $? -eq 1 ] ; then
- /usr/bin/test -x /bin/unicode_start && /bin/unicode_start
- uc_started=1
+ if [ $UTF8TESTED = "yes" -a $UTF8STATUS -ne 2 -a -x /bin/unicode_start ] ; then
+ /bin/unicode_start
+ UC_STARTED=yes
fi
else
case "$TERM" in
- vt*|xterm*|linux|screen*)
- # probe terminal and fix lang settings
- UTF8TESTED=0
- # binary /bin/testutf8 is missing at least on s390x, #158001
- /usr/bin/test -x /bin/testutf8 && UTF8TESTED=1 && /bin/testutf8
- # return code of the /bin/testutf8 (more info in bug #179989)
- # 0=stdin does not support utf8, 1=not utf8, 2=utf8
-
- UTF8STATUS=$?
-
- # the terminal supports utf8, but it's not currently set
- # so strip .UTF-8 suffix from locale
- if [ "$UTF8TESTED" == "1" ] && [ $UTF8STATUS -eq 1 ] ; then
- /usr/bin/test -n "$LANG" && LANG=${LANG%.UTF-8}
- /usr/bin/test -n "$LC_CTYPE" && LC_CTYPE=${LC_CTYPE%.UTF-8}
- # the terminal supports utf8 and it is currently set
- # so strip any possible suffix from locale and append .UTF-8
- elif [ "$UTF8TESTED" == "1" ] && [ $UTF8STATUS -eq 2 ]; then
- #do not append .UTF-8 suffix to POSIX and C locale (#285178)
- if [ "$LANG" != "POSIX" ] && [ $LANG != "C" ]; then
- /usr/bin/test -n "$LANG" && LANG=${LANG%%[.@]*}.UTF-8
- fi
- /usr/bin/test -n "$LC_CTYPE" && LC_CTYPE=${LC_CTYPE%%[.@]*}.UTF-8
+ rxvt*|vt*|xterm*|linux|screen*)
+ # fix locale settings if they are not suitable for the
+ # terminal setting (UTF-8 or not)
+ # But should we really do this here? Isn't it user error
+ # if the locale settings are not suitable for the terminal
+ # used?
+
+ # the terminal is not in UTF-8 mode, strip .UTF-8 suffix
+ # from the locale variables:
+ if [ "$UTF8TESTED" == "yes" -a $UTF8STATUS -eq 1 ] ; then
+ for lc in LANG LC_CTYPE LC_NUMERIC LC_TIME \
+ LC_COLLATE LC_MONETARY LC_MESSAGES \
+ LC_PAPER LC_NAME LC_ADDRESS \
+ LC_TELEPHONE LC_MEASUREMENT \
+ LC_IDENTIFICATION LC_ALL
+ do
+ eval val="\$$lc"
+ if [ -n "$val" ] ; then
+ eval $lc=\${val%%.UTF-8}
+ eval export $lc
+ fi
+ done
+ # the terminal is in UTF-8 mode so strip any possible suffix from
+ # the locale variables and append .UTF-8.
+ # But leave those which are empty or set to POSIX or C alone,
+ # POSIX.UTF-8, C.UTF-8, or .UTF-8 doesn't make sense (bug #285178).
+ elif [ "$UTF8TESTED" == "yes" -a $UTF8STATUS -eq 2 ] ; then
+ for lc in LANG LC_CTYPE LC_NUMERIC LC_TIME \
+ LC_COLLATE LC_MONETARY LC_MESSAGES \
+ LC_PAPER LC_NAME LC_ADDRESS \
+ LC_TELEPHONE LC_MEASUREMENT \
+ LC_IDENTIFICATION LC_ALL
+ do
+ eval val="\$$lc"
+ if [ -n "$val" -a "$val" != "POSIX" -a "$val" != "C" ] ; then
+ eval $lc=\${val%%[.@]*}.UTF-8
+ eval export $lc
+ fi
+ done
fi
#default: do nothing, keep locale untouched
;;
@@ -321,8 +365,9 @@
fi
done
fi
- if [ "$uc_started" ] ; then
- /usr/bin/test -x /bin/unicode_stop && /bin/unicode_stop
+ if [ "$UC_STARTED" = "yes" -a -x /bin/unicode_stop ] ; then
+ /bin/unicode_stop
+ UC_STARTED=no
fi
else
rpm -V yast2-core yast2-ncurses yast2-qt yast2-gtk >&2
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.11/VERSION new/yast2-2.16.12/VERSION
--- old/yast2-2.16.11/VERSION 2007-11-16 10:58:09.000000000 +0100
+++ new/yast2-2.16.12/VERSION 2007-11-23 16:21:26.000000000 +0100
@@ -1 +1 @@
-2.16.11
+2.16.12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org