Hello community, here is the log from the commit of package yast2 checked in at Thu Aug 14 03:17:19 CEST 2008. -------- --- yast2/yast2.changes 2008-08-08 13:19:33.000000000 +0200 +++ yast2/yast2.changes 2008-08-12 10:00:23.367186000 +0200 @@ -1,0 +2,13 @@ +Mon Aug 11 13:54:29 CEST 2008 - kmachalkova@suse.cz + +- Hostname::Current.*: Do not split FQDN into pieces if it is of the + form of IP address (bnc#415109) +- CWMFirewallInterfaces: widget-exists check added +- 2.17.11 + +------------------------------------------------------------------- +Mon Aug 11 12:42:18 CEST 2008 - locilka@suse.cz + +- Fixing PortAliases to recover from faulty data. + +------------------------------------------------------------------- Old: ---- yast2-2.17.10.tar.bz2 New: ---- yast2-2.17.11.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.M20068/_old 2008-08-14 03:16:25.000000000 +0200 +++ /var/tmp/diff_new_pack.M20068/_new 2008-08-14 03:16:25.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2 (Version 2.17.10) +# spec file for package yast2 (Version 2.17.11) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2 -Version: 2.17.10 +Version: 2.17.11 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-2.17.10.tar.bz2 +Source0: yast2-2.17.11.tar.bz2 Prefix: /usr Source1: yast2-rpmlintrc BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-perl-bindings yast2-testsuite @@ -148,7 +148,7 @@ Steffen Winterfeldt <snwint@suse.de> %prep -%setup -n yast2-2.17.10 +%setup -n yast2-2.17.11 %build %{prefix}/bin/y2tool y2autoconf @@ -251,8 +251,14 @@ %doc %{prefix}/share/doc/packages/yast2/system %doc %{prefix}/share/doc/packages/yast2/types %doc %{prefix}/share/doc/packages/yast2/wizard - %changelog +* Mon Aug 11 2008 kmachalkova@suse.cz +- Hostname::Current.*: Do not split FQDN into pieces if it is of the + form of IP address (bnc#415109) +- CWMFirewallInterfaces: widget-exists check added +- 2.17.11 +* Mon Aug 11 2008 locilka@suse.cz +- Fixing PortAliases to recover from faulty data. * Fri Aug 08 2008 locilka@suse.cz - Fixed the latest Progress patch to pass the testsuite. - 2.17.10 ++++++ yast2-2.17.10.tar.bz2 -> yast2-2.17.11.tar.bz2 ++++++ ++++ 4344 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.17.10/configure.in new/yast2-2.17.11/configure.in --- old/yast2-2.17.10/configure.in 2008-08-08 13:13:25.000000000 +0200 +++ new/yast2-2.17.11/configure.in 2008-04-10 15:10:03.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2 dnl -dnl -- This file is generated by y2autoconf 2.17.5 - 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.17.9, http://bugs.opensuse.org/, yast2) +AC_INIT(yast2, 2.16.48, 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.17.9" +VERSION="2.16.48" RPMNAME="yast2" MAINTAINER="Jiri Srain <jsrain@suse.cz>" @@ -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.17.10/COPYRIGHT.english new/yast2-2.17.11/COPYRIGHT.english --- old/yast2-2.17.10/COPYRIGHT.english 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-2.17.11/COPYRIGHT.english 2008-08-12 09:59:49.000000000 +0200 @@ -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. + + <one line to give the program's name and a brief idea of what it does.> + 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.17.10/library/modules/Version.ycp new/yast2-2.17.11/library/modules/Version.ycp --- old/yast2-2.17.10/library/modules/Version.ycp 2008-08-08 13:15:44.000000000 +0200 +++ new/yast2-2.17.11/library/modules/Version.ycp 2008-08-11 14:06:46.000000000 +0200 @@ -20,7 +20,7 @@ /** * Version of the yast2 package */ -global string yast2 = "2.17.10"; +global string yast2 = "2.17.11"; /* 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.17.10/library/network/src/CWMFirewallInterfaces.ycp new/yast2-2.17.11/library/network/src/CWMFirewallInterfaces.ycp --- old/yast2-2.17.10/library/network/src/CWMFirewallInterfaces.ycp 2008-07-08 11:34:31.000000000 +0200 +++ new/yast2-2.17.11/library/network/src/CWMFirewallInterfaces.ycp 2008-08-11 13:54:18.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Routines for selecting interfaces opened in firewall * Authors: Jiri Srain <jsrain@suse.cz> * - * $Id: CWMFirewallInterfaces.ycp 48909 2008-07-08 09:34:31Z locilka $ + * $Id: CWMFirewallInterfaces.ycp 49934 2008-08-11 11:52:49Z kmachalkova $ * * WARNING: If you want to use this functionality of this module * you should allways call 'SuSEFirewall::Read()' in the @@ -962,6 +962,17 @@ } /** + * Check whether the whole firewall widget ( open port checkbox + * and fw details button) exists + * @return boolean true if both widgets exist + */ +global boolean OpenFirewallWidgetExists() { + + return ( UI::WidgetExists (`id ("_cwm_open_firewall")) && + UI::WidgetExists (`id ("_cwm_firewall_details")) ); + +} +/** * Get the template for the help text to the firewall opening widget * @param restart_displayed shold be true if "Save and restart" is displayed * @return string help text template with %1 and %2 placeholders 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.17.10/library/network/src/PortAliases.ycp new/yast2-2.17.11/library/network/src/PortAliases.ycp --- old/yast2-2.17.10/library/network/src/PortAliases.ycp 2008-04-17 20:46:53.000000000 +0200 +++ new/yast2-2.17.11/library/network/src/PortAliases.ycp 2008-08-11 13:54:18.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Definition of Port Aliases. * Authors: Lukas Ocilka <locilka@suse.cz> * - * $Id: PortAliases.ycp 33164 2006-09-27 08:42:24Z jsrain $ + * $Id: PortAliases.ycp 49924 2008-08-11 10:43:54Z locilka $ * * Global Definition of Port Aliases for services taken from /etc/services. * /etc/services are defined by IANA http://www.iana.org/assignments/port-numbers. @@ -91,8 +91,11 @@ * @return boolean if allowed */ global define boolean IsAllowedPortName(string port_name) { + if (port_name == nil) { + y2error ("Invalid port name: %1", port_name); + return false; // port is number - if (regexpmatch(port_name, "^[0123456789]+$")) { + } else if (regexpmatch(port_name, "^[0123456789]+$")) { integer port_number = tointeger(port_name); // checking range return (port_number>=0 && port_number<=65535); @@ -189,13 +192,17 @@ if (regexpmatch(port, "^[0123456789]+$")) { port_number = tointeger(port); - service_aliases = (list<string>) union ( - service_aliases, - splitstring ( - SERVICE_PORT_TO_NAME[port_number]:LoadAndReturnPortToName(port_number), - " " - ) - ); + string sport_name = SERVICE_PORT_TO_NAME[port_number]:LoadAndReturnPortToName(port_number); + + if (sport_name != nil) { + service_aliases = (list<string>) union ( + service_aliases, + splitstring ( + sport_name, + " " + ) + ); + } // service is a port name, any space isn't allowed } else if (IsAllowedPortName(port)) { integer found_alias_port = SERVICE_NAME_TO_PORT[port]:LoadAndReturnNameToPort(port); 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.17.10/library/network/src/yast2-services-translations.ycp new/yast2-2.17.11/library/network/src/yast2-services-translations.ycp --- old/yast2-2.17.10/library/network/src/yast2-services-translations.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-2.17.11/library/network/src/yast2-services-translations.ycp 2008-08-11 13:54:18.000000000 +0200 @@ -0,0 +1,280 @@ +{ + /** + * 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 (File name: apache2, RPM: apache2), can be used as check box, item in multiple selection box... + tmpstring = _("Apache 2"); + + // TRANSLATORS: Description of a Service (File name: apache2, RPM: apache2), used as a common label or an item in table + tmpstring = _("Opens ports for Apache Web Server."); + + // TRANSLATORS: Name of Service (File name: apache2-ssl, RPM: apache2), can be used as check box, item in multiple selection box... + tmpstring = _("Apache 2"); + + // TRANSLATORS: Description of a Service (File name: apache2-ssl, RPM: apache2), used as a common label or an item in table + tmpstring = _("Opens ports for Apache Web Server."); + + // TRANSLATORS: Name of Service (File name: avahi, RPM: avahi), can be used as check box, item in multiple selection box... + tmpstring = _("Zeroconf/Bonjour Multicast DNS"); + + // TRANSLATORS: Description of a Service (File name: avahi, 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 (File name: bacula-dir, RPM: bacula-server), used as a common label or an item in table + tmpstring = _("Bacula Director "); + + // TRANSLATORS: Description of a Service (File name: bacula-fd, RPM: bacula), used as a common label or an item in table + tmpstring = _("Bacula File Daemon "); + + // TRANSLATORS: Description of a Service (File name: bacula-sd, RPM: bacula-server), used as a common label or an item in table + tmpstring = _("Bacula Storage Daemon "); + + // TRANSLATORS: Name of Service (File name: bind, RPM: bind ypbind), can be used as check box, item in multiple selection box... + tmpstring = _("bind DNS server"); + + // TRANSLATORS: Description of a Service (File name: bind, RPM: bind ypbind), used as a common label or an item in table + tmpstring = _("Open ports for the bind DNS server"); + + // TRANSLATORS: Name of Service (File name: courier-imap, RPM: courier-imap), can be used as check box, item in multiple selection box... + tmpstring = _("courier-imapd"); + + // TRANSLATORS: Description of a Service (File name: courier-imap, RPM: courier-imap), used as a common label or an item in table + tmpstring = _("Opens ports for courier-imapd."); + + // TRANSLATORS: Name of Service (File name: courier-imap-ssl, RPM: courier-imap), can be used as check box, item in multiple selection box... + tmpstring = _("courier-imapd"); + + // TRANSLATORS: Description of a Service (File name: courier-imap-ssl, RPM: courier-imap), used as a common label or an item in table + tmpstring = _("Opens ports for courier-imapd."); + + // TRANSLATORS: Name of Service (File name: cups, RPM: cups-libs), can be used as check box, item in multiple selection box... + tmpstring = _("cups"); + + // TRANSLATORS: Description of a Service (File name: cups, RPM: cups-libs), used as a common label or an item in table + tmpstring = _("Firewall Configuration file for printing service CUPS"); + + // TRANSLATORS: Name of Service (File name: cyrus-imapd, RPM: cyrus-imapd), can be used as check box, item in multiple selection box... + tmpstring = _("cyrus-imapd Server"); + + // TRANSLATORS: Description of a Service (File name: cyrus-imapd, 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 (File name: dhcp-server, RPM: dhcp), can be used as check box, item in multiple selection box... + tmpstring = _("DHCP Server"); + + // TRANSLATORS: Description of a Service (File name: dhcp-server, RPM: dhcp), used as a common label or an item in table + tmpstring = _("Opens ports for ISC DHCP Server."); + + // TRANSLATORS: Name of Service (File name: dnsmasq-dhcp, RPM: dnsmasq), can be used as check box, item in multiple selection box... + tmpstring = _("dnsmasq"); + + // TRANSLATORS: Description of a Service (File name: dnsmasq-dhcp, RPM: dnsmasq), used as a common label or an item in table + tmpstring = _("Open ports for the dnsmasq DNS/DHCP server"); + + // TRANSLATORS: Name of Service (File name: dnsmasq-dns, RPM: dnsmasq), can be used as check box, item in multiple selection box... + tmpstring = _("dnsmasq"); + + // TRANSLATORS: Description of a Service (File name: dnsmasq-dns, RPM: dnsmasq), used as a common label or an item in table + tmpstring = _("Open ports for the dnsmasq DNS/DHCP server"); + + // TRANSLATORS: Name of Service (File name: finger-server, RPM: finger-server), can be used as check box, item in multiple selection box... + tmpstring = _("Finger Server"); + + // TRANSLATORS: Description of a Service (File name: finger-server, RPM: finger-server), used as a common label or an item in table + tmpstring = _("Opens ports for Finger Server."); + + // TRANSLATORS: Name of Service (File name: iceccd, RPM: icecream), can be used as check box, item in multiple selection box... + tmpstring = _("icecream daemon"); + + // TRANSLATORS: Description of a Service (File name: iceccd, RPM: icecream), used as a common label or an item in table + tmpstring = _("opens socket for the icecream compilation daemon"); + + // TRANSLATORS: Name of Service (File name: icecream-scheduler, RPM: icecream), can be used as check box, item in multiple selection box... + tmpstring = _("icecream scheduler"); + + // TRANSLATORS: Description of a Service (File name: icecream-scheduler, RPM: icecream), used as a common label or an item in table + tmpstring = _("opens ports for the Icecream scheduler"); + + // TRANSLATORS: Name of Service (File name: imap, RPM: courier-imap imap-lib), can be used as check box, item in multiple selection box... + tmpstring = _("imap Server"); + + // TRANSLATORS: Description of a Service (File name: imap, RPM: courier-imap imap-lib), used as a common label or an item in table + tmpstring = _("Opens ports for imap Server."); + + // TRANSLATORS: Name of Service (File name: iscsitarget, RPM: tgt), can be used as check box, item in multiple selection box... + tmpstring = _("iSCSI Target Daemon"); + + // TRANSLATORS: Description of a Service (File name: iscsitarget, RPM: tgt), used as a common label or an item in table + tmpstring = _("Opens ports for iSCSI Target Daemon with broadcast allowed."); + + // TRANSLATORS: Name of Service (File name: isns, RPM: isns), can be used as check box, item in multiple selection box... + tmpstring = _("iSNS Daemon"); + + // TRANSLATORS: Description of a Service (File name: isns, 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 (File name: kadmind, RPM: krb5-server), can be used as check box, item in multiple selection box... + tmpstring = _("Kerberos Admin Server"); + + // TRANSLATORS: Description of a Service (File name: kadmind, RPM: krb5-server), used as a common label or an item in table + tmpstring = _("Open ports for kadmind Server"); + + // TRANSLATORS: Name of Service (File name: kdc, RPM: krb5-server), can be used as check box, item in multiple selection box... + tmpstring = _("Key Distribution Center"); + + // TRANSLATORS: Description of a Service (File name: kdc, RPM: krb5-server), used as a common label or an item in table + tmpstring = _("Open ports for the Key Distribution Center"); + + // TRANSLATORS: Name of Service (File name: lighttpd, RPM: lighttpd), can be used as check box, item in multiple selection box... + tmpstring = _("lighttpd"); + + // TRANSLATORS: Description of a Service (File name: lighttpd, RPM: lighttpd), used as a common label or an item in table + tmpstring = _("Open the http port for lighttpd."); + + // TRANSLATORS: Name of Service (File name: lighttpd-ssl, RPM: lighttpd), can be used as check box, item in multiple selection box... + tmpstring = _("lighttpd"); + + // TRANSLATORS: Description of a Service (File name: lighttpd-ssl, RPM: lighttpd), used as a common label or an item in table + tmpstring = _("Open the https port for lighttpd."); + + // TRANSLATORS: Name of Service (File name: mysql, RPM: mysql), can be used as check box, item in multiple selection box... + tmpstring = _("MySQL server"); + + // TRANSLATORS: Description of a Service (File name: mysql, 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 (File name: nfs-client, RPM: nfs-client), can be used as check box, item in multiple selection box... + tmpstring = _("NFS Client"); + + // TRANSLATORS: Description of a Service (File name: nfs-client, RPM: nfs-client), used as a common label or an item in table + tmpstring = _("Firewall Configuration for nfs client. opens ports for NFS client in order to allow to connect to a NFS server"); + + // TRANSLATORS: Name of Service (File name: nfs-kernel-server, RPM: nfs-kernel-server), can be used as check box, item in multiple selection box... + tmpstring = _("NFS Server Service"); + + // TRANSLATORS: Description of a Service (File name: nfs-kernel-server, RPM: nfs-kernel-server), used as a common label or an item in table + tmpstring = _("Firewall Configuration for nfs kernel server. opens ports for NFS in order to allow other hosts connect to it"); + + // TRANSLATORS: Name of Service (File name: ntp, RPM: ntp), can be used as check box, item in multiple selection box... + tmpstring = _("xntp Server"); + + // TRANSLATORS: Description of a Service (File name: ntp, RPM: ntp), used as a common label or an item in table + tmpstring = _("Opens ports for xntp."); + + // TRANSLATORS: Name of Service (File name: nut, RPM: nut-classic), can be used as check box, item in multiple selection box... + tmpstring = _("Network UPS Tools"); + + // TRANSLATORS: Description of a Service (File name: nut, RPM: nut-classic), 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 (File name: openldap, RPM: openldap2), can be used as check box, item in multiple selection box... + tmpstring = _("OpenLDAP Server"); + + // TRANSLATORS: Description of a Service (File name: openldap, RPM: openldap2), used as a common label or an item in table + tmpstring = _("Opens ports for the OpenLDAP Server (slapd)."); + + // TRANSLATORS: Description of a Service (File name: postfix, RPM: postfix), used as a common label or an item in table + tmpstring = _("Firewall Configuration file for postfix"); + + // TRANSLATORS: Name of Service (File name: postgresql, RPM: postgresql-server), can be used as check box, item in multiple selection box... + tmpstring = _("PostgreSQL Server"); + + // TRANSLATORS: Description of a Service (File name: postgresql, RPM: postgresql-server), 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 (File name: pure-ftpd, RPM: pure-ftpd), can be used as check box, item in multiple selection box... + tmpstring = _("pureftpd"); + + // TRANSLATORS: Description of a Service (File name: pure-ftpd, 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 (File name: sendmail, RPM: sendmail), used as a common label or an item in table + tmpstring = _("Firewall Configuration file for postfix"); + + // TRANSLATORS: Name of Service (File name: squid, RPM: yast2-squid), can be used as check box, item in multiple selection box... + tmpstring = _("Squid Service"); + + // TRANSLATORS: Description of a Service (File name: squid, RPM: yast2-squid), used as a common label or an item in table + tmpstring = _("Opens ports for Squid"); + + // TRANSLATORS: Name of Service (File name: sshd, RPM: openssh), can be used as check box, item in multiple selection box... + tmpstring = _("Secure Shell Server"); + + // TRANSLATORS: Description of a Service (File name: sshd, RPM: openssh), used as a common label or an item in table + tmpstring = _("Open ports for Secure Shell Server"); + + // TRANSLATORS: Name of Service (File name: svnserve, RPM: subversion), can be used as check box, item in multiple selection box... + tmpstring = _("svnserve"); + + // TRANSLATORS: Description of a Service (File name: svnserve, RPM: subversion), used as a common label or an item in table + tmpstring = _("Open ports for svnserve"); + + // TRANSLATORS: Name of Service (File name: talkd, RPM: talk-server), can be used as check box, item in multiple selection box... + tmpstring = _("Talk Server"); + + // TRANSLATORS: Description of a Service (File name: talkd, RPM: talk-server), used as a common label or an item in table + tmpstring = _("Open ports for Talk Server"); + + // TRANSLATORS: Name of Service (File name: telnet-server, RPM: telnet-server), can be used as check box, item in multiple selection box... + tmpstring = _("Telnet Server"); + + // TRANSLATORS: Description of a Service (File name: telnet-server, RPM: telnet-server), used as a common label or an item in table + tmpstring = _("Opens ports for Telnet Server."); + + // TRANSLATORS: Name of Service (File name: tetrinet-server, RPM: tetrinet-server), can be used as check box, item in multiple selection box... + tmpstring = _("Tetrinet Server"); + + // TRANSLATORS: Description of a Service (File name: tetrinet-server, 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 (File name: vnc-httpd, RPM: tightvnc), can be used as check box, item in multiple selection box... + tmpstring = _("VNC mini-HTTP server"); + + // TRANSLATORS: Description of a Service (File name: vnc-httpd, RPM: tightvnc), 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 (File name: vnc-server, RPM: tightvnc), can be used as check box, item in multiple selection box... + tmpstring = _("VNC"); + + // TRANSLATORS: Description of a Service (File name: vnc-server, RPM: tightvnc), used as a common label or an item in table + tmpstring = _("Opens VNC server ports so that viewers can connect."); + + // TRANSLATORS: Name of Service (File name: vsftpd, RPM: vsftpd), can be used as check box, item in multiple selection box... + tmpstring = _("vsftpd Server"); + + // TRANSLATORS: Description of a Service (File name: vsftpd, RPM: vsftpd), used as a common label or an item in table + tmpstring = _("Opens ports for vsftpd Server."); + + // TRANSLATORS: Name of Service (File name: xdmcp, RPM: xorg-x11), can be used as check box, item in multiple selection box... + tmpstring = _("xdmcp"); + + // TRANSLATORS: Description of a Service (File name: xdmcp, RPM: xorg-x11), used as a common label or an item in table + tmpstring = _("allow other hosts to access your display manager via XDMCP"); + + // TRANSLATORS: Name of Service (File name: xorg-x11-server, RPM: xorg-x11-Xvnc), can be used as check box, item in multiple selection box... + tmpstring = _("VNC Server"); + + // TRANSLATORS: Description of a Service (File name: xorg-x11-server, RPM: xorg-x11-Xvnc), used as a common label or an item in table + tmpstring = _("Opens ports for VNC Server"); + + // TRANSLATORS: Name of Service (File name: ypbind, RPM: ypbind), can be used as check box, item in multiple selection box... + tmpstring = _("NIS Client"); + + // TRANSLATORS: Description of a Service (File name: ypbind, 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 (File name: ypserv, RPM: ypserv), can be used as check box, item in multiple selection box... + tmpstring = _("NIS Server"); + + // TRANSLATORS: Description of a Service (File name: ypserv, 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.17.10/library/types/src/Hostname.ycp new/yast2-2.17.11/library/types/src/Hostname.ycp --- old/yast2-2.17.10/library/types/src/Hostname.ycp 2008-04-17 20:46:54.000000000 +0200 +++ new/yast2-2.17.11/library/types/src/Hostname.ycp 2008-08-11 13:54:19.000000000 +0200 @@ -5,7 +5,7 @@ * Authors: Michal Svec <msvec@suse.cz> * Flags: Stable * - * $Id: Hostname.ycp 46339 2008-04-10 11:49:42Z kmachalkova $ + * $Id: Hostname.ycp 49926 2008-08-11 11:05:00Z kmachalkova $ */ { @@ -161,12 +161,21 @@ string hostname = ""; string fqhostname = CurrentFQ(); - list <string> data = SplitFQ( fqhostname); + //current FQDN is IP address - it happens, esp. in inst-sys :) + //so let's not cut it into pieces (#415109) + if ( IP::Check( fqhostname ) ) + { + hostname = fqhostname; + } + else + { + list <string> data = SplitFQ( fqhostname); - if ( data != [] ) - hostname = data[0]:""; + if ( data != [] ) + hostname = data[0]:""; - y2debug("Current hostname: %1", hostname); + y2debug("Current hostname: %1", hostname); + } return hostname; } @@ -178,10 +187,15 @@ string domain = ""; string fqhostname = CurrentFQ(); - list <string> data = SplitFQ( fqhostname); + //the same as above, if FQDN is IP address + //let's claim domainname as empty (#415109) + if ( !IP::Check ( fqhostname ) ) + { + list <string> data = SplitFQ( fqhostname); - if ( data != [] && ( size( data ) > 1 ) ) - domain = data[1]:""; + if ( data != [] && ( size( data ) > 1 ) ) + domain = data[1]:""; + } y2debug("Current domainname: %1", domain); return domain; 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.17.10/Makefile.am new/yast2-2.17.11/Makefile.am --- old/yast2-2.17.10/Makefile.am 2008-08-08 13:13:25.000000000 +0200 +++ new/yast2-2.17.11/Makefile.am 2008-04-10 15:10:03.000000000 +0200 @@ -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.17.10/README new/yast2-2.17.11/README --- old/yast2-2.17.10/README 2008-08-08 13:20:08.000000000 +0200 +++ new/yast2-2.17.11/README 2008-08-12 09:59:49.000000000 +0200 @@ -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.17.10/VERSION new/yast2-2.17.11/VERSION --- old/yast2-2.17.10/VERSION 2008-08-08 13:15:13.000000000 +0200 +++ new/yast2-2.17.11/VERSION 2008-08-11 14:03:52.000000000 +0200 @@ -1 +1 @@ -2.17.10 +2.17.11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org