October 2008 - openSUSE Commits - openSUSE Mailing Lists

commit yast2-ftp-server
by root＠Hilbert.suse.de 06 Oct '08

06 Oct '08

Hello community, here is the log from the commit of package yast2-ftp-server checked in at Mon Oct 6 15:56:24 CEST 2008. -------- --- yast2-ftp-server/yast2-ftp-server.changes 2008-06-27 19:04:24.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-ftp-server/yast2-ftp-server.changes 2008-09-30 18:22:29.000000000 +0200 @@ -2 +2,7 @@ -Fri Jun 27 10:44:22 CEST 2008 - juhliarik(a)suse.cz +Tue Sep 30 18:12:18 CEST 2008 - juhliarik(a)suse.cz + +- corrected typo in help text (bnc #407517) +- 2.17.1 + +------------------------------------------------------------------- +Thu Sep 11 08:27:00 CEST 2008 - jsrain(a)suse.cz @@ -3,0 +10,4 @@ +- merged texts from proofread + +------------------------------------------------------------------- +Fri Jun 27 10:44:22 CEST 2008 - juhliarik(a)suse.cz calling whatdependson for head-i586 Old: ---- yast2-ftp-server-2.17.0.tar.bz2 New: ---- yast2-ftp-server-2.17.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ftp-server.spec ++++++ --- /var/tmp/diff_new_pack.St2783/_old 2008-10-06 15:56:09.000000000 +0200 +++ /var/tmp/diff_new_pack.St2783/_new 2008-10-06 15:56:09.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package yast2-ftp-server (Version 2.17.0) +# spec file for package yast2-ftp-server (Version 2.17.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -12,12 +19,12 @@ Name: yast2-ftp-server -Version: 2.17.0 +Version: 2.17.1 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-ftp-server-2.17.0.tar.bz2 +Source0: yast2-ftp-server-2.17.1.tar.bz2 Prefix: /usr Requires: yast2 yast2-inetd BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-inetd yast2-testsuite @@ -35,7 +42,7 @@ Jozef Uhliarik <juhliarik(a)suse.cz> %prep -%setup -n yast2-ftp-server-2.17.0 +%setup -n yast2-ftp-server-2.17.1 %build %{prefix}/bin/y2tool y2autoconf @@ -71,6 +78,11 @@ %doc %{prefix}/share/doc/packages/yast2-ftp-server %changelog +* Tue Sep 30 2008 juhliarik(a)suse.cz +- corrected typo in help text (bnc #407517) +- 2.17.1 +* Thu Sep 11 2008 jsrain(a)suse.cz +- merged texts from proofread * Fri Jun 27 2008 juhliarik(a)suse.cz - added fix for using in dialog (bnc #398519) - 2.17.0 ++++++ yast2-ftp-server-2.17.0.tar.bz2 -> yast2-ftp-server-2.17.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ftp-server-2.17.0/configure new/yast2-ftp-server-2.17.1/configure --- old/yast2-ftp-server-2.17.0/configure 2008-06-27 10:41:57.000000000 +0200 +++ new/yast2-ftp-server-2.17.1/configure 2008-09-30 18:13:41.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for yast2-ftp-server 2.16.11. +# Generated by GNU Autoconf 2.61 for yast2-ftp-server 2.17.1. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -574,8 +574,8 @@ # Identity of this package. PACKAGE_NAME='yast2-ftp-server' PACKAGE_TARNAME='yast2-ftp-server' -PACKAGE_VERSION='2.16.11' -PACKAGE_STRING='yast2-ftp-server 2.16.11' +PACKAGE_VERSION='2.17.1' +PACKAGE_STRING='yast2-ftp-server 2.17.1' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1197,7 +1197,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-ftp-server 2.16.11 to adapt to many kinds of systems. +\`configure' configures yast2-ftp-server 2.17.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1268,7 +1268,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-ftp-server 2.16.11:";; + short | recursive ) echo "Configuration of yast2-ftp-server 2.17.1:";; esac cat <<\_ACEOF @@ -1346,7 +1346,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-ftp-server configure 2.16.11 +yast2-ftp-server configure 2.17.1 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1360,7 +1360,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-ftp-server $as_me 2.16.11, which was +It was created by yast2-ftp-server $as_me 2.17.1, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2181,7 +2181,7 @@ # Define the identity of the package. PACKAGE='yast2-ftp-server' - VERSION='2.16.11' + VERSION='2.17.1' cat >>confdefs.h <<_ACEOF @@ -2409,7 +2409,7 @@ -VERSION="2.16.11" +VERSION="2.17.1" RPMNAME="yast2-ftp-server" MAINTAINER="Jozef Uhliarik <juhliarik(a)suse.cz>" @@ -3304,7 +3304,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-ftp-server $as_me 2.16.11, which was +This file was extended by yast2-ftp-server $as_me 2.17.1, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3347,7 +3347,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-ftp-server config.status 2.16.11 +yast2-ftp-server config.status 2.17.1 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ftp-server-2.17.0/configure.in new/yast2-ftp-server-2.17.1/configure.in --- old/yast2-ftp-server-2.17.0/configure.in 2008-06-27 10:41:51.000000000 +0200 +++ new/yast2-ftp-server-2.17.1/configure.in 2008-09-30 18:13:32.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-ftp-server, 2.16.11, http://bugs.opensuse.org/, yast2-ftp-server) +AC_INIT(yast2-ftp-server, 2.17.1, http://bugs.opensuse.org/, yast2-ftp-server) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.16.11" +VERSION="2.17.1" RPMNAME="yast2-ftp-server" MAINTAINER="Jozef Uhliarik <juhliarik(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ftp-server-2.17.0/src/complex.ycp new/yast2-ftp-server-2.17.1/src/complex.ycp --- old/yast2-ftp-server-2.17.0/src/complex.ycp 2008-06-27 10:41:27.000000000 +0200 +++ new/yast2-ftp-server-2.17.1/src/complex.ycp 2008-09-18 10:42:27.000000000 +0200 @@ -82,7 +82,7 @@ `VBox( `Heading (_("No server package installed")), `Left(`Label(_("Please choose an ftp daemon."))), - `Left(`Label(_("Press Cancel to cancel the configuration of the ftp."))), + `Left(`Label(_("Press Cancel to cancel the configuration of the ftp."))), `Left(`RadioButton(`id(0), `opt(`notify), _("&vsftpd"), true)), `Left(`RadioButton(`id(1), `opt(`notify), _("&pure-ftpd"))), `HBox( diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ftp-server-2.17.0/src/ftp-server.ycp new/yast2-ftp-server-2.17.1/src/ftp-server.ycp --- old/yast2-ftp-server-2.17.0/src/ftp-server.ycp 2008-06-02 15:08:19.000000000 +0200 +++ new/yast2-ftp-server-2.17.1/src/ftp-server.ycp 2008-09-18 10:42:27.000000000 +0200 @@ -186,14 +186,14 @@ // access permissions for anonymous users CommandLine::PrintNoCR(_("Access Permissions for Anonymous: ")); if (FtpServer::EDIT_SETTINGS["AnonReadOnly"]:nil == "NO") { - CommandLine::PrintNoCR(_("Upload: enabled; ")); + CommandLine::PrintNoCR(_("Upload enabled; ")); } else { - CommandLine::PrintNoCR(_("Upload: disabled; ")); + CommandLine::PrintNoCR(_("Upload disabled; ")); } if (FtpServer::EDIT_SETTINGS["AnonCreatDirs"]:nil == "YES") { - CommandLine::Print(_("Create directories: enabled")); + CommandLine::Print(_("Create directories enabled")); } else { - CommandLine::Print(_("Create directories: disabled")); + CommandLine::Print(_("Create directories disabled")); } // welcome message vsftpd only @@ -826,7 +826,7 @@ "max_clients_ip" : $[ "handler" : FTPdCMDMaxClientsIP, // TRANSLATORS: CommandLine help - "help" : _("The maximum clients connected via IP"), + "help" : _("The maximum number of clients connected via IP"), "example" : [ "max_clients_ip set_max_clients=20", ], @@ -1029,7 +1029,7 @@ "set_idle_time":$[ "type" : "integer", // TRANSLATORS: CommandLine help - "help" : _("Maximal Idle Time (in minutes)."), + "help" : _("Maximum Idle Time (in minutes)."), ], @@ -1043,7 +1043,7 @@ "set_max_rate":$[ "type" : "integer", // TRANSLATORS: CommandLine help - "help" : _("The maximum rate for ftp users (KB/s)."), + "help" : _("The maximum data transfer rate for ftp users (KB/s)."), ], "anon_only": $[ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ftp-server-2.17.0/src/FtpServer.ycp new/yast2-ftp-server-2.17.1/src/FtpServer.ycp --- old/yast2-ftp-server-2.17.0/src/FtpServer.ycp 2008-06-02 15:08:19.000000000 +0200 +++ new/yast2-ftp-server-2.17.1/src/FtpServer.ycp 2008-09-18 10:42:27.000000000 +0200 @@ -880,7 +880,7 @@ if (CommandLine::YesNo()) vsftpd_edit = true; } else { - CommandLine::Error(_("You have installed both daemons. You have to run the configuration in interactive mode.")); + CommandLine::Error(_("You have installed both daemons. Therefore you have to run the configuration in interactive mode.")); return false; } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ftp-server-2.17.0/src/helps.ycp new/yast2-ftp-server-2.17.1/src/helps.ycp --- old/yast2-ftp-server-2.17.0/src/helps.ycp 2008-06-02 15:08:19.000000000 +0200 +++ new/yast2-ftp-server-2.17.1/src/helps.ycp 2008-09-30 18:10:15.000000000 +0200 @@ -106,7 +106,7 @@ /* general FTP dir for anonymous help 1/1 */ "FtpDirAnon": _("FTP Directory for Anonymous Users: Here you can specify a directory which is used for ftp anonymous users. -By pressing Browse you can select a directory from local filesystem. +By pressing Browse you can select a directory from the local filesystem. "), @@ -114,7 +114,7 @@ /* general FTP dir for authenticated help 1/1 */ "FtpDirLocal": _("FTP Directory for Authenticated Users: You can specify a directory which is used for ftp authenticated users. -By pressing Browse you can select a directory from local filesystem. +By pressing Browse you can select a directory from the local filesystem. "), @@ -165,14 +165,14 @@ "AnonAuthen": _("Enable/Disable Anonymous and Local Users Anonymous Only If enabled only anonymous logins are permitted. Authenticated Users Only If enabled only authenticated users are permitted. -Both If enabled authenticated users and anonymous are permitted. +Both If enabled authenticated users and anonymous users are permitted. "), /* authentication Enable Upload help 1/1 */ "EnableUpload": _("Enable Upload -If enabled ftp users can upload. Anonymous users need to allow - Anonymous Can Upload for enabling upload. +If enabled ftp users can upload. To allow anonymous users +to upload enable Anonymous Can Upload "), @@ -201,19 +201,21 @@ /* expert settings Enable Passive Mode help 1/1 */ "PassiveMode": _("Enable Passive Mode -If enabled ftp server allow passive mode for connection. +If enabled the ftp server will allow passive mode for connections. "), /* expert settings Min Port for Pas. Mode help 1/1 */ "PasMinPort":_("Min Port for Passive Mode -Minimal value for a port range for passive connection replies. This is used for protection by means of a firewall. +Minimum value for a port range for passive connection replies. +This is used for protection by means of a firewall. "), /* expert settings Max Port for Pas. Mode help 1/1 */ "PasMaxPort": _("Max Port for Pas. Mode -Maximal value for a port range for passive connection replies. This is used for protection by means of a firewall. +Maximum value for a port range for passive connection replies. + This is used for protection by means of a firewall. "), @@ -283,21 +285,20 @@ "), /* Ovreview dialog help 1/3 */ - "overview" : _("<big>FTP Server Configuration Overvie</big> + "overview" : _("<big>FTP Server Configuration Overview</big> Obtain an overview of the installed ftp servers. Additionally, edit their configurations. ") + /* Ovreview dialog help 2/3 */ _("<big>Adding a FTP Server</big> -Press Add to configure an ftp server. +Press Add to configure a ftp server. ") + /* Ovreview dialog help 3/3 */ _("<big>Editing or Deleting</big> -Choose an ftp server to change or remove. -Then press Edit or Delete, respectively. -"), +Choose a ftp server to change or remove. +Then press Edit or Delete, respectively.\n"), ]; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ftp-server-2.17.0/VERSION new/yast2-ftp-server-2.17.1/VERSION --- old/yast2-ftp-server-2.17.0/VERSION 2008-06-27 10:46:31.000000000 +0200 +++ new/yast2-ftp-server-2.17.1/VERSION 2008-09-30 18:13:15.000000000 +0200 @@ -1 +1 @@ -2.17.0 +2.17.1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-fingerprint-reader
by root＠Hilbert.suse.de 06 Oct '08

06 Oct '08

Hello community, here is the log from the commit of package yast2-fingerprint-reader checked in at Mon Oct 6 15:56:01 CEST 2008. -------- --- yast2-fingerprint-reader/yast2-fingerprint-reader.changes 2008-09-29 16:04:21.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-fingerprint-reader/yast2-fingerprint-reader.changes 2008-10-02 13:20:16.175060000 +0200 @@ -1,0 +2,6 @@ +Wed Oct 1 11:53:49 CEST 2008 - jsuchome(a)suse.cz + +- call _exit() to exit the child process, not exit() (bnc#430229) +- 2.17.3 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-fingerprint-reader-2.17.2.tar.bz2 New: ---- yast2-fingerprint-reader-2.17.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-fingerprint-reader.spec ++++++ --- /var/tmp/diff_new_pack.Nh1760/_old 2008-10-06 15:55:09.000000000 +0200 +++ /var/tmp/diff_new_pack.Nh1760/_new 2008-10-06 15:55:09.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-fingerprint-reader (Version 2.17.2) +# spec file for package yast2-fingerprint-reader (Version 2.17.3) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-fingerprint-reader -Version: 2.17.2 +Version: 2.17.3 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-fingerprint-reader-2.17.2.tar.bz2 +Source0: yast2-fingerprint-reader-2.17.3.tar.bz2 Prefix: /usr Requires: yast2 yast2-pam BuildRequires: libfprint-devel libfprint0 libusb-devel @@ -44,7 +44,7 @@ Jiri Suchomel <jsuchome(a)suse.cz> %prep -%setup -n yast2-fingerprint-reader-2.17.2 +%setup -n yast2-fingerprint-reader-2.17.3 %build %{prefix}/bin/y2tool y2autoconf @@ -80,6 +80,9 @@ %{_libdir}/YaST2/plugin/libpy2ag_fprint.* %doc %{prefix}/share/doc/packages/yast2-fingerprint-reader %changelog +* Wed Oct 01 2008 jsuchome(a)suse.cz +- call _exit() to exit the child process, not exit() (bnc#430229) +- 2.17.3 * Mon Sep 29 2008 jsuchome(a)suse.cz - check the values returned by agent (fp_enroll_finger_img) in YCP - 2.17.2 ++++++ yast2-fingerprint-reader-2.17.2.tar.bz2 -> yast2-fingerprint-reader-2.17.3.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-fingerprint-reader-2.17.2/agent-fprint/src/FPrintAgent.cc new/yast2-fingerprint-reader-2.17.3/agent-fprint/src/FPrintAgent.cc --- old/yast2-fingerprint-reader-2.17.2/agent-fprint/src/FPrintAgent.cc 2008-09-29 15:49:37.000000000 +0200 +++ new/yast2-fingerprint-reader-2.17.3/agent-fprint/src/FPrintAgent.cc 2008-10-02 13:06:41.000000000 +0200 @@ -11,9 +11,11 @@ #define PC(n) (path->component_str(n)) -#define INIT_FAILED 500 -#define SET_FILE_FAILED 600 -#define SET_CALLBACK_FAILED 700 +// error exit values of the child process +#define INIT_FAILED 200 +#define NO_DEVICES 201 +#define DEVICE_OPEN_FAILED 202 +#define ENROLL_FAILURE 255 /** @@ -44,20 +46,18 @@ void FPrintAPI::catch_sigterm (int sig_num) { instance().finalize (); - exit (256); + _exit (256); } // de-initialize finger print reader (must be called at the end!) void FPrintAPI::finalize () { - y2internal ("finalize"); if (instance().data != NULL) { fp_print_data_free (instance().data); instance().data = NULL; } fp_exit(); - y2internal ("finalized"); } FPrintAPI::FPrintAPI() @@ -73,80 +73,85 @@ * wrapper for fp_enroll_finger function; * - we need to take care of the errors and signals * @param file descriptor of the pipe - * @param path to the target bir file FIXME + * @param path to the temporary directory for storing fingerprints */ -int FPrintAPI::acquire (int write_fd, string bir_path) +int FPrintAPI::acquire (int write_fd, string dir_path) { + // catch the abort signal to make proper cleanup signal (15, catch_sigterm); -// FIXME move initialization to separate call, to differentiate betw.ret values - struct fp_print_data *enrolled_print = NULL; int r; - struct fp_dscv_dev *ddev; - struct fp_dscv_dev **discovered_devs; - struct fp_dev *dev; - - r = fp_init(); - if (r < 0) { - y2error("Failed to initialize libfprint\n"); - r = INIT_FAILED; - write (write_fd, &r, sizeof(int)); - return r; - } - discovered_devs = fp_discover_devs(); - if (!discovered_devs) { - y2error("Could not discover devices\n"); - instance().finalize (); - r = INIT_FAILED; - write (write_fd, &r, sizeof(int)); - return r; - } - - ddev = discovered_devs[0]; + struct fp_dscv_dev *ddev; + struct fp_dscv_dev **discovered_devs; + struct fp_dev *dev; + + r = fp_init(); + if (r < 0) { + y2error("Failed to initialize libfprint"); + r = INIT_FAILED; + write (write_fd, &r, sizeof(int)); + return r; + } + + discovered_devs = fp_discover_devs(); + if (!discovered_devs) { + y2error("Could not discover devices"); + instance().finalize (); + r = NO_DEVICES; + write (write_fd, &r, sizeof(int)); + return r; + } + ddev = discovered_devs[0]; - if (!ddev) { - y2error("No devices detected.\n"); - instance().finalize (); - r = INIT_FAILED; - write (write_fd, &r, sizeof(int)); - return r; - } + if (!ddev) { + y2error("No devices detected."); + instance().finalize (); + r = NO_DEVICES; + write (write_fd, &r, sizeof(int)); + return r; + } + /* struct fp_driver *drv; drv = fp_dscv_dev_get_driver(ddev); y2milestone ("Found device claimed by %s driver", fp_driver_get_full_name(drv)); + */ - dev = fp_dev_open(ddev); - fp_dscv_devs_free(discovered_devs); - if (!dev) { - y2error("Could not open device.\n"); - } + dev = fp_dev_open(ddev); + fp_dscv_devs_free(discovered_devs); + if (!dev) { + y2error("Could not open device."); + instance().finalize (); + r = DEVICE_OPEN_FAILED; + write (write_fd, &r, sizeof(int)); + return r; + } - y2milestone("Opened device. It's now time to enroll your finger.\n\n"); + y2milestone ("Device opened successfully."); + /* TODO how to pass the info about stages number to the parent? y2milestone ("You will need to successfully scan your finger %d times to " - "complete the process.\n", fp_dev_get_nr_enroll_stages (dev)); + "complete the process.", fp_dev_get_nr_enroll_stages (dev)); + */ do { sleep (1); - y2internal ("Scan your finger now."); - - // FIXME not possible, this is total number of stages - y2milestone ("remaining stages: %d", fp_dev_get_nr_enroll_stages(dev)); r = fp_enroll_finger (dev, &enrolled_print); + y2debug ("retval: %d", r); + if (r < 0) { y2error ("Enroll failed with error %d", r); instance().finalize (); signal (15, SIG_DFL); - return r; + return ENROLL_FAILURE; } -y2internal ("retval: %d", r); + if (write (write_fd, &r, sizeof (int)) == -1) y2error ("write to pipe failed: %d (%m)", errno); @@ -159,7 +164,7 @@ y2milestone("Enroll failed, something wen't wrong :("); instance().finalize (); signal (15, SIG_DFL); - return r; + return ENROLL_FAILURE; case FP_ENROLL_PASS: y2milestone("Enroll stage passed. Yay!"); break; @@ -179,12 +184,20 @@ } while (r != FP_ENROLL_COMPLETE); if (!enrolled_print) { - y2error ("Enroll complete but no print?\n"); + y2error ("Enroll complete but print is null"); + r = ENROLL_FAILURE; } else { + // set the HOME to temporary path we know from argument + setenv ("HOME", dir_path.c_str(), 1); data = enrolled_print; + int save_r = fp_print_data_save (data, RIGHT_INDEX); + if (save_r < 0) + { + y2error ("Data save failed with %d", r); + r = save_r; + } y2milestone ("Enrollment completed, exiting with %d", r); - // FIXME save enrolled_print now } instance().finalize (); @@ -235,7 +248,7 @@ } else if (retval == size) { if (state == INIT_FAILED || - state == SET_FILE_FAILED || state == SET_CALLBACK_FAILED) + state == NO_DEVICES || state == DEVICE_OPEN_FAILED) { y2warning ("some initialization failed (%d)...", state); return ret; @@ -381,7 +394,7 @@ } else { - y2error ("path to bir file is missing"); + y2error ("path to tmp directory is missing"); return ret; } if (pipe (data_pipe) == -1) { @@ -411,7 +424,7 @@ FPrintAPI::instance().acquire (data_pipe[1], path); y2milestone ("acquire done with state %d", state); close (data_pipe[1]); - exit (state); + _exit (state); } else // parent -> return { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-fingerprint-reader-2.17.2/src/users_plugin_fingerprint_reader.ycp new/yast2-fingerprint-reader-2.17.3/src/users_plugin_fingerprint_reader.ycp --- old/yast2-fingerprint-reader-2.17.2/src/users_plugin_fingerprint_reader.ycp 2008-09-29 15:49:37.000000000 +0200 +++ new/yast2-fingerprint-reader-2.17.3/src/users_plugin_fingerprint_reader.ycp 2008-10-02 13:06:41.000000000 +0200 @@ -12,7 +12,7 @@ * Authors: * Jiri Suchomel <jsuchome(a)suse.cz> * - * $Id: users_plugin_fingerprint_reader.ycp 51656 2008-09-29 13:50:29Z jsuchome $ + * $Id: users_plugin_fingerprint_reader.ycp 51759 2008-10-01 14:10:27Z jsuchome $ */ { @@ -60,7 +60,7 @@ y2error ("user name is empty!"); return `back; } - string bir_path = Directory::tmpdir + "/" + username + ".bir"; + string fingerprint_dir = Directory::tmpdir + "/" + username + "/"; term contents = `HBox (`HSpacing (1.5), `VBox( `VSpacing(0.5), @@ -117,7 +117,6 @@ } // helper function, form the string for UI from actuall data - // FIXME we don't know number of remaining swipes... void replace_swipe_string () { UI::ReplaceWidget (`id (`rpstatus), `Label ( @@ -134,61 +133,28 @@ } - if (SCR::Execute (.fprint.enroll, bir_path) != true) + if (SCR::Execute (.fprint.enroll, fingerprint_dir) != true) { ui = `cancel; // status message UI::ReplaceWidget (`id (`rp), `Label (_("Initialization of fingerprint reader failed."))); } -// FIXME show generic message... the user can enroll finger + else + status_message ( + // status label + _("Device initialized."), + // status message + _("Swipe your right index finger.")); + while (ui != `cancel) { map statemap = (map) SCR::Read (.fprint.state); if (statemap != nil && statemap != $[]) { integer state = statemap["state"]:0; -y2security ("state: %1", state); + y2milestone ("state: %1", state); switch (state) { - /* - case 8: { // TF_STATE_ACQUIRE_SUCCESS - UI::ReplaceWidget (`id (`rp), - // status label - `Label (_("Storing data..."))); - UI::ReplaceWidget (`id (`rpstatus), `VSpacing ()); - exit = true; - break; - } - case 7: { // TF_STATE_ENROLL_SUCCESS - UI::ReplaceWidget (`id (`rp), - // status label - `Label (_("Storing data..."))); - UI::ReplaceWidget (`id (`rpstatus), `VSpacing ()); - exit = true; - break; - } - case 9: { // TF_STATE_ACQUIRE_FAILED - UI::ReplaceWidget (`id (`rp), - `Label (_("Acquiring fingerprint failed."))); - exit = true; - break; - } - case 2: { // TF_STATE_SWIPE_0 - UI::ReplaceWidget (`id (`rp), - `Label (_("Please swipe your finger..."))); - break; - } - case 5: { // TF_STATE_SWIPE_SUCCESS - swipe_success = swipe_success + 1; - replace_swipe_string (); - break; - } - case 6: { // TF_STATE_SWIPE_AFILED - swipe_failed = swipe_failed + 1; - replace_swipe_string (); - break; - } - */ case 1: { // FP_ENROLL_COMPLETE UI::ReplaceWidget (`id (`rp), // status label @@ -197,7 +163,7 @@ exit = true; break; } - case 2: { // FP_ENROLL_FAILED ?? FIXME + case 2: { // FP_ENROLL_FAILED status_message ( // status label _("Scan failed."), @@ -207,7 +173,7 @@ } case 3: { // FP_ENROLL_PASS swipe_success = swipe_success + 1; -// replace_swipe_string (); +// replace_swipe_string (); FIXME status_message ( // status label @@ -300,7 +266,17 @@ // error message, part 1 string error = _("Could not acquire fingerprint."); string details = ""; - if (exit_status == 253) + // see the error exit values in FPrintAgent.cc + if (exit_status == 200) + // error message, part 2 + details = _("Initialization failed."); + else if (exit_status == 201) + // error message, part 2 + details = _("No devices detected."); + else if (exit_status == 202) + // error message, part 2 + details = _("Device could not be opened."); + else if (exit_status == 253) // error message, part 2 details = _("USB error occured."); else if (exit_status == 254) @@ -308,9 +284,7 @@ details = _("Communication with fingerprint reader failed."); if (exit_status != 256) { - UI::ReplaceWidget (`id (`rp), `Label (error)); - if (details != "") - UI::ReplaceWidget (`id (`rpstatus), `Label (details)); + status_message (error, details); } Wizard::EnableBackButton (); } @@ -318,10 +292,9 @@ ret = UI::UserInput (); if (ret == `next) { - // FIXME no bir file can be defined yet FIXME // modified data to add to user map<string, any> tmp_data = $[ - "bir_file" : username, + "_fingerprint_dir" : fingerprint_dir, // FIXME save correctly "plugin_modified" : 1 ]; if (data["what"]:"" == "edit_user") diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-fingerprint-reader-2.17.2/VERSION new/yast2-fingerprint-reader-2.17.3/VERSION --- old/yast2-fingerprint-reader-2.17.2/VERSION 2008-09-29 15:53:13.000000000 +0200 +++ new/yast2-fingerprint-reader-2.17.3/VERSION 2008-10-02 13:08:18.000000000 +0200 @@ -1 +1 @@ -2.17.2 +2.17.3 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-drbd
by root＠Hilbert.suse.de 06 Oct '08

06 Oct '08

Hello community, here is the log from the commit of package yast2-drbd checked in at Mon Oct 6 15:55:00 CEST 2008. -------- --- yast2-drbd/yast2-drbd.changes 2008-07-17 03:01:19.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-drbd/yast2-drbd.changes 2008-10-02 07:04:14.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Oct 2 13:02:01 CST 2008 - xwhu(a)suse.de + +- Replace ReplaceNextButton with SetNextButton (bnc#429021) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- setnextbutton.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-drbd.spec ++++++ --- /var/tmp/diff_new_pack.i30998/_old 2008-10-06 15:54:52.000000000 +0200 +++ /var/tmp/diff_new_pack.i30998/_new 2008-10-06 15:54:52.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package yast2-drbd (Version 2.13.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -14,7 +21,7 @@ Name: yast2-drbd Url: http://en.opensuse.org/YaST Version: 2.13.1 -Release: 169 +Release: 214 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -27,6 +34,7 @@ Patch5: bug-291771_err_msg.patch Patch6: bug-295546_res-conf-deleted.pathch Patch7: bug-291490_typo.patch +Patch8: setnextbutton.diff Prefix: /usr BuildRequires: perl-XML-Writer ruby ruby-racc update-desktop-files yast2 yast2-devtools yast2-testsuite Requires: yast2 @@ -54,6 +62,7 @@ %patch5 -p1 %patch6 -p1 %patch7 +%patch8 -p1 %build %{prefix}/bin/y2tool y2autoconf @@ -94,6 +103,8 @@ %doc %{prefix}/share/doc/packages/yast2-drbd %changelog +* Thu Oct 02 2008 xwhu(a)suse.de +- Replace ReplaceNextButton with SetNextButton (bnc#429021) * Wed Jul 16 2008 xwhu(a)suse.de - pae was not recognized as a kernel arch (bnc#380074) * Mon Apr 07 2008 xwhu(a)suse.de ++++++ setnextbutton.diff ++++++ Index: yast2-drbd-2.13.1/src/common.ycp =================================================================== --- yast2-drbd-2.13.1.orig/src/common.ycp 2006-12-22 16:50:16.000000000 +0800 +++ yast2-drbd-2.13.1/src/common.ycp 2008-10-02 11:30:54.000000000 +0800 @@ -47,10 +47,10 @@ // UI::ChangeWidget(`id(`back), `Enabled, conf != "node_conf"); // if (conf == "startup_conf") { // UI::WizardCommand(`SetNextButtonLabel( Label::FinishButton() ) ); -// Wizard::ReplaceNextButton(`PushButton(`id(`next), `opt(`key_F10), Label::FinishButton())); +// Wizard::SetNextButton(`PushButton(`id(`next), `opt(`key_F10), Label::FinishButton())); // } else { // UI::WizardCommand(`SetNextButtonLabel( Label::NextButton() ) ); -// Wizard::ReplaceNextButton(`PushButton(`id(`next), `opt(`key_F10), Label::NextButton())); +// Wizard::SetNextButton(`PushButton(`id(`next), `opt(`key_F10), Label::NextButton())); // } // } } Index: yast2-drbd-2.13.1/src/wizards.ycp =================================================================== --- yast2-drbd-2.13.1.orig/src/wizards.ycp 2006-12-28 14:03:32.000000000 +0800 +++ yast2-drbd-2.13.1/src/wizards.ycp 2008-10-02 11:30:23.000000000 +0800 @@ -67,7 +67,7 @@ Wizard::CreateTree(tree, "DRBD"); // Buttons redefinition - Wizard::ReplaceNextButton(`PushButton(`id(`next), `opt(`key_F10), Label::FinishButton())); + Wizard::SetNextButton(`PushButton(`id(`next), `opt(`key_F10), Label::FinishButton())); if (UI::WidgetExists(`id(`wizardTree))) { Wizard::ReplaceBackButton(`PushButton(`id(`help), `opt(`key_F1), Label::HelpButton())); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-dhcp-server
by root＠Hilbert.suse.de 06 Oct '08

06 Oct '08

Hello community, here is the log from the commit of package yast2-dhcp-server checked in at Mon Oct 6 15:54:44 CEST 2008. -------- --- yast2-dhcp-server/yast2-dhcp-server.changes 2008-08-01 10:41:38.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-dhcp-server/yast2-dhcp-server.changes 2008-09-30 18:06:44.000000000 +0200 @@ -1,0 +2,11 @@ +Tue Sep 30 17:50:24 CEST 2008 - juhliarik(a)suse.cz + +- added fix for problem with typo (bug #423181) +- 2.17.1 + +------------------------------------------------------------------- +Thu Sep 11 08:25:28 CEST 2008 - jsrain(a)suse.cz + +- merged texts from proofread + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-dhcp-server-2.17.0.tar.bz2 New: ---- yast2-dhcp-server-2.17.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-dhcp-server.spec ++++++ --- /var/tmp/diff_new_pack.K30173/_old 2008-10-06 15:54:16.000000000 +0200 +++ /var/tmp/diff_new_pack.K30173/_new 2008-10-06 15:54:16.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package yast2-dhcp-server (Version 2.17.0) +# spec file for package yast2-dhcp-server (Version 2.17.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -12,12 +19,12 @@ Name: yast2-dhcp-server -Version: 2.17.0 +Version: 2.17.1 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-dhcp-server-2.17.0.tar.bz2 +Source0: yast2-dhcp-server-2.17.1.tar.bz2 Prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-Digest-SHA1 perl-X500-DN perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-dns-server yast2-perl-bindings yast2-testsuite Requires: perl-gettext yast2-perl-bindings bind-utils perl-X500-DN yast2-ldap perl-Digest-SHA1 perl-Parse-RecDescent @@ -41,7 +48,7 @@ Lukas Ocilka <locilka(a)suse.cz> %prep -%setup -n yast2-dhcp-server-2.17.0 +%setup -n yast2-dhcp-server-2.17.1 %build %{prefix}/bin/y2tool y2autoconf @@ -77,7 +84,13 @@ /usr/lib/YaST2/servers_non_y2/ag_dhcpd_conf %doc %{prefix}/share/doc/packages/yast2-dhcp-server /usr/share/YaST2/schema/autoyast/rnc/dhcp-server.rnc + %changelog +* Tue Sep 30 2008 juhliarik(a)suse.cz +- added fix for problem with typo (bug #423181) +- 2.17.1 +* Thu Sep 11 2008 jsrain(a)suse.cz +- merged texts from proofread * Fri Aug 01 2008 juhliarik(a)suse.cz - update dhcp-server depend on LDAP changes - 2.17.0 ++++++ yast2-dhcp-server-2.17.0.tar.bz2 -> yast2-dhcp-server-2.17.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dhcp-server-2.17.0/agents/ag_dhcpd_conf new/yast2-dhcp-server-2.17.1/agents/ag_dhcpd_conf --- old/yast2-dhcp-server-2.17.0/agents/ag_dhcpd_conf 2008-07-21 16:07:01.000000000 +0200 +++ new/yast2-dhcp-server-2.17.1/agents/ag_dhcpd_conf 2008-09-30 17:57:07.000000000 +0200 @@ -9,7 +9,6 @@ $group_counter = 0; $pool_counter = 0; -@parSed_file = (); sub get_lines { my $orig_line = ""; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dhcp-server-2.17.0/src/dns-helps.ycp new/yast2-dhcp-server-2.17.1/src/dns-helps.ycp --- old/yast2-dhcp-server-2.17.0/src/dns-helps.ycp 2008-07-21 16:07:02.000000000 +0200 +++ new/yast2-dhcp-server-2.17.1/src/dns-helps.ycp 2008-09-18 10:42:06.000000000 +0200 @@ -33,9 +33,8 @@ This wizard helps you create a new DNS zone directly from the DHCP server configuration. This DNS zone is important if you also want to identify your DHCP clients by hostname. The DNS zone -translates names to IP addresses assigned to them. You can also -create a reverse zone that translates IP addresses to names. -") + +translates names to the IP addresses assigned to them. You can also +create a reverse zone that translates IP addresses to names.\n") + // TRANSLATORS: DNS Wizard - step 1 (part 2) _("New Zone Name or Reverse Zone Name diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dhcp-server-2.17.0/VERSION new/yast2-dhcp-server-2.17.1/VERSION --- old/yast2-dhcp-server-2.17.0/VERSION 2008-08-01 10:25:37.000000000 +0200 +++ new/yast2-dhcp-server-2.17.1/VERSION 2008-09-30 17:51:34.000000000 +0200 @@ -1 +1 @@ -2.17.0 +2.17.1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-country
by root＠Hilbert.suse.de 06 Oct '08

06 Oct '08

Hello community, here is the log from the commit of package yast2-country checked in at Mon Oct 6 15:54:07 CEST 2008. -------- --- yast2-country/yast2-country.changes 2008-09-29 21:59:55.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-country/yast2-country.changes 2008-10-03 12:52:43.851242000 +0200 @@ -1,0 +2,19 @@ +Fri Oct 3 12:29:48 CEST 2008 - jsuchome(a)suse.cz + +- missing import (bnc#431897) +- 2.17.19 + +------------------------------------------------------------------- +Fri Oct 3 12:11:19 CEST 2008 - jsuchome(a)suse.cz + +- fixed syntax error in language_gl_ES.ycp (bnc#431883) +- 2.17.18 + +------------------------------------------------------------------- +Wed Oct 1 15:40:41 CEST 2008 - jsuchome(a)suse.cz + +- added minimal support for Nynorsk (bnc#426124) +- default NTP configuration based on control file value (bnc#431259) +- 2.17.17 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-country-2.17.16.tar.bz2 New: ---- yast2-country-2.17.19.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-country.spec ++++++ --- /var/tmp/diff_new_pack.Y29025/_old 2008-10-06 15:53:36.000000000 +0200 +++ /var/tmp/diff_new_pack.Y29025/_new 2008-10-06 15:53:36.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-country (Version 2.17.16) +# spec file for package yast2-country (Version 2.17.19) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-country -Version: 2.17.16 +Version: 2.17.19 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-country-2.17.16.tar.bz2 +Source0: yast2-country-2.17.19.tar.bz2 Prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-perl-bindings yast2-testsuite Requires: yast2-trans-stats yast2-perl-bindings timezone @@ -75,7 +75,7 @@ Jiri Suchomel <jsuchome(a)suse.cz> %prep -%setup -n yast2-country-2.17.16 +%setup -n yast2-country-2.17.19 %build %{prefix}/bin/y2tool y2autoconf @@ -142,8 +142,17 @@ %dir /usr/share/YaST2/data/languages /usr/share/YaST2/data/languages/*.ycp /usr/share/YaST2/modules/Language.y* - %changelog +* Fri Oct 03 2008 jsuchome(a)suse.cz +- missing import (bnc#431897) +- 2.17.19 +* Fri Oct 03 2008 jsuchome(a)suse.cz +- fixed syntax error in language_gl_ES.ycp (bnc#431883) +- 2.17.18 +* Wed Oct 01 2008 jsuchome(a)suse.cz +- added minimal support for Nynorsk (bnc#426124) +- default NTP configuration based on control file value (bnc#431259) +- 2.17.17 * Mon Sep 29 2008 jsuchome(a)suse.cz - added Galician language support - 2.17.16 ++++++ yast2-country-2.17.16.tar.bz2 -> yast2-country-2.17.19.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-country-2.17.16/language/data/language_gl_ES.ycp new/yast2-country-2.17.19/language/data/language_gl_ES.ycp --- old/yast2-country-2.17.16/language/data/language_gl_ES.ycp 2008-09-29 21:56:40.000000000 +0200 +++ new/yast2-country-2.17.19/language/data/language_gl_ES.ycp 2008-10-03 12:16:24.000000000 +0200 @@ -11,7 +11,7 @@ * translations of the 'language name' string to all installed languages. * * Author: Jiří Suchomel <jsuchome(a)suse.cz> - * $Id: language_es_ES.ycp 32769 2006-09-08 09:29:15Z jsuchome $ + * $Id: language_gl_ES.ycp 51825 2008-10-03 10:17:38Z jsuchome $ */ { textdomain "languages_db"; @@ -28,7 +28,7 @@ // <translated Language-to-display-UTF8-coded> ] // "gl_ES" : [ - "Galego" + "Galego", "Galego", ".UTF-8", "@euro", diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-country-2.17.16/language/data/language_nn_NO.ycp new/yast2-country-2.17.19/language/data/language_nn_NO.ycp --- old/yast2-country-2.17.16/language/data/language_nn_NO.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-country-2.17.19/language/data/language_nn_NO.ycp 2008-10-02 09:58:50.000000000 +0200 @@ -0,0 +1,43 @@ +/** + * This file contains the description of the language needed by yast2-country + * module. + * + * Translation of the 'language name' to actual YaST language be must applied + * each time this file is invoked. + * + * If you want to add new language to YaST using a file of this type provided + * by some module different from yast2-country (e.g. in some Add-On Product), + * consider using special textdomain, so it is possible to provide also + * translations of the 'language name' string to all installed languages. + * + * Author: Jiří Suchomel <jsuchome(a)suse.cz> + * $Id: language_nn_NO.ycp 51770 2008-10-02 08:00:00Z jsuchome $ + */ +{ + textdomain "languages_db"; + + return + $[ + // 1. information for language selection: + // Format is + // <LANG-Code> : [ + // <Language-to-display-UTF8-coded>, + // <Language-to-display-ASCII-coded-if-needed>, + // <LANG modifier used when UTF-8 enconding is selected> + // <LANG modifier used when no UTF-8 enconding is selected> + // <translated Language-to-display-UTF8-coded> ] + // + "nn_NO" : [ + "Nynorsk", + "Nynorsk", + ".UTF-8", + "", + // language name + _("Nynorsk") + ], + // 2. what time zone propose for this language + "timezone" : "Europe/Oslo", + // 3. which keyboard layout propose for this language + "keyboard" : "norwegian", + ]; +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-country-2.17.16/language/src/select_language.ycp new/yast2-country-2.17.19/language/src/select_language.ycp --- old/yast2-country-2.17.16/language/src/select_language.ycp 2008-09-09 11:12:53.000000000 +0200 +++ new/yast2-country-2.17.19/language/src/select_language.ycp 2008-10-02 09:58:50.000000000 +0200 @@ -15,7 +15,7 @@ * Summary: * This client shows main dialog for choosing the language. * - * $Id: select_language.ycp 50857 2008-09-09 09:12:52Z jsuchome $ + * $Id: select_language.ycp 51770 2008-10-02 08:00:00Z jsuchome $ * */ { @@ -561,7 +561,14 @@ else if (ret == `next || (set_default && ret == `language)) { Console::SelectFont (language); - Language::WfmSetLanguage (); + // no yast translation for nn_NO, use nb_NO as a backup + if (language == "nn_NO") + { + y2milestone ("Nynorsk not translated, using Bokm�l"); + Language::WfmSetGivenLanguage ("nb_NO"); + } + else + Language::WfmSetLanguage (); } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-country-2.17.16/timezone/src/dialogs.ycp new/yast2-country-2.17.19/timezone/src/dialogs.ycp --- old/yast2-country-2.17.16/timezone/src/dialogs.ycp 2008-09-29 16:05:36.000000000 +0200 +++ new/yast2-country-2.17.19/timezone/src/dialogs.ycp 2008-10-03 12:29:39.000000000 +0200 @@ -11,19 +11,21 @@ * Summary: * Dialogs for timeone and time configuration. * - * $Id: dialogs.ycp 51662 2008-09-29 14:06:35Z jsuchome $ + * $Id: dialogs.ycp 51770 2008-10-02 08:00:00Z jsuchome $ */ { textdomain "country"; import "Arch"; import "Directory"; + import "GetInstArgs"; import "Label"; import "Language"; import "Mode"; import "NetworkService"; import "Package"; import "Popup"; + import "ProductFeatures"; import "Service"; import "Stage"; import "Timezone"; @@ -487,7 +489,8 @@ // read NTP status if (first_run && NetworkService::isNetworkRunning() && - !GetInstArgs::going_back()) + !GetInstArgs::going_back() && + ProductFeatures::GetBooleanFeature("globals","default_ntp_setup")==true) { // true by default (fate#303520) ntp_used = true; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-country-2.17.16/VERSION new/yast2-country-2.17.19/VERSION --- old/yast2-country-2.17.16/VERSION 2008-09-29 21:58:21.000000000 +0200 +++ new/yast2-country-2.17.19/VERSION 2008-10-03 12:30:12.000000000 +0200 @@ -1 +1 @@ -2.17.16 +2.17.19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-bootloader
by root＠Hilbert.suse.de 06 Oct '08

06 Oct '08

Hello community, here is the log from the commit of package yast2-bootloader checked in at Mon Oct 6 15:53:26 CEST 2008. -------- --- yast2-bootloader/yast2-bootloader.changes 2008-09-30 13:48:28.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-bootloader/yast2-bootloader.changes 2008-10-06 11:01:06.000000000 +0200 @@ -1,0 +2,8 @@ +Fri Oct 3 17:28:27 CEST 2008 - juhliarik(a)suse.cz + +- added fix for installing packages (bnc #431580) +- added fix for 2 identical section in powerLILO (bnc #427730) +- added fix for mapping disk by label for powerLILO (bnc #41497) +- 2.17.25 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-bootloader-2.17.24.tar.bz2 New: ---- yast2-bootloader-2.17.25.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.i28131/_old 2008-10-06 15:52:42.000000000 +0200 +++ /var/tmp/diff_new_pack.i28131/_new 2008-10-06 15:52:42.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-bootloader (Version 2.17.24) +# spec file for package yast2-bootloader (Version 2.17.25) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-bootloader -Version: 2.17.24 +Version: 2.17.25 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-bootloader-2.17.24.tar.bz2 +Source0: yast2-bootloader-2.17.25.tar.bz2 Prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxslt limal-perl perl-Bootloader perl-XML-Writer perl-gettext sgml-skel swig update-alternatives update-desktop-files yast2-devtools yast2-installation yast2-perl-bindings yast2-storage yast2-testsuite # to eliminate a cyclic dependency in autobuild: @@ -61,7 +61,7 @@ Daniel Fiser %prep -%setup -n yast2-bootloader-2.17.24 +%setup -n yast2-bootloader-2.17.25 %build %{prefix}/bin/y2tool y2autoconf @@ -107,6 +107,11 @@ /var/adm/fillup-templates/* /usr/share/YaST2/schema/autoyast/rnc/bootloader.rnc %changelog +* Fri Oct 03 2008 juhliarik(a)suse.cz +- added fix for installing packages (bnc #431580) +- added fix for 2 identical section in powerLILO (bnc #427730) +- added fix for mapping disk by label for powerLILO (bnc #41497) +- 2.17.25 * Tue Sep 30 2008 juhliarik(a)suse.cz - updated fix for converting LILO to GRUB (bnc #430579) - 2.17.24 ++++++ yast2-bootloader-2.17.24.tar.bz2 -> yast2-bootloader-2.17.25.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.24/scripts/update_gfxmenu new/yast2-bootloader-2.17.25/scripts/update_gfxmenu --- old/yast2-bootloader-2.17.24/scripts/update_gfxmenu 2008-09-29 16:38:59.000000000 +0200 +++ new/yast2-bootloader-2.17.25/scripts/update_gfxmenu 2008-09-30 16:16:35.000000000 +0200 @@ -30,18 +30,27 @@ || test -f $SRC_DIR/$LOCALE_SHORT.tr && cp $SRC_DIR/$LOCALE_SHORT.tr . test -f $SRC_DIR/$LOCALE.hlp && cp I4/$LOCALE.hlp . \ || test -f $SRC_DIR/$LOCALE_SHORT.hlp && cp $SRC_DIR/$LOCALE_SHORT.hlp . + # set languages to choose -if [ "$LOCALE_SHORT" = "en" ] ; then - echo -n "en -" >languages || exit 6 +if [ -f $SRC_DIR/$LOCALE.tr ]; then + echo -n $LOCALE > languages || exit 6 + + # set translations of bootloaer menu entries + cp $MENU_ENTRIES ./translations.$LOCALE || exit 7; else - echo -n "$LOCALE_SHORT -en -" >languages || exit 6 + if [ "$LOCALE_SHORT" = "en" ]; then + echo -n "en + " >languages || exit 6 + else + echo -n "$LOCALE_SHORT + en + " >languages || exit 6 + fi + + # set translations of bootloaer menu entries + cp $MENU_ENTRIES ./translations.$LOCALE_SHORT || exit 7; fi -# set translations of bootloaer menu entries -cp $MENU_ENTRIES ./translations.$LOCALE_SHORT || exit 7; test -f $SRC_DIR/background.jpg && cp $SRC_DIR/background.jpg back.jpg diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.24/src/clients/inst_lilo_convert.ycp new/yast2-bootloader-2.17.25/src/clients/inst_lilo_convert.ycp --- old/yast2-bootloader-2.17.24/src/clients/inst_lilo_convert.ycp 2008-09-30 12:38:03.000000000 +0200 +++ new/yast2-bootloader-2.17.25/src/clients/inst_lilo_convert.ycp 2008-09-30 16:14:15.000000000 +0200 @@ -121,7 +121,7 @@ boolean checkArch() { boolean ret = false; - if (Arch::x86_64() || Arch::i386() || Arch::ia64()) + if (Arch::x86_64() || Arch::i386()) ret = true; if (ret) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.24/src/modules/BootCommon.ycp new/yast2-bootloader-2.17.25/src/modules/BootCommon.ycp --- old/yast2-bootloader-2.17.24/src/modules/BootCommon.ycp 2008-09-25 17:44:19.000000000 +0200 +++ new/yast2-bootloader-2.17.25/src/modules/BootCommon.ycp 2008-10-03 17:27:35.000000000 +0200 @@ -15,7 +15,7 @@ * Joachim Plack <jplack(a)suse.de> * Olaf Dabrunz <od(a)suse.de> * - * $Id: BootCommon.ycp 51543 2008-09-25 15:44:18Z juhliarik $ + * $Id: BootCommon.ycp 51842 2008-10-03 15:27:33Z juhliarik $ * */ @@ -33,6 +33,7 @@ import "String"; import "Pkg"; import "Popup"; +import "PackagesProposal"; import "Linuxrc"; @@ -1085,6 +1086,8 @@ return loader_type; } + + /** * The function handle selecting and deselecting packages (bootloaders) * @return boolean true on success @@ -1094,18 +1097,12 @@ boolean ret = false; if (globals["trusted_grub"]:"" == "true") { - list <string> packages = ["grub"]; - foreach (string btl, packages, { - if (Pkg::IsSelected(btl)) - { - Pkg::PkgNeutral (btl); - y2milestone("deselect %1 for installation", btl); - ret = true; - } - }); + + PackagesProposal::RemoveResolvables("yast2-bootloader", `package, ["grub"]); + y2milestone("deselect grub for installation"); + ret = true; + } - if (ret) - Pkg::PkgSolve (false); return ret; } @@ -1134,10 +1131,12 @@ && (Linuxrc::InstallInf ("kexec_reboot") != "0")) { bootloader_packages = bootloader_attribs[bootloader, "kexec-tools", "required_packages"]:[]; + bootloader_packages = add(bootloader_packages, "kexec-tools"); } else { bootloader_packages = bootloader_attribs[bootloader, "required_packages"]:[]; } + if (globals["trusted_grub"]:"" == "true") { bootloader_packages = bootloader_attribs[bootloader, "trustedgrub", "required_packages"]:[]; @@ -1146,6 +1145,8 @@ bootloader_packages = add(bootloader_packages, "trustedgrub"); } + //FIXME: solve problem with installing bootloader... + bootloader_packages = add(bootloader_packages, bootloader); // don't configure package manager during autoinstallation preparing if (Mode::normal () && (! (Mode::config () || Mode::repair ()))) @@ -1157,19 +1158,14 @@ { boolean pkg_added = false; foreach (string p, bootloader_packages, { - if (! Pkg::IsSelected (p)) - { - Pkg::PkgInstall (bootloader); - pkg_added = true; - } + y2milestone("Select bootloader package: %1", p); + PackagesProposal::AddResolvables ("yast2-bootloader", `package, [p]); + pkg_added = true; + }); if (pkg_added) { boolean ret = solvePackage(); - // if package was added in inst. proposal, I can't be sure - // that dependencies will be solved - if (ret) - Pkg::PkgSolve (false); } } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.24/src/modules/BootPOWERLILO.ycp new/yast2-bootloader-2.17.25/src/modules/BootPOWERLILO.ycp --- old/yast2-bootloader-2.17.24/src/modules/BootPOWERLILO.ycp 2008-07-21 16:04:51.000000000 +0200 +++ new/yast2-bootloader-2.17.25/src/modules/BootPOWERLILO.ycp 2008-10-03 17:26:41.000000000 +0200 @@ -16,7 +16,7 @@ * Olaf Dabrunz <od(a)suse.de> * Philipp Thomas <pth(a)suse.de> * - * $Id: BootPOWERLILO.ycp 45640 2008-03-20 11:53:38Z jsrain $ + * $Id: BootPOWERLILO.ycp 51841 2008-10-03 15:26:39Z juhliarik $ * */ @@ -34,6 +34,7 @@ import "Pkg"; import "Stage"; import "Storage"; +import "GfxMenu"; /* * include ppc specific help messages @@ -458,10 +459,11 @@ map<string,any> ret = $[ "type" : "image", - "name" : title, + "name" : GfxMenu::translateSectionTitle(title, "ppc"), "original_name" : title, "image" : image_fn, "initrd" : initrd_fn, + "optional" : "true", // bnc #217443 "root" : BootCommon::RootPartitionDevice, // "": do not include resume parameter on ppc "append" : BootArch::DefaultKernelParams (""), diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.24/src/routines/misc.ycp new/yast2-bootloader-2.17.25/src/routines/misc.ycp --- old/yast2-bootloader-2.17.24/src/routines/misc.ycp 2008-09-29 16:39:40.000000000 +0200 +++ new/yast2-bootloader-2.17.25/src/routines/misc.ycp 2008-10-06 10:14:15.000000000 +0200 @@ -12,7 +12,7 @@ * Jiri Srain <jsrain(a)suse.cz> * Olaf Dabrunz <od(a)suse.de> * - * $Id: misc.ycp 51242 2008-09-17 14:40:59Z juhliarik $ + * $Id: misc.ycp 51847 2008-10-06 08:14:13Z juhliarik $ * * WARNING: * To be included to BootCommon.ycp only, requires function @@ -322,9 +322,13 @@ global map<string,string> remapDeviceMap(map<string,string> device_map) { - symbol by_mount = Storage::GetDefaultMountBy(); - - //symbol by_mount = `id; + symbol by_mount = nil; + if (Arch::ppc()) + by_mount = `id; + else + by_mount = Storage::GetDefaultMountBy(); + + //by_mount = `id; if (by_mount == `label) return device_map; @@ -347,8 +351,13 @@ global map<string,string> remapGlobals(map<string,string> globals_set) { - symbol by_mount = Storage::GetDefaultMountBy(); - //symbol by_mount = `id; + symbol by_mount = nil; + if (Arch::ppc()) + by_mount = `id; + else + by_mount = Storage::GetDefaultMountBy(); + + //by_mount = `id; if (by_mount == `label) return globals_set; @@ -500,8 +509,13 @@ global list<map<string,any> > remapSections(list<map<string,any> >sec) { - symbol by_mount = Storage::GetDefaultMountBy(); - //symbol by_mount = `id; + symbol by_mount = nil; + if (Arch::ppc()) + by_mount = `id; + else + by_mount = Storage::GetDefaultMountBy(); + + //by_mount = `id; if (by_mount == `label) return sec; @@ -556,8 +570,13 @@ y2milestone ("Dev2MountByDev: %1", dev); // (`id,`uuid,`path,`device,`label) - symbol by_mount = Storage::GetDefaultMountBy(); - //symbol by_mount = `id; + symbol by_mount = nil; + if (Arch::ppc()) + by_mount = `id; + else + by_mount = Storage::GetDefaultMountBy(); + + //by_mount = `id; y2milestone("Default mount by is %1", by_mount); map<string,map> devices = (map<string,map>)Storage::GetTargetMap(); @@ -2112,7 +2131,7 @@ if (inst_bootloader) { WFM::Execute(.local.mkdir, Installation::destdir + "/etc/sysconfig"); - WFM::Write(.local.bash, sformat ("touch %1/etc/sysconfig/bootloader", Installation::destdir)); + WFM::Execute(.local.bash, sformat ("touch %1/etc/sysconfig/bootloader", Installation::destdir)); string target_sysconfig_path = Installation::destdir + "/etc/sysconfig/bootloader"; SCR::RegisterAgent (.target.sysconfig.bootloader, `ag_ini( `SysConfigFile(target_sysconfig_path))); @@ -2352,6 +2371,7 @@ foreach (integer idx, list_index, { sections[idx, "console"] = console_value; + sections[idx, "__changed"] = true; y2debug("Added console for section: %1", sections[idx]:$[]); }); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.24/VERSION new/yast2-bootloader-2.17.25/VERSION --- old/yast2-bootloader-2.17.24/VERSION 2008-09-30 13:38:38.000000000 +0200 +++ new/yast2-bootloader-2.17.25/VERSION 2008-10-03 10:42:43.000000000 +0200 @@ -1 +1 @@ -2.17.24 +2.17.25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-audit-laf
by root＠Hilbert.suse.de 06 Oct '08

06 Oct '08

Hello community, here is the log from the commit of package yast2-audit-laf checked in at Mon Oct 6 15:52:33 CEST 2008. -------- --- yast2-audit-laf/yast2-audit-laf.changes 2008-09-25 17:33:28.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-audit-laf/yast2-audit-laf.changes 2008-10-02 14:15:48.897719000 +0200 @@ -1,0 +2,7 @@ +Wed Oct 1 13:14:56 CEST 2008 - gs(a)suse.de + +- Basic command line support, fixed typos in help text + (bnc #430521), add Summary() for AutoYaST +- 2.17.3 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-audit-laf-2.17.2.tar.bz2 New: ---- yast2-audit-laf-2.17.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-audit-laf.spec ++++++ --- /var/tmp/diff_new_pack.j25524/_old 2008-10-06 15:51:52.000000000 +0200 +++ /var/tmp/diff_new_pack.j25524/_new 2008-10-06 15:51:52.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-audit-laf (Version 2.17.2) +# spec file for package yast2-audit-laf (Version 2.17.3) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-audit-laf -Version: 2.17.2 +Version: 2.17.3 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-audit-laf-2.17.2.tar.bz2 +Source0: yast2-audit-laf-2.17.3.tar.bz2 Prefix: /usr Requires: yast2 BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite @@ -42,7 +42,7 @@ Gabriele Mohr <gs(a)suse.de> %prep -%setup -n yast2-audit-laf-2.17.2 +%setup -n yast2-audit-laf-2.17.3 %build %{prefix}/bin/y2tool y2autoconf @@ -80,6 +80,10 @@ /usr/share/YaST2/scrconf/auditd.scr %doc %{prefix}/share/doc/packages/yast2-audit-laf %changelog +* Wed Oct 01 2008 gs(a)suse.de +- Basic command line support, fixed typos in help text + (bnc #430521), add Summary() for AutoYaST +- 2.17.3 * Wed Sep 24 2008 gs(a)suse.de - fixed typos, improved help text, set title icon, prepare for AutoYaST ++++++ yast2-audit-laf-2.17.2.tar.bz2 -> yast2-audit-laf-2.17.3.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-audit-laf-2.17.2/audit-laf.pot new/yast2-audit-laf-2.17.3/audit-laf.pot --- old/yast2-audit-laf-2.17.2/audit-laf.pot 2008-09-09 11:43:01.000000000 +0200 +++ new/yast2-audit-laf-2.17.3/audit-laf.pot 2008-10-02 13:14:44.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-09 11:43+0200\n" +"POT-Creation-Date: 2008-10-02 13:14+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -16,73 +16,87 @@ "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" +#: src/AuditLaf.ycp:187 +msgid "The rules for auditctl are locked" +msgstr "" + +#. combo box item +#: src/AuditLaf.ycp:189 src/dialogs.ycp:254 +msgid "Auditing enabled" +msgstr "" + +#. combo box item +#: src/AuditLaf.ycp:191 src/dialogs.ycp:256 +msgid "Auditing disabled" +msgstr "" + #. AuditLaf read dialog caption -#: src/AuditLaf.ycp:326 +#: src/AuditLaf.ycp:343 msgid "Initializing Audit Configuration" msgstr "" #. Progress stage 1/4 -#: src/AuditLaf.ycp:337 +#: src/AuditLaf.ycp:354 msgid "Read the configuration for auditd" msgstr "" #. Progress stage 2/4 -#: src/AuditLaf.ycp:339 +#: src/AuditLaf.ycp:356 msgid "Read the rules file" msgstr "" #. Progress stage 3/4 -#: src/AuditLaf.ycp:341 +#: src/AuditLaf.ycp:358 msgid "Check status of auditd" msgstr "" #. Progress step 1/3 -#: src/AuditLaf.ycp:345 +#: src/AuditLaf.ycp:362 msgid "Reading the configuration..." msgstr "" #. Progress step 2/3 -#: src/AuditLaf.ycp:347 +#: src/AuditLaf.ycp:364 msgid "Reading the rules file..." msgstr "" #. Progress step 3/3 -#: src/AuditLaf.ycp:349 +#: src/AuditLaf.ycp:366 msgid "Cecking status..." msgstr "" #. Report error -#: src/AuditLaf.ycp:366 +#: src/AuditLaf.ycp:383 msgid "Cannot read auditd.conf." msgstr "" #. Error message -#: src/AuditLaf.ycp:376 +#: src/AuditLaf.ycp:393 msgid "Cannot read audit.rules." msgstr "" -#: src/AuditLaf.ycp:396 +#: src/AuditLaf.ycp:413 msgid "" "The audit daemon doesn't run.\n" "Do you want to start it now?" msgstr "" -#: src/AuditLaf.ycp:400 +#: src/AuditLaf.ycp:417 msgid "" " The 'apparmor' kernel module is loaded\n" "which needs the audit daemon to log events. \n" "Do you want to start the daemon now?" msgstr "" -#: src/AuditLaf.ycp:404 +#: src/AuditLaf.ycp:421 msgid "Audit daemon not running" msgstr "" -#: src/AuditLaf.ycp:411 +#: src/AuditLaf.ycp:428 msgid "Cannot start the audit daemon" msgstr "" -#: src/AuditLaf.ycp:412 +#: src/AuditLaf.ycp:429 msgid "" "The reason might be that the rules are locked.\n" "Continue to check the rules. You can change\n" @@ -91,74 +105,74 @@ msgstr "" #. Auditd read dialog caption -#: src/AuditLaf.ycp:464 +#: src/AuditLaf.ycp:481 msgid "Saving Audit Configuration" msgstr "" #. Progress stage 1/2 -#: src/AuditLaf.ycp:476 +#: src/AuditLaf.ycp:493 msgid "Write the settings" msgstr "" #. Progress stage 2/2 -#: src/AuditLaf.ycp:478 +#: src/AuditLaf.ycp:495 msgid "Write the rules" msgstr "" #. Progress step 1/2 -#: src/AuditLaf.ycp:481 +#: src/AuditLaf.ycp:498 msgid "Writing the settings..." msgstr "" #. Progress step 2/2 -#: src/AuditLaf.ycp:483 +#: src/AuditLaf.ycp:500 msgid "Writing the rules..." msgstr "" -#: src/AuditLaf.ycp:496 +#: src/AuditLaf.ycp:513 msgid "The rules are already locked." msgstr "" -#: src/AuditLaf.ycp:497 +#: src/AuditLaf.ycp:514 msgid "" "Do you want to change the 'Enabled Flag'?\n" "If yes, the new rules will be written to /etc/audit/audit.rules.\n" "After that you have to reboot the system." msgstr "" -#: src/AuditLaf.ycp:521 +#: src/AuditLaf.ycp:538 msgid "Restart of the audit daemon failed" msgstr "" -#: src/AuditLaf.ycp:527 +#: src/AuditLaf.ycp:544 msgid "Cannot write settings to auditd.conf." msgstr "" -#: src/AuditLaf.ycp:550 +#: src/AuditLaf.ycp:567 msgid "Please start yast2-audit-laf again and check the rules" msgstr "" -#: src/AuditLaf.ycp:555 +#: src/AuditLaf.ycp:572 msgid "Cannot write settings to auditd.rules." msgstr "" -#. Configuration summary text for autoyast -#: src/AuditLaf.ycp:594 -msgid "Configuration summary..." +#: src/AuditLaf.ycp:620 +msgid "Log file" msgstr "" #. Command line help text for the Xaudit-laf module -#: src/audit-laf.ycp:54 -msgid "Configuration of audit-laf" +#. Initialization dialog caption +#: src/audit-laf.ycp:54 src/wizards.ycp:130 src/wizards.ycp:195 +msgid "Configuration of Linux Audit Framework (LAF)" msgstr "" #. Rich text title for AuditLaf in proposals -#: src/audit-laf_proposal.ycp:85 +#: src/audit-laf_proposal.ycp:84 msgid "AuditLaf" msgstr "" #. Menu title for AuditLaf in proposals -#: src/audit-laf_proposal.ycp:87 +#: src/audit-laf_proposal.ycp:86 msgid "&AuditLaf" msgstr "" @@ -209,188 +223,179 @@ msgid "Select an example" msgstr "" -#: src/complex.ycp:412 +#: src/complex.ycp:415 msgid "Lock set" msgstr "" -#: src/complex.ycp:412 +#: src/complex.ycp:415 msgid "" "The audit configuration is locked (option -e 2).\n" "This means the rules are locked until next boot!\n" "If you really want this, make sure '-e 2' is the last entry\n" "in the rules file. If not, either enable or disable auditing.\n" -"To check or to change the rules,\n" -"please go back to rules editor." +"To check or to change the rules, please go back to rules editor." msgstr "" #. Frame label -#: src/dialogs.ycp:56 +#: src/dialogs.ycp:48 msgid "General Settings" msgstr "" #. InputField label #. Header of tab in tab widget -#: src/dialogs.ycp:62 src/wizards.ycp:84 +#: src/dialogs.ycp:54 src/wizards.ycp:84 msgid "&Log File" msgstr "" #. PushButton label -#: src/dialogs.ycp:67 src/dialogs.ycp:157 +#: src/dialogs.ycp:59 src/dialogs.ycp:149 msgid "Select Fi&le" msgstr "" #. ComboBox label - select format of logging -#: src/dialogs.ycp:73 +#: src/dialogs.ycp:65 msgid "&Format" msgstr "" #. InputField label -#: src/dialogs.ycp:81 +#: src/dialogs.ycp:73 msgid "&Number of Log Files" msgstr "" #. ComboBox label - select how to flush data on disk -#: src/dialogs.ycp:85 +#: src/dialogs.ycp:77 msgid "Fl&ush" msgstr "" #. InputField label - enter how many records to write before flush data to disk -#: src/dialogs.ycp:94 +#: src/dialogs.ycp:86 msgid "Fre&quence (Number of Records)" msgstr "" #. Frame label - data regarding size of log file and action to perform -#: src/dialogs.ycp:102 +#: src/dialogs.ycp:94 msgid "Size and Action" msgstr "" #. InputField label -#: src/dialogs.ycp:105 +#: src/dialogs.ycp:97 msgid "Ma&x File Size (MB)" msgstr "" #. ComboBox label -#: src/dialogs.ycp:108 +#: src/dialogs.ycp:100 msgid "M&aximum File Size Action" msgstr "" #. InputField label -#: src/dialogs.ycp:118 +#: src/dialogs.ycp:110 msgid "Action Mail Account" msgstr "" -#: src/dialogs.ycp:123 +#: src/dialogs.ycp:115 msgid "Computer Names" msgstr "" -#: src/dialogs.ycp:125 -msgid "Computer Name Format" +#: src/dialogs.ycp:117 +msgid "&Computer Name Format" msgstr "" -#: src/dialogs.ycp:133 +#: src/dialogs.ycp:125 msgid "User Defined Name" msgstr "" #. Frame label - settings of the dispatcher program -#: src/dialogs.ycp:147 +#: src/dialogs.ycp:139 msgid "Dispatcher Settings" msgstr "" #. InputField label -#: src/dialogs.ycp:152 +#: src/dialogs.ycp:144 msgid "Dispatcher Program" msgstr "" #. ComboBox label - communication between the audit daemon and the dispatcher program -#: src/dialogs.ycp:162 -msgid "Communication" +#: src/dialogs.ycp:154 +msgid "C&ommunication" msgstr "" #. Frame label - keep it short! -#: src/dialogs.ycp:180 +#: src/dialogs.ycp:172 msgid "Value and Action for Space is Starting to Run Low" msgstr "" #. InputField label - space on disk is starting to run low if the entered value is reached -#: src/dialogs.ycp:183 +#: src/dialogs.ycp:175 msgid "&Space Left on Disk (MB)" msgstr "" -#. ComboBox label - select an action which is performed if space on disk is low -#. ComboBox label - select an action which is performed if space on disk is running low -#: src/dialogs.ycp:187 src/dialogs.ycp:209 -msgid "Action" +#. ComboBox label - select an action which is performed if space on disk is low +#: src/dialogs.ycp:179 +msgid "&Action" msgstr "" #. Frame label - keep it short! -#: src/dialogs.ycp:202 +#: src/dialogs.ycp:194 msgid "Value and Action for Space is Running Low" msgstr "" #. InputField label - space on disk is running low if the entered value is reached -#: src/dialogs.ycp:205 +#: src/dialogs.ycp:197 msgid "&Admin Space Left on Disk (MB) " msgstr "" +#. ComboBox label - select an action which is performed if space on disk is running low +#: src/dialogs.ycp:201 +msgid "Ac&tion" +msgstr "" + #. Frame label - keep it short! -#: src/dialogs.ycp:224 +#: src/dialogs.ycp:216 msgid "Action on Error or Disk Full" msgstr "" #. ComboBox label - select an action which is performed if disk is full -#: src/dialogs.ycp:228 -msgid "Disk Full Action" +#: src/dialogs.ycp:220 +msgid "Disk &Full Action" msgstr "" #. ComboBox label - select an action which is performed on error -#: src/dialogs.ycp:238 -msgid "Disk Error Action" +#: src/dialogs.ycp:230 +msgid "Disk &Error Action" msgstr "" #. label of a combo box with the possibilitiy to enable/disable auditing or lock the rules -#: src/dialogs.ycp:260 +#: src/dialogs.ycp:252 msgid "&Set Enabled Flag" msgstr "" -#. ComboBox item -#: src/dialogs.ycp:262 -msgid "Auditing enabled" -msgstr "" - -#. -e 1 -#. ComboBox item -#: src/dialogs.ycp:264 -msgid "Auditing disabled" -msgstr "" - -#. -e 0 -#. ComboBox item -#: src/dialogs.ycp:266 +#. combo box item +#: src/dialogs.ycp:258 msgid "Rules are locked (until next boot)" msgstr "" #. Label - describes what can be done in the editor -#: src/dialogs.ycp:274 +#: src/dialogs.ycp:266 msgid "Edit the rules for the audit subsystem here:" msgstr "" #. label of a push button (please keep it short) -#: src/dialogs.ycp:280 +#: src/dialogs.ycp:272 msgid "&Check Syntax" msgstr "" #. label of push button (please keep it short) -#: src/dialogs.ycp:283 +#: src/dialogs.ycp:275 msgid "&Restore 'audit.rules'" msgstr "" #. label of push button (please keep it short) -#: src/dialogs.ycp:286 +#: src/dialogs.ycp:278 msgid "R&estore and Reset" msgstr "" -#. label of push button -#: src/dialogs.ycp:289 +#. label of a push button +#: src/dialogs.ycp:281 msgid "&Load " msgstr "" @@ -473,8 +478,8 @@ #. logfile_settings dialog help 7/7 #: src/helps.ycp:83 msgid "" -"Computer Name Format describes how to the computer name is written\n" -"to the log file. If User is set the User Defined Name is used. " +"Computer Name Format describes how to write the computer name to the log file.\n" +"If User is set the User Defined Name is used. " msgstr "" #. dispatcher dialog help 1/3 @@ -488,46 +493,47 @@ #: src/helps.ycp:90 msgid "" "Dispatcher: The dispatcher program is started by the audit daemon and\n" -"gets all all audit events on stdin." +"gets all audit events on stdin." msgstr "" #. dispatcher dialog help 3/3 #: src/helps.ycp:93 msgid "" "Communication: Controls the communication\n" -"between the daemon and the dispatcher program." +"between the daemon and the dispatcher program." msgstr "" -#. disksapce dialog help 1/4 +#. disk space dialog help 1/4 #: src/helps.ycp:97 msgid "" "<big>Auditd Disk Space Configuration</big> \n" -"Detailed information about the settings can be obtained from 'man auditd.conf'\n" +"The settings made here refer to disk space on log partition.\n" +"Detailed information can be obtained from 'man auditd.conf'\n" msgstr "" -#. disksapce dialog help 2/4 -#: src/helps.ycp:101 +#. disk space dialog help 2/4 +#: src/helps.ycp:102 msgid "" "Space Left and Action describe how much disk space (in megabytes)\n" "to left and which action to perform if the system is starting to run low on space." msgstr "" -#. disksapce dialog help 3/4 -#: src/helps.ycp:105 +#. disk space dialog help 3/4 +#: src/helps.ycp:106 msgid "" "Admin Space Left and Action describe how much disk space (in megabytes)\n" "to left and which action to perform if the system is running low." msgstr "" -#. disksapce dialog help 3/4 -#: src/helps.ycp:109 +#. disk space dialog help 3/4 +#: src/helps.ycp:110 msgid "" "You can also specify a Disk Full Action (disk has become full already) and\n" "a Disk Error Action (performed whenever an error is detected while writing to disk)." msgstr "" -#. rules dialog help 1/5 -#: src/helps.ycp:113 +#. rules dialog help 1/6 +#: src/helps.ycp:114 msgid "" "<big>Rules for auditctl</big> \n" "This dialog offers the possibiltiy to enable or to disable the syscall\n" @@ -535,33 +541,36 @@ "The selected flag from Set Enabled Flag will be added to the rules." msgstr "" -#. rules dialog help 2/5 -#: src/helps.ycp:118 +#. rules dialog help 2/6 +#: src/helps.ycp:119 msgid "Please note: Locking the rules means they cannot be changed until next reboot! " msgstr "" -#. rules dialog help 3/5 -#: src/helps.ycp:120 +#. rules dialog help 3/6 +#: src/helps.ycp:121 msgid "" "To enable the auditing whithout additional rules will cause the\n" " applications which use libaudit, e.g. PAM to log to /var/log/audit/audit.log (default). " msgstr "" -#. rules dialog help 4/5 -#: src/helps.ycp:123 +#. rules dialog help 4/6 +#: src/helps.ycp:124 msgid "" -"This module also allows you to edit the rules manually. Detailed information\n" -"about all options gives 'man auditctl'. \n" -"Check Syntax sends the rules via auditctl to the audit subsystem and tells\n" -"whether the syntax is correct." +"This module also allows you to edit the rules manually. \n" +"Detailed information about all options gives 'man auditctl'." msgstr "" -#. rules dialog help 5/5 -#: src/helps.ycp:128 +#. rules dialog help 5/6 +#: src/helps.ycp:127 +msgid "Check Syntax sends the rules via auditctl to the audit subsystem and tells whether the syntax is correct." +msgstr "" + +#. rules dialog help 6/6 +#: src/helps.ycp:129 msgid "" -"Use the Restore and Reset to restore previous rules and reset the changes\n" +"Use the Restore and Reset button to restore previous rules and reset the changes (from previous syntax checks)\n" "by calling auditctl with it. \n" -"The Load button opens an file selection dialog and you are able to load\n" +"The Load button opens a file selection dialog and you are able to load\n" "an example rules file." msgstr "" @@ -570,22 +579,18 @@ msgid "&Dispatcher" msgstr "" -#. Header of tab in tab widget (keep it short!) +#. Header of tab in tab widget #: src/wizards.ycp:96 -msgid "Disk &Space on Log Partion" +msgid "Disk &Space" msgstr "" -#. Header of tab in tab widget -#: src/wizards.ycp:102 -msgid "&Rules for auditctl" -msgstr "" - -#. Initialization dialog caption -#: src/wizards.ycp:129 src/wizards.ycp:194 -msgid "Configuration of Linux Audit Framework (LAF)" +#. Header of tab in tab widget +#. (auditctl is a program which sends the rules to the audit subsystem) +#: src/wizards.ycp:103 +msgid "&Rules for 'auditctl'" msgstr "" #. Initialization dialog contents -#: src/wizards.ycp:196 +#: src/wizards.ycp:197 msgid "Initializing..." msgstr "" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-audit-laf-2.17.2/configure new/yast2-audit-laf-2.17.3/configure --- old/yast2-audit-laf-2.17.2/configure 2008-09-25 16:54:53.000000000 +0200 +++ new/yast2-audit-laf-2.17.3/configure 2008-09-30 14:15:43.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for yast2-audit-laf 2.17.1. +# Generated by GNU Autoconf 2.61 for yast2-audit-laf 2.17.2. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -574,8 +574,8 @@ # Identity of this package. PACKAGE_NAME='yast2-audit-laf' PACKAGE_TARNAME='yast2-audit-laf' -PACKAGE_VERSION='2.17.1' -PACKAGE_STRING='yast2-audit-laf 2.17.1' +PACKAGE_VERSION='2.17.2' +PACKAGE_STRING='yast2-audit-laf 2.17.2' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1197,7 +1197,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-audit-laf 2.17.1 to adapt to many kinds of systems. +\`configure' configures yast2-audit-laf 2.17.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1268,7 +1268,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-audit-laf 2.17.1:";; + short | recursive ) echo "Configuration of yast2-audit-laf 2.17.2:";; esac cat <<\_ACEOF @@ -1346,7 +1346,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-audit-laf configure 2.17.1 +yast2-audit-laf configure 2.17.2 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1360,7 +1360,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-audit-laf $as_me 2.17.1, which was +It was created by yast2-audit-laf $as_me 2.17.2, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2181,7 +2181,7 @@ # Define the identity of the package. PACKAGE='yast2-audit-laf' - VERSION='2.17.1' + VERSION='2.17.2' cat >>confdefs.h <<_ACEOF @@ -2409,7 +2409,7 @@ -VERSION="2.17.1" +VERSION="2.17.2" RPMNAME="yast2-audit-laf" MAINTAINER="Gabriele Mohr <gs(a)suse.de>" @@ -3304,7 +3304,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-audit-laf $as_me 2.17.1, which was +This file was extended by yast2-audit-laf $as_me 2.17.2, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3347,7 +3347,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-audit-laf config.status 2.17.1 +yast2-audit-laf config.status 2.17.2 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-audit-laf-2.17.2/configure.in new/yast2-audit-laf-2.17.3/configure.in --- old/yast2-audit-laf-2.17.2/configure.in 2008-09-25 16:54:49.000000000 +0200 +++ new/yast2-audit-laf-2.17.3/configure.in 2008-09-30 14:15:38.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-audit-laf, 2.17.1, http://bugs.opensuse.org/, yast2-audit-laf) +AC_INIT(yast2-audit-laf, 2.17.2, http://bugs.opensuse.org/, yast2-audit-laf) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.17.1" +VERSION="2.17.2" RPMNAME="yast2-audit-laf" MAINTAINER="Gabriele Mohr <gs(a)suse.de>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-audit-laf-2.17.2/src/audit-laf_auto.ycp new/yast2-audit-laf-2.17.3/src/audit-laf_auto.ycp --- old/yast2-audit-laf-2.17.2/src/audit-laf_auto.ycp 2008-09-02 10:28:35.000000000 +0200 +++ new/yast2-audit-laf-2.17.3/src/audit-laf_auto.ycp 2008-10-02 13:10:11.000000000 +0200 @@ -64,7 +64,7 @@ /* Create a summary*/ if(func == "Summary") { - ret = select(AuditLaf::Summary(), 0, ""); + ret = AuditLaf::Summary(); } /* Reset configuration */ else if (func == "Reset") { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-audit-laf-2.17.2/src/audit-laf_proposal.ycp new/yast2-audit-laf-2.17.3/src/audit-laf_proposal.ycp --- old/yast2-audit-laf-2.17.2/src/audit-laf_proposal.ycp 2008-09-02 10:28:35.000000000 +0200 +++ new/yast2-audit-laf-2.17.3/src/audit-laf_proposal.ycp 2008-10-02 13:14:24.000000000 +0200 @@ -58,8 +58,7 @@ AuditLaf::Read(); Progress::set (progress_orig); } - list sum = AuditLaf::Summary(); - proposal = sum[0]:""; + proposal = AuditLaf::Summary(); ret = $[ "preformatted_proposal" : proposal, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-audit-laf-2.17.2/src/audit-laf.ycp new/yast2-audit-laf-2.17.3/src/audit-laf.ycp --- old/yast2-audit-laf-2.17.2/src/audit-laf.ycp 2008-09-02 10:47:03.000000000 +0200 +++ new/yast2-audit-laf-2.17.3/src/audit-laf.ycp 2008-10-01 13:10:23.000000000 +0200 @@ -51,7 +51,7 @@ map cmdline_description = $[ "id" : "audit-laf", /* Command line help text for the Xaudit-laf module */ - "help" : _("Configuration of audit-laf"), + "help" : _("Configuration of Linux Audit Framework (LAF)"), "guihandler" : AuditLafSequence, "initialize" : AuditLaf::Read, "finish" : AuditLaf::Write, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-audit-laf-2.17.2/src/AuditLaf.ycp new/yast2-audit-laf-2.17.3/src/AuditLaf.ycp --- old/yast2-audit-laf-2.17.2/src/AuditLaf.ycp 2008-09-25 17:22:20.000000000 +0200 +++ new/yast2-audit-laf-2.17.3/src/AuditLaf.ycp 2008-10-02 13:02:36.000000000 +0200 @@ -176,6 +176,21 @@ return false; } +global string AuditStatus() +{ + map output = (map)SCR::Execute( .target.bash_output, "auditctl -s" ); + y2milestone( "auditctl: %1", output ); + + string audit_status = output["stdout"]:""; + + if ( regexpmatch( audit_status, "^.*enabled=2.*" ) ) + return _( "The rules for auditctl are locked" ); + else if ( regexpmatch( audit_status, "^.*enabled=1.*" ) ) + return _( "Auditing enabled"); + else + return _( "Auditing disabled"); +} + // // Settings: Define all variables needed for the configuration of the audit daemon // @@ -599,10 +614,16 @@ * Create a textual summary and a list of unconfigured cards * @return summary of the current configuration */ -// TODO FIXME: your code here... -global list Summary() { +global string Summary() { + string summary = ""; + + summary = Summary::AddLine( summary, sformat( "%1: %2", _("Log file"), AuditLaf::GetAuditdOption("log_file")) ); + summary = Summary::AddLine( summary, AuditStatus() ); + + y2milestone ( "Summary: %1", summary ); + /* Configuration summary text for autoyast */ - return [ _("Configuration summary..."), [] ]; + return summary; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-audit-laf-2.17.2/src/complex.ycp new/yast2-audit-laf-2.17.3/src/complex.ycp --- old/yast2-audit-laf-2.17.2/src/complex.ycp 2008-09-25 17:26:51.000000000 +0200 +++ new/yast2-audit-laf-2.17.3/src/complex.ycp 2008-10-01 13:06:55.000000000 +0200 @@ -363,7 +363,7 @@ map output = (map)SCR::Execute(.target.bash_output, sformat( "auditctl -R %1", tmpfile ) ); if ( output["exit"]:0 != 0 ) { - Report::Error( sformat( output["stderr"]:"" ) ); + Report::Error( output["stderr"]:"" ); } else { @@ -416,8 +416,7 @@ This means the rules are locked until next boot! If you really want this, make sure '-e 2' is the last entry in the rules file. If not, either enable or disable auditing. -To check or to change the rules, -please go back to rules editor."), +To check or to change the rules, please go back to rules editor."), Label::ContinueButton(), Label::BackButton(), `focus_no ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-audit-laf-2.17.2/src/dialogs.ycp new/yast2-audit-laf-2.17.3/src/dialogs.ycp --- old/yast2-audit-laf-2.17.2/src/dialogs.ycp 2008-09-24 11:53:18.000000000 +0200 +++ new/yast2-audit-laf-2.17.3/src/dialogs.ycp 2008-10-02 10:12:36.000000000 +0200 @@ -36,17 +36,9 @@ include "audit-laf/helps.ycp"; -map current_ui_settings = UI::GetDisplayInfo(); - integer mbox_x = 1; integer mbox_y = 0.5; -// Tabs have a different layout in textmode -if (current_ui_settings["TextMode"]:false == true) { - mbox_x = 0; - mbox_y = 0; -} - term LogfileSettingsDialogContent () { return `MarginBox( mbox_x, mbox_y, `VBox( @@ -122,7 +114,7 @@ `Frame( _("Computer Names"), `HBox( - `HWeight( 1, `ComboBox(`id("name_format"), _("Computer Name Format"), + `HWeight( 1, `ComboBox(`id("name_format"), _("&Computer Name Format"), [`item(`id("NONE"), "NONE" ), `item(`id("HOSTNAME"), "HOSTNAME", true ), `item(`id("FQD"), "FQD" ), @@ -159,7 +151,7 @@ ) ), // ComboBox label - communication between the audit daemon and the dispatcher program - `Left(`ComboBox(`id("disp_qos"), _("Communication"), + `Left(`ComboBox(`id("disp_qos"), _("C&ommunication"), [`item(`id("lossy"), "lossy", true ), `item(`id("lossless"), "lossless" ) ]) @@ -183,8 +175,8 @@ `HWeight( 1, `InputField(`id("space_left"), _("&Space Left on Disk (MB)") )), `HSpacing(2.0), `HWeight( 1, `ComboBox(`id("space_left_action"), `opt(`editable), - // ComboBox label - select an action which is performed if space on disk is low - _("Action"), + // ComboBox label - select an action which is performed if space on disk is low + _("&Action"), [`item(`id("IGNORE"), "IGNORE" ), `item(`id("SYSLOG"), "SYSLOG", true ), `item(`id("SUSPEND"), "SUSPEND" ), @@ -206,7 +198,7 @@ `HSpacing(2.0), `HWeight( 1, `ComboBox(`id("admin_space_left_action"), `opt(`editable), // ComboBox label - select an action which is performed if space on disk is running low - _("Action"), + _("Ac&tion"), [`item(`id("IGNORE"), "IGNORE" ), `item(`id("SYSLOG"), "SYSLOG", true ), `item(`id("SUSPEND"), "SUSPEND" ), @@ -225,7 +217,7 @@ `VBox( `ComboBox(`id("disk_full_action"), `opt(`editable, `hstretch), // ComboBox label - select an action which is performed if disk is full - _("Disk Full Action"), + _("Disk &Full Action"), [`item(`id("IGNORE"), "IGNORE" ), `item(`id("SYSLOG"), "SYSLOG", true ), `item(`id("SUSPEND"), "SUSPEND" ), @@ -235,7 +227,7 @@ ]), `ComboBox(`id("disk_error_action"), `opt(`editable, `hstretch ), // ComboBox label - select an action which is performed on error - _("Disk Error Action"), + _("Disk &Error Action"), [`item(`id("IGNORE"), "IGNORE" ), `item(`id("SYSLOG"), "SYSLOG", true ), `item(`id("SUSPEND"), "SUSPEND" ), @@ -272,7 +264,7 @@ `VWeight( 90, `VBox( // Label - describes what can be done in the editor `Left(`Label(_("Edit the rules for the audit subsystem here:") ) ), - `MultiLineEdit(`id("rules"), `opt(`vstretch), "audit.rules" ) + `MultiLineEdit(`id("rules"), `opt(`vstretch), "&audit.rules" ) ) ), `VWeight( 10, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-audit-laf-2.17.2/src/helps.ycp new/yast2-audit-laf-2.17.3/src/helps.ycp --- old/yast2-audit-laf-2.17.2/src/helps.ycp 2008-09-24 13:06:21.000000000 +0200 +++ new/yast2-audit-laf-2.17.3/src/helps.ycp 2008-10-02 10:18:28.000000000 +0200 @@ -91,7 +91,7 @@ gets all audit events on stdin.") + /* dispatcher dialog help 3/3 */ _("Communication: Controls the communication -between the daemon and the dispatcher program."), +between the daemon and the dispatcher program."), /* disk space dialog help 1/4 */ "diskspace_settings" : _("<big>Auditd Disk Space Configuration</big> @@ -124,9 +124,10 @@ _("This module also allows you to edit the rules manually. Detailed information about all options gives 'man auditctl'.") + /* rules dialog help 5/6 */ - _("Check Syntax sends the rules via auditctl to the audit subsystem and tells whether the syntax is correct.") + + _("Check Syntax sends the rules via auditctl to the audit subsystem and tells whether the syntax is correct.") + /* rules dialog help 6/6 */ - _("Use the Restore and Reset button to restore previous rules and reset the changes by calling auditctl with it. + _("Use the Restore and Reset button to restore previous rules and reset the changes (from previous syntax checks) +by calling auditctl with it. The Load button opens a file selection dialog and you are able to load an example rules file.") diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-audit-laf-2.17.2/VERSION new/yast2-audit-laf-2.17.3/VERSION --- old/yast2-audit-laf-2.17.2/VERSION 2008-09-25 17:31:56.000000000 +0200 +++ new/yast2-audit-laf-2.17.3/VERSION 2008-10-02 13:16:15.000000000 +0200 @@ -1 +1 @@ -2.17.2 +2.17.3 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-add-on
by root＠Hilbert.suse.de 06 Oct '08

06 Oct '08

Hello community, here is the log from the commit of package yast2-add-on checked in at Mon Oct 6 15:49:17 CEST 2008. -------- --- yast2-add-on/yast2-add-on.changes 2008-09-30 10:54:54.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-add-on/yast2-add-on.changes 2008-10-01 11:58:28.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Oct 1 11:57:38 CEST 2008 - locilka(a)suse.cz + +- Changed texts (bnc #431177). +- 2.17.5 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-add-on-2.17.4.tar.bz2 New: ---- yast2-add-on-2.17.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-add-on.spec ++++++ --- /var/tmp/diff_new_pack.p10807/_old 2008-10-06 15:42:08.000000000 +0200 +++ /var/tmp/diff_new_pack.p10807/_new 2008-10-06 15:42:08.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-add-on (Version 2.17.4) +# spec file for package yast2-add-on (Version 2.17.5) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-add-on -Version: 2.17.4 +Version: 2.17.5 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-add-on-2.17.4.tar.bz2 +Source0: yast2-add-on-2.17.5.tar.bz2 Prefix: /usr Requires: autoyast2-installation # WorkflowManager module @@ -58,7 +58,7 @@ Lukas Ocilka <locilka(a)suse.cz> %prep -%setup -n yast2-add-on-2.17.4 +%setup -n yast2-add-on-2.17.5 %build %{prefix}/bin/y2tool y2autoconf @@ -96,6 +96,9 @@ /usr/share/YaST2/schema/autoyast/rnc/add-on.rnc %doc %{prefix}/share/doc/packages/yast2-add-on %changelog +* Wed Oct 01 2008 locilka(a)suse.cz +- Changed texts (bnc #431177). +- 2.17.5 * Tue Sep 30 2008 locilka(a)suse.cz - Support for commandline: "help", "longhelp", and "xmlhelp" (bnc #430852). ++++++ yast2-add-on-2.17.4.tar.bz2 -> yast2-add-on-2.17.5.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-2.17.4/configure new/yast2-add-on-2.17.5/configure --- old/yast2-add-on-2.17.4/configure 2008-08-15 16:50:56.000000000 +0200 +++ new/yast2-add-on-2.17.5/configure 2008-10-01 12:05:37.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for yast2-add-on 2.17.2. +# Generated by GNU Autoconf 2.61 for yast2-add-on 2.17.5. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -574,8 +574,8 @@ # Identity of this package. PACKAGE_NAME='yast2-add-on' PACKAGE_TARNAME='yast2-add-on' -PACKAGE_VERSION='2.17.2' -PACKAGE_STRING='yast2-add-on 2.17.2' +PACKAGE_VERSION='2.17.5' +PACKAGE_STRING='yast2-add-on 2.17.5' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1197,7 +1197,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-add-on 2.17.2 to adapt to many kinds of systems. +\`configure' configures yast2-add-on 2.17.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1268,7 +1268,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-add-on 2.17.2:";; + short | recursive ) echo "Configuration of yast2-add-on 2.17.5:";; esac cat <<\_ACEOF @@ -1346,7 +1346,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-add-on configure 2.17.2 +yast2-add-on configure 2.17.5 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1360,7 +1360,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-add-on $as_me 2.17.2, which was +It was created by yast2-add-on $as_me 2.17.5, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2181,7 +2181,7 @@ # Define the identity of the package. PACKAGE='yast2-add-on' - VERSION='2.17.2' + VERSION='2.17.5' cat >>confdefs.h <<_ACEOF @@ -2409,7 +2409,7 @@ -VERSION="2.17.2" +VERSION="2.17.5" RPMNAME="yast2-add-on" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" @@ -3304,7 +3304,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-add-on $as_me 2.17.2, which was +This file was extended by yast2-add-on $as_me 2.17.5, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3347,7 +3347,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-add-on config.status 2.17.2 +yast2-add-on config.status 2.17.5 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-2.17.4/configure.in new/yast2-add-on-2.17.5/configure.in --- old/yast2-add-on-2.17.4/configure.in 2008-08-15 16:50:53.000000000 +0200 +++ new/yast2-add-on-2.17.5/configure.in 2008-10-01 12:05:34.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-add-on, 2.17.2, http://bugs.opensuse.org/, yast2-add-on) +AC_INIT(yast2-add-on, 2.17.5, http://bugs.opensuse.org/, yast2-add-on) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.17.2" +VERSION="2.17.5" RPMNAME="yast2-add-on" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-2.17.4/src/add-on.desktop new/yast2-add-on-2.17.5/src/add-on.desktop --- old/yast2-add-on-2.17.4/src/add-on.desktop 2008-05-19 15:28:08.000000000 +0200 +++ new/yast2-add-on-2.17.5/src/add-on.desktop 2008-10-01 10:55:43.000000000 +0200 @@ -21,7 +21,7 @@ Icon=yast-addon Exec=/sbin/yast2 add-on -Name=Add-On Product -GenericName=Install an Add-On Product +Name=Add-On Products +GenericName=Install or remove add-on products X-KDE-SubstituteUID=true StartupNotify=true diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-2.17.4/src/add-on-workflow.ycp new/yast2-add-on-2.17.5/src/add-on-workflow.ycp --- old/yast2-add-on-2.17.4/src/add-on-workflow.ycp 2008-09-08 17:33:59.000000000 +0200 +++ new/yast2-add-on-2.17.5/src/add-on-workflow.ycp 2008-10-01 10:57:10.000000000 +0200 @@ -847,7 +847,7 @@ if (! enable_back) Wizard::DisableBackButton(); if (! enable_next) Wizard::DisableNextButton(); - Wizard::SetDesktopIcon("vendor"); + Wizard::SetTitleIcon("vendor"); // disable delete button if no items listed // bug #203809 @@ -980,7 +980,7 @@ // Use new wizard window for adding new Add-On. // Do not use "Steps" dialog. Wizard::OpenNextBackDialog(); - Wizard::SetDesktopIcon("vendor"); + Wizard::SetTitleIcon("vendor"); symbol ret = RunWizard (); Wizard::CloseDialog(); @@ -1055,7 +1055,7 @@ `PushButton (`id (`delete), Label::DeleteButton()), `HStretch(), // TRANSLATORS: push button - `PushButton (`id (`packager), _("Run &Package Manager...")) + `PushButton (`id (`packager), _("Run &Software Manager...")) ) ), // TRANSLATORS: dialog help adp/1 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-2.17.4/src/add-on.ycp new/yast2-add-on-2.17.5/src/add-on.ycp --- old/yast2-add-on-2.17.4/src/add-on.ycp 2008-09-30 11:14:15.000000000 +0200 +++ new/yast2-add-on-2.17.5/src/add-on.ycp 2008-10-01 10:53:28.000000000 +0200 @@ -90,7 +90,7 @@ false ); -Wizard::SetDesktopIcon("vendor"); +Wizard::SetTitleIcon("vendor"); Wizard::DisableBackButton(); Wizard::DisableAbortButton(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-2.17.4/src/inst_language_add-on.ycp new/yast2-add-on-2.17.5/src/inst_language_add-on.ycp --- old/yast2-add-on-2.17.4/src/inst_language_add-on.ycp 2008-09-08 17:33:59.000000000 +0200 +++ new/yast2-add-on-2.17.5/src/inst_language_add-on.ycp 2008-10-01 10:53:49.000000000 +0200 @@ -119,7 +119,7 @@ Label::BackButton(), Label::NextButton() ); - Wizard::SetDesktopIcon("yast-language"); + Wizard::SetTitleIcon("yast-language"); Wizard::DisableBackButton(); Wizard::DisableAbortButton(); Wizard::DisableNextButton(); @@ -178,7 +178,7 @@ Label::BackButton(), Label::OKButton() ); - Wizard::SetDesktopIcon("yast-language"); + Wizard::SetTitleIcon("yast-language"); Wizard::DisableBackButton(); Wizard::EnableAbortButton(); Wizard::EnableNextButton(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-2.17.4/src/vendor.ycp new/yast2-add-on-2.17.5/src/vendor.ycp --- old/yast2-add-on-2.17.4/src/vendor.ycp 2007-10-24 16:30:21.000000000 +0200 +++ new/yast2-add-on-2.17.5/src/vendor.ycp 2008-10-01 11:58:37.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Load vendor driver CD * Authors: Klaus Kaempf <kkaempf(a)suse.de> * - * $Id: vendor.ycp 41548 2007-10-24 14:30:21Z locilka $ + * $Id: vendor.ycp 51723 2008-10-01 09:58:37Z locilka $ */ { @@ -85,7 +85,7 @@ any result = nil; Wizard::CreateDialog(); - Wizard::SetDesktopIcon("vendor"); + Wizard::SetTitleIcon("vendor"); Wizard::HideAbortButton(); // VENDOR: main screen heading diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-2.17.4/VERSION new/yast2-add-on-2.17.5/VERSION --- old/yast2-add-on-2.17.4/VERSION 2008-09-30 10:54:59.000000000 +0200 +++ new/yast2-add-on-2.17.5/VERSION 2008-10-01 11:57:24.000000000 +0200 @@ -1 +1 @@ -2.17.4 +2.17.5 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-2.17.4/yast2-add-on-2.17.5/add-on.pot new/yast2-add-on-2.17.5/yast2-add-on-2.17.5/add-on.pot --- old/yast2-add-on-2.17.4/yast2-add-on-2.17.5/add-on.pot 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-add-on-2.17.5/yast2-add-on-2.17.5/add-on.pot 2008-09-30 11:01:27.000000000 +0200 @@ -0,0 +1,414 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-09-30 11:01+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#. table cell +#: src/add-on-workflow.ycp:124 src/add-on-workflow.ycp:462 +msgid "No product found in the repository" +msgstr "" + +#. error report +#: src/add-on-workflow.ycp:244 +msgid "No software repository found on medium." +msgstr "" + +#. busy message +#: src/add-on-workflow.ycp:261 +msgid "Initializing new source..." +msgstr "" + +#. error report +#: src/add-on-workflow.ycp:289 src/add-on-workflow.ycp:392 +msgid "Failed to initialize the software repository." +msgstr "" + +#. placeholder for unknown directory +#. place holder for unknown URL +#. placeholder for unknown path +#. placeholder for unknown URL +#. placeholder for unknown path +#. summary item, %1 is product name, %2 media URL, %3 directory on media +#: src/add-on-workflow.ycp:307 src/add-on-workflow.ycp:312 +#: src/add-on-workflow.ycp:806 src/add-on-workflow.ycp:812 +#: src/add-on_proposal.ycp:32 src/add-on_proposal.ycp:36 +msgid "Unknown" +msgstr "" + +#: src/add-on-workflow.ycp:310 +#, ycp-format +msgid "URL: %1, Directory: %2" +msgstr "" + +#. dialog caption +#: src/add-on-workflow.ycp:316 +msgid "Software Repository Selection" +msgstr "" + +#. help text +#: src/add-on-workflow.ycp:318 +msgid "" +"<big>Software Repository Selection</big> \n" +"Multiple repositories were found on the selected medium.\n" +"Select the repository to use.\n" +msgstr "" + +#: src/add-on-workflow.ycp:325 +msgid "Repositories &Found" +msgstr "" + +#. if (Stage::initial()) +#. { +#. if (Popup::ConfirmAbort (`painless)) +#. break; +#. } +#. else +#. { +#. yes-no popup +#: src/add-on-workflow.ycp:345 src/add-on-workflow.ycp:634 +msgid "Really abort add-on product installation?" +msgstr "" + +#. popup message +#: src/add-on-workflow.ycp:361 +msgid "Select a repository." +msgstr "" + +#. error pop-up +#: src/add-on-workflow.ycp:532 src/add-on-workflow.ycp:689 +msgid "" +"The product on the media is already installed\n" +"or selected for installation." +msgstr "" + +#. message popup +#: src/add-on-workflow.ycp:550 +msgid "Dependencies of the add-on product cannot be fulfilled." +msgstr "" + +#. dialog caption +#: src/add-on-workflow.ycp:607 +msgid "Product Selection" +msgstr "" + +#. multi selection list +#: src/add-on-workflow.ycp:611 +msgid "Available Products" +msgstr "" + +#. help text +#: src/add-on-workflow.ycp:615 +msgid "" +"<big>Product Selection</big> \n" +"Multiple products were found in the repository. Select the products\n" +"to install.\n" +msgstr "" + +#. message popup +#: src/add-on-workflow.ycp:676 +msgid "Dependencies of the selected add-on products cannot be fulfilled." +msgstr "" + +#. main screen heading +#. feedback heading +#. TRANSLATORS: dialog caption +#: src/add-on-workflow.ycp:793 src/add-on-workflow.ycp:1311 +#: src/inst_language_add-on.ycp:114 src/inst_language_add-on.ycp:163 +msgid "Add-On Product Installation" +msgstr "" + +#. Help for add-on products +#: src/add-on-workflow.ycp:796 +msgid "" +"<big>Add-On Product Installation</big>\n" +"Here see all add-on products that are selected for installation.\n" +"To add a new product, click Add. To remove an already added one,\n" +"select it and click Delete." +msgstr "" + +#. table cell, %1 is URL, %2 is directory name +#: src/add-on-workflow.ycp:810 +#, ycp-format +msgid "%1, Directory: %2" +msgstr "" + +#. table header +#: src/add-on-workflow.ycp:825 +msgid "Product" +msgstr "" + +#. table header +#: src/add-on-workflow.ycp:827 +msgid "Media" +msgstr "" + +#. message report +#: src/add-on-workflow.ycp:952 +msgid "Select a product to delete." +msgstr "" + +#. TRANSLATORS: busy message +#: src/add-on-workflow.ycp:962 +msgid "Removing selected add-on..." +msgstr "" + +#. TRANSLATORS: dialog caption +#: src/add-on-workflow.ycp:1033 +msgid "Installed Add-On Products" +msgstr "" + +#. TRANSLATORS: table header item +#: src/add-on-workflow.ycp:1040 +msgid "Add-On Product" +msgstr "" + +#. TRANSLATORS: table header item +#: src/add-on-workflow.ycp:1042 +msgid "URL" +msgstr "" + +#. TRANSLATORS: push button +#: src/add-on-workflow.ycp:1058 +msgid "Run &Package Manager..." +msgstr "" + +#. TRANSLATORS: dialog help adp/1 +#: src/add-on-workflow.ycp:1062 +msgid "Here you can see all of the add-on products which are installed on your system." +msgstr "" + +#. TRANSLATORS: dialog help adp/2 +#: src/add-on-workflow.ycp:1064 +msgid "Use the Add button to add a new add-on product, or the Delete button to remove an add-on which is in use." +msgstr "" + +#: src/add-on-workflow.ycp:1111 +#, ycp-format +msgid "Vendor: %1 " +msgstr "" + +#: src/add-on-workflow.ycp:1112 +msgid "Unknown vendor" +msgstr "" + +#: src/add-on-workflow.ycp:1115 +#, ycp-format +msgid "Version: %1 " +msgstr "" + +#: src/add-on-workflow.ycp:1116 +msgid "Unknown version" +msgstr "" + +#: src/add-on-workflow.ycp:1119 +#, ycp-format +msgid "Repository URL: %1 " +msgstr "" + +#: src/add-on-workflow.ycp:1120 +msgid "Unknown repository URL" +msgstr "" + +#: src/add-on-workflow.ycp:1123 +#, ycp-format +msgid "Repository Alias: %1 " +msgstr "" + +#: src/add-on-workflow.ycp:1163 src/add-on-workflow.ycp:1206 +msgid "Unknown product" +msgstr "" + +#: src/add-on-workflow.ycp:1164 +msgid "Unknown URL" +msgstr "" + +#. TRANSLATORS: busy popup message +#: src/add-on-workflow.ycp:1213 +msgid "Removing product dependencies..." +msgstr "" + +#: src/add-on-workflow.ycp:1314 +msgid "Reading packages available at the installation repositories..." +msgstr "" + +#. TRANSLATORS: commandline help +#: src/add-on.ycp:37 +msgid "" +"\n" +"Add-On Module Help\n" +"------------------\n" +"\n" +"To add a new add-on product via the command-line, use this syntax:\n" +" /sbin/yast2 add-on URL\n" +"URL is the path to the add-on source.\n" +"\n" +"Examples of URL:\n" +"http://server.name/directory/Lang-AddOn-10.2-i386/\n" +"ftp://server.name/directory/Lang-AddOn-10.2-i386/\n" +"nfs://server.name/directory/SDK1-SLE-i386/\n" +"disk://dev/sda5/directory/Product/CD1/\n" +"cd://\n" +"dvd://\n" +msgstr "" + +#: src/add-on.ycp:57 +msgid "Target file name ('xmlfile' option) is missing. Use xmlfile=<target_XML_file> command line option." +msgstr "" + +#. dialog caption +#. this is a heading +#: src/add-on.ycp:85 src/add-on_proposal.ycp:69 +msgid "Add-On Products" +msgstr "" + +#. busy message (dialog) +#. TRANSLATORS: dialog content - a very simple label +#: src/add-on.ycp:87 src/inst_language_add-on.ycp:116 +msgid "Initializing..." +msgstr "" + +#. help +#. TRANSLATORS: help text +#: src/add-on.ycp:89 src/inst_language_add-on.ycp:118 +msgid "Initializing add-on products..." +msgstr "" + +#: src/add-on_auto.ycp:59 +#, ycp-format +msgid "<li>Media: %1, Path: %2, Product: %3</li>\n" +msgstr "" + +#. error report +#: src/add-on_auto.ycp:162 +msgid "Failed to add add-on product." +msgstr "" + +#: src/add-on_auto.ycp:164 +#, ycp-format +msgid "Please make the add-on \"%1\" available via \"%2\"" +msgstr "" + +#. summary string +#: src/add-on_proposal.ycp:41 +msgid "No add-on product selected for installation" +msgstr "" + +#. this is a menu entry +#: src/add-on_proposal.ycp:71 +msgid "Add-On &Products" +msgstr "" + +#. TRANSLATORS: popup message +#: src/inst_language_add-on.ycp:77 +msgid "Installation of the Language Extension has been finished." +msgstr "" + +#. TRANSLATORS:: multi-selection box +#: src/inst_language_add-on.ycp:170 +msgid "&Select Language Extensions to be Installed" +msgstr "" + +#. TRANSLATORS: help text +#: src/inst_language_add-on.ycp:177 +msgid "Select the language extensions to be installed and then click the OK button." +msgstr "" + +#. TRANSLATORS: popup question +#: src/inst_language_add-on.ycp:194 +msgid "Are you sure you want to abort the add-on product installation?" +msgstr "" + +#: src/inst_language_add-on.ycp:203 +msgid "" +"There are no selected languages to be installed.\n" +"Are you sure you want to abort the installation?" +msgstr "" + +#. TRANSLATORS: multiselection box item, %1 stands for 'ar', 'mk', 'zh_TW' +#. it used only as a fallback +#: src/inst_language_add-on.ycp:251 +#, ycp-format +msgid "Language %1" +msgstr "" + +#. TRANSLATORS: pop-up headline +#: src/misc.ycp:65 +msgid "Warning: Not enough memory!" +msgstr "" + +#. TRANSLATORS: pop-up question +#: src/misc.ycp:67 +msgid "" +"Your system does not seem to have enough memory to use add-on products\n" +"during installation. You can enable add-on products later when the\n" +"system is running.\n" +"\n" +"Do you want to skip using add-on products?" +msgstr "" + +#. TRANSLATORS: error message - the module does not provide command line interface +#: src/vendor.ycp:29 +msgid "There is no user interface available for this module." +msgstr "" + +#. VENDOR: main screen heading +#: src/vendor.ycp:92 +msgid "Vendor Driver CD" +msgstr "" + +#. VENDOR: cant mount /dev/cdrom popup +#: src/vendor.ycp:108 +msgid "Please insert the vendor CD-ROM" +msgstr "" + +#. VENDOR: vendor cd contains wrong data +#: src/vendor.ycp:157 src/vendor.ycp:171 src/vendor.ycp:219 +msgid "" +"Could not find driver data on the CD-ROM.\n" +"Aborting now." +msgstr "" + +#. VENDOR: vendor cd doesn't contain data for current system and linux version +#: src/vendor.ycp:194 +msgid "" +"The CD-ROM data does not match the running Linux system.\n" +"Aborting now.\n" +msgstr "" + +#. VENDOR: dialog heading +#: src/vendor.ycp:256 +msgid "Installing driver..." +msgstr "" + +#. VENDOR: popup if installation of driver failed +#: src/vendor.ycp:265 +msgid "" +"The installation failed.\n" +"Contact the address on the CD-ROM.\n" +msgstr "" + +#. VENDOR: message box with number of drivers installed +#: src/vendor.ycp:277 +#, ycp-format +msgid "Installed %1 drivers from CD" +msgstr "" + +#. VENDOR: message box with error text +#: src/vendor.ycp:282 +msgid "" +"No driver data found on the CD-ROM.\n" +"Aborting now." +msgstr "" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2
by root＠Hilbert.suse.de 06 Oct '08

06 Oct '08

Hello community, here is the log from the commit of package yast2 checked in at Mon Oct 6 15:41:59 CEST 2008. -------- --- yast2/yast2.changes 2008-09-30 10:01:08.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2/yast2.changes 2008-10-06 13:59:25.505733000 +0200 @@ -1,0 +2,40 @@ +Mon Oct 6 13:23:09 CEST 2008 - visnov(a)suse.cz + +- Added icon to hardware detection confirmation (bnc #431276) +- 2.17.37 + +------------------------------------------------------------------- +Fri Oct 3 00:26:13 CEST 2008 - locilka(a)suse.cz + +- Fixed Makefiles by using [[:upper:]]*.ycp where needed. +- 2.17.36 + +------------------------------------------------------------------- +Thu Oct 2 22:15:31 CEST 2008 - locilka(a)suse.cz + +- Added new PackagesProposal module which provides unified API for + YaST modules in installation that want to select resolvables for + installation (bnc #431580). + +------------------------------------------------------------------- +Thu Oct 2 14:31:38 CEST 2008 - mzugec(a)suse.de + +- Service - log output in case of error + +------------------------------------------------------------------- +Thu Oct 2 11:31:35 CEST 2008 - kmachalkova(a)suse.cz + +- Hostname.ycp: Improved FQDN lookup - read /etc/HOSTNAME and use + 'linux.site' if all else fails (bnc#429792) + +------------------------------------------------------------------- +Wed Oct 1 17:07:00 CEST 2008 - visnov(a)suse.cz + +- Show old action logs when rebuilding slideshow dialog (bnc #431261) + +------------------------------------------------------------------- +Tue Sep 30 15:27:45 CEST 2008 - tgoettlicher(a)suse.de + +- Fixed forgotten unregister from agent + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-2.17.35.tar.bz2 New: ---- yast2-2.17.37.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.S24621/_old 2008-10-06 15:37:33.000000000 +0200 +++ /var/tmp/diff_new_pack.S24621/_new 2008-10-06 15:37:33.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2 (Version 2.17.35) +# spec file for package yast2 (Version 2.17.37) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2 -Version: 2.17.35 +Version: 2.17.37 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-2.17.35.tar.bz2 +Source0: yast2-2.17.37.tar.bz2 Prefix: /usr Source1: yast2-rpmlintrc BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-perl-bindings yast2-testsuite @@ -147,7 +147,7 @@ Steffen Winterfeldt <snwint(a)suse.de> %prep -%setup -n yast2-2.17.35 +%setup -n yast2-2.17.37 %build %{prefix}/bin/y2tool y2autoconf @@ -250,8 +250,26 @@ %doc %{prefix}/share/doc/packages/yast2/system %doc %{prefix}/share/doc/packages/yast2/types %doc %{prefix}/share/doc/packages/yast2/wizard - %changelog +* Mon Oct 06 2008 visnov(a)suse.cz +- Added icon to hardware detection confirmation (bnc #431276) +- 2.17.37 +* Fri Oct 03 2008 locilka(a)suse.cz +- Fixed Makefiles by using [[:upper:]]*.ycp where needed. +- 2.17.36 +* Fri Oct 03 2008 locilka(a)suse.cz +- Added new PackagesProposal module which provides unified API for + YaST modules in installation that want to select resolvables for + installation (bnc #431580). +* Thu Oct 02 2008 mzugec(a)suse.de +- Service - log output in case of error +* Thu Oct 02 2008 kmachalkova(a)suse.cz +- Hostname.ycp: Improved FQDN lookup - read /etc/HOSTNAME and use + 'linux.site' if all else fails (bnc#429792) +* Wed Oct 01 2008 visnov(a)suse.cz +- Show old action logs when rebuilding slideshow dialog (bnc #431261) +* Tue Sep 30 2008 tgoettlicher(a)suse.de +- Fixed forgotten unregister from agent * Mon Sep 29 2008 visnov(a)suse.cz - updated man page with exit codes - save also zypp history in save_y2logs ++++++ yast2-2.17.35.tar.bz2 -> yast2-2.17.37.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.35/library/modules/Popup.ycp new/yast2-2.17.37/library/modules/Popup.ycp --- old/yast2-2.17.35/library/modules/Popup.ycp 2008-09-30 09:57:48.000000000 +0200 +++ new/yast2-2.17.37/library/modules/Popup.ycp 2008-10-01 16:44:03.000000000 +0200 @@ -7,7 +7,7 @@ * Arvin Schnell <arvin(a)suse.de> * Flags: Stable * - * $Id: Popup.ycp 51393 2008-09-23 09:38:28Z locilka $ + * $Id: Popup.ycp 51742 2008-10-01 12:24:33Z sh-sh-sh $ * * Contains commonly used popup dialogs * for general usage, e.g. Popup::YesNo(), Popup::ContinueCancel(). @@ -330,6 +330,10 @@ ); any ret = nil; + + if ( focus != nil ) + UI::SetFocus(focus); + if (success == true) { ret = UI::UserInput(); UI::CloseDialog(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.35/library/modules/Version.ycp new/yast2-2.17.37/library/modules/Version.ycp --- old/yast2-2.17.35/library/modules/Version.ycp 2008-09-30 09:58:32.000000000 +0200 +++ new/yast2-2.17.37/library/modules/Version.ycp 2008-10-06 13:38:09.000000000 +0200 @@ -20,7 +20,7 @@ /** * Version of the yast2 package */ -global string yast2 = "2.17.35"; +global string yast2 = "2.17.37"; /* EOF */ } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.35/library/network/src/Makefile.am new/yast2-2.17.37/library/network/src/Makefile.am --- old/yast2-2.17.35/library/network/src/Makefile.am 2008-09-30 09:57:42.000000000 +0200 +++ new/yast2-2.17.37/library/network/src/Makefile.am 2008-10-03 10:11:54.000000000 +0200 @@ -6,7 +6,7 @@ ynclude_DATA = -module_DATA = $(wildcard [A-Z]*.ycp [A-Z]*.pm) +module_DATA = $(wildcard [[:upper:]]*.ycp [[:upper:]]*.pm) EXTRA_DIST = $(client_DATA) $(ynclude_DATA) $(module_DATA) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.35/library/network/src/Makefile.in new/yast2-2.17.37/library/network/src/Makefile.in --- old/yast2-2.17.35/library/network/src/Makefile.in 2008-09-30 09:58:25.000000000 +0200 +++ new/yast2-2.17.37/library/network/src/Makefile.in 2008-10-06 10:53:50.000000000 +0200 @@ -185,7 +185,7 @@ ystartupdir = @ystartupdir@ client_DATA = ynclude_DATA = -module_DATA = $(wildcard [A-Z]*.ycp [A-Z]*.pm) +module_DATA = $(wildcard [[:upper:]]*.ycp [[:upper:]]*.pm) EXTRA_DIST = $(client_DATA) $(ynclude_DATA) $(module_DATA) # runlevel: Service, wizard: Report, Progress diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.35/library/network/src/yast2-services-translations.ycp new/yast2-2.17.37/library/network/src/yast2-services-translations.ycp --- old/yast2-2.17.35/library/network/src/yast2-services-translations.ycp 2008-09-30 09:57:42.000000000 +0200 +++ new/yast2-2.17.37/library/network/src/yast2-services-translations.ycp 1970-01-01 01:00:00.000000000 +0100 @@ -1,295 +0,0 @@ -{ - /** - * 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: Name of Service (File name: bacula-dir, RPM: bacula-server), can be used as check box, item in multiple selection box... - tmpstring = _("Bacula Director"); - - // TRANSLATORS: Description of a Service (File name: bacula-dir, RPM: bacula-server), used as a common label or an item in table - tmpstring = _("Bacula network backup system director daemon"); - - // TRANSLATORS: Name of Service (File name: bacula-fd, RPM: bacula), can be used as check box, item in multiple selection box... - tmpstring = _("Bacula File Daemon"); - - // TRANSLATORS: Description of a Service (File name: bacula-fd, RPM: bacula), used as a common label or an item in table - tmpstring = _("Bacula network backup system file daemon"); - - // TRANSLATORS: Name of Service (File name: bacula-sd, RPM: bacula-server), can be used as check box, item in multiple selection box... - tmpstring = _("Bacula Storage 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 network backup system 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 to allow connection to an 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: Name of Service (File name: postfix, RPM: postfix), can be used as check box, item in multiple selection box... - tmpstring = _("SMTP with Postfix"); - - // 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: Name of Service (File name: sendmail, RPM: sendmail), can be used as check box, item in multiple selection box... - tmpstring = _("SMTP with sendmail"); - - // 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 old/yast2-2.17.35/library/packages/src/Makefile.am new/yast2-2.17.37/library/packages/src/Makefile.am --- old/yast2-2.17.35/library/packages/src/Makefile.am 2008-09-30 09:57:49.000000000 +0200 +++ new/yast2-2.17.37/library/packages/src/Makefile.am 2008-10-03 10:11:54.000000000 +0200 @@ -2,9 +2,9 @@ yncludedir = @yncludedir@/packages -YCPCFLAGS = -M ../../modules/ -M ../../wizard/src -M ../../system/src/ -M ../../types/src -M ../../commandline/src -M ../../xml/src -M ../../control/src +YCPCFLAGS = -M ../../modules -M ../../wizard/src -M ../../system/src/ -M ../../types/src -M ../../commandline/src -M ../../xml/src -M ../../control/src -module_DATA = $(wildcard [A-Z]*.ycp [A-Z]*.pm) +module_DATA = $(wildcard [[:upper:]]*.ycp) ynclude_DATA = \ common.ycp diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.35/library/packages/src/Makefile.in new/yast2-2.17.37/library/packages/src/Makefile.in --- old/yast2-2.17.35/library/packages/src/Makefile.in 2008-09-30 09:58:26.000000000 +0200 +++ new/yast2-2.17.37/library/packages/src/Makefile.in 2008-10-06 10:53:45.000000000 +0200 @@ -180,8 +180,8 @@ ydatadir = @ydatadir@ yncludedir = @yncludedir@/packages ystartupdir = @ystartupdir@ -YCPCFLAGS = -M ../../modules/ -M ../../wizard/src -M ../../system/src/ -M ../../types/src -M ../../commandline/src -M ../../xml/src -M ../../control/src -module_DATA = $(wildcard [A-Z]*.ycp [A-Z]*.pm) +YCPCFLAGS = -M ../../modules -M ../../wizard/src -M ../../system/src/ -M ../../types/src -M ../../commandline/src -M ../../xml/src -M ../../control/src +module_DATA = $(wildcard [[:upper:]]*.ycp) ynclude_DATA = \ common.ycp diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.35/library/packages/src/PackagesProposal.ycp new/yast2-2.17.37/library/packages/src/PackagesProposal.ycp --- old/yast2-2.17.35/library/packages/src/PackagesProposal.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-2.17.37/library/packages/src/PackagesProposal.ycp 2008-10-03 10:11:54.000000000 +0200 @@ -0,0 +1,230 @@ +/** + * File: PackagesProposal.ycp + * Package: Packages installation + * Summary: API for selecting or de-selecting packages for installation + * Authors: Lukas Ocilka <locilka(a)suse.cz> + * + * $Id$ + */ + +{ + /*** + * + * This module provides API for packages that want software + * proposal to select some packages for installation. + * + * // No packages selected initially + * y2internal ("Packages to install: %1", PackagesProposal::GetAllResolvables (`package)); + * + * // Adding packages for ID_1 + * PackagesProposal::AddResolvables ("ID_1", `package, ["aa", "bb", "cc"]); + * y2internal ("Packages to install: %1", PackagesProposal::GetAllResolvables (`package)); + * + * // Adding packages for ID_2 + * // 'cc' is shared with ID_1 + * PackagesProposal::AddResolvables ("ID_2", `package, ["cc", "dd", "ee"]); + * y2internal ("Packages to install: %1", PackagesProposal::GetAllResolvables (`package)); + * + * // Get all packages required by ID_1 + * list <string> required_packages = PackagesProposal::GetResolvables ("ID_1", `package); + * y2internal ("Packages required by ID_1: %1", required_packages); + * + * // Removing all packages required by ID_1 + * PackagesProposal::RemoveResolvables ("ID_1", `package, required_packages); + * y2internal ("Packages to install: %1", PackagesProposal::GetAllResolvables (`package)); + * + * // Removing some packages required by ID_2 + * PackagesProposal::RemoveResolvables ("ID_2", `package, ["cc", "dd"]); + * y2internal ("Packages to install: %1", PackagesProposal::GetAllResolvables (`package)); + * + */ + + module "PackagesProposal"; + + textdomain "base"; + + /** + * @struct $[ + * "unique_ID" : $[ + * `package : [ "list", "of", "packages", "to", "install" ], + * `pattern : [ "list", "of", "patterns", "to", "install" ], + * ] + * ] + */ + map <string, map <symbol, list <string> > > resolvables_to_install = $[]; + + /** + * List of currently supported types of resolvables + */ + list <symbol> supported_resolvables = [`package]; + + boolean IsSupportedResolvableType (symbol type) { + if (type == nil) { + y2error ("Wrong type: %1", type); + return false; + } + + return contains (supported_resolvables, type); + } + + /** + * Adds list of packages to pool that is then used by software proposal + * to propose a selection of resolvables to install. + * + * @param string unique_ID + * @param symbol resolvable type + * @param list <string> of resolvables to add for installation + * @return boolean whether successful + * + * @example + * AddResolvables ("y2_kdump", `package, ["yast2-kdump", "kdump"]) -> true + * // `not_supported is definitely not a supported resolvable + * AddResolvables ("test", `not_supported, ["bash"]) -> false + * + * @see supported_resolvables + * @see RemoveResolvables() + */ + global boolean AddResolvables (string unique_ID, symbol type, list <string> resolvables) { + if (unique_ID == nil || unique_ID == "") { + y2error ("Unique ID cannot be: %1", unique_ID); + return false; + } + + if (! IsSupportedResolvableType (type)) { + y2error ("Not a supported type: %1, supported are only: %2", type, supported_resolvables); + return false; + } + + if (! haskey (resolvables_to_install, unique_ID)) { + y2debug ("Creating '%1' key in resolvables_to_install", unique_ID); + resolvables_to_install[unique_ID] = $[]; + } + + if (! haskey (resolvables_to_install[unique_ID]:$[], type)) { + y2debug ("Creating '%1' key in resolvables_to_install[%2]", type, unique_ID); + resolvables_to_install[unique_ID, type] = []; + } + + y2milestone ("Adding resolvables %1 type %2 for %3", resolvables, type, unique_ID); + resolvables_to_install[unique_ID, type] = + (list <string>) union (resolvables_to_install[unique_ID, type]:[], resolvables); + + return true; + } + + /** + * Removes list of packages from pool that is then used by software proposal + * to propose a selection of resolvables to install. + * + * @param string unique_ID + * @param symbol resolvable type + * @param list <string> of resolvables to remove from list selected for installation + * @return boolean whether successful + * + * @example + * RemoveResolvables ("y2_kdump", `package, ["kdump"]) -> true + * + * @see supported_resolvables + * @see AddResolvables() + */ + global boolean RemoveResolvables (string unique_ID, symbol type, list <string> resolvables) { + if (unique_ID == nil || unique_ID == "") { + y2error ("Unique ID cannot be: %1", unique_ID); + return false; + } + + if (! IsSupportedResolvableType (type)) { + y2error ("Not a supported type: %1, supported are only: %2", type, supported_resolvables); + return false; + } + + if (! haskey (resolvables_to_install, unique_ID)) { + y2debug ("Creating '%1' key in resolvables_to_install", unique_ID); + resolvables_to_install[unique_ID] = $[]; + } + + if (! haskey (resolvables_to_install[unique_ID]:$[], type)) { + y2debug ("Creating '%1' key in resolvables_to_install[%2]", type, unique_ID); + resolvables_to_install[unique_ID, type] = []; + } + + y2milestone ("Removing resolvables %1 type %2 for %3", resolvables, type, unique_ID); + resolvables_to_install[unique_ID, type] = filter (string one_resolvable, resolvables_to_install[unique_ID, type]:[], { + return ! contains (resolvables, one_resolvable); + }); + y2milestone ("Resolvables left: %1", resolvables_to_install[unique_ID, type]:[]); + + return true; + } + + /** + * Returns all resolvables selected for installation. + * + * @param string unique_ID + * @param symbol resolvable type + * @return list <string> of resolvables + * + * @example + * GetResolvables ("y2_kdump", `package) -> ["yast2-kdump", "kdump"] + */ + global list <string> GetResolvables (string unique_ID, symbol type) { + if (unique_ID == nil || unique_ID == "") { + y2error ("Unique ID cannot be: %1", unique_ID); + return nil; + } + + if (! IsSupportedResolvableType (type)) { + y2error ("Not a supported type: %1, supported are only: %2", type, supported_resolvables); + return nil; + } + + return resolvables_to_install[unique_ID, type]:[]; + } + + /** + * Returns list of selected resolvables of a given type + * + * @param symbol resolvable type + * @return list <string> list of resolvables + * + * @example + * GetAllResolvables (`package) -> ["list", "of", "packages"] + * // not a supported resolvable type + * GetAllResolvables (`unknown) -> nil + * + * @see supported_resolvables + */ + global list <string> GetAllResolvables (symbol type) { + if (! IsSupportedResolvableType (type)) { + y2error ("Not a supported type: %1, supported are only: %2", type, supported_resolvables); + return nil; + } + + list <string> ret = []; + + foreach (string unique_ID, map <symbol, list <string> > resolvables, resolvables_to_install, { + if (haskey (resolvables, type)) { + ret = (list <string>) union (ret, resolvables[type]:[]); + } + }); + + return ret; + } + + /** + * Return whether a unique ID is already in use. + * + * @param string unique_ID to check + * @return boolean whether the ID is not in use yet + */ + global boolean IsUniqueID (string unique_ID) { + if (unique_ID == nil || unique_ID == "") { + y2error ("Unique ID cannot be: %1", unique_ID); + return nil; + } + + return ! haskey (resolvables_to_install, unique_ID); + } + +/* EOF */ +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.35/library/packages/src/SlideShow.ycp new/yast2-2.17.37/library/packages/src/SlideShow.ycp --- old/yast2-2.17.35/library/packages/src/SlideShow.ycp 2008-09-30 09:57:49.000000000 +0200 +++ new/yast2-2.17.37/library/packages/src/SlideShow.ycp 2008-10-01 17:08:32.000000000 +0200 @@ -6,7 +6,7 @@ * Author: Stefan Hundhammer <sh(a)suse.de> * Stanislav Visnovsky <visnov(a)suse.cz> * - * $Id: SlideShow.ycp 51563 2008-09-26 08:27:31Z lslezak $ + * $Id: SlideShow.ycp 51764 2008-10-01 15:08:31Z visnov $ * * Usage: * This is a generic module for handling global progress bar with optional slideshow/release notes etc. @@ -685,6 +685,7 @@ } else { + // no tabs contents = DetailsPageWidgets(); } @@ -699,6 +700,10 @@ widgets_created = true; + // if no tabs, update the log + if( ShowingDetails() ) + RebuildDetailsView(); + if ( ! Slides::HaveSlides() && ShowingSlide() ) SwitchToDetailsView(); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.35/library/runlevel/src/Service.ycp new/yast2-2.17.37/library/runlevel/src/Service.ycp --- old/yast2-2.17.35/library/runlevel/src/Service.ycp 2008-09-30 09:57:45.000000000 +0200 +++ new/yast2-2.17.37/library/runlevel/src/Service.ycp 2008-10-03 10:11:54.000000000 +0200 @@ -8,7 +8,7 @@ * Lukas Ocilka <locilka(a)suse.cz> * Flags: Stable * - * $Id: Service.ycp 51389 2008-09-23 08:37:51Z kmachalkova $ + * $Id: Service.ycp 51794 2008-10-02 12:32:26Z mzugec $ * * Functions for service (init script) handling used by other modules. */ @@ -278,9 +278,13 @@ */ global define integer RunInitScript (string name, string param) { y2milestone("Running service initscript %1 %2", name, param); - return (integer) SCR::Execute (.target.bash, - sformat ("%2/%1 %3", name, init_d, param), - $[ "TERM" : "raw"]); + string command = sformat ("%2/%1 %3", name, init_d, param); + map<string, any> output=(map<string, any>)SCR::Execute (.target.bash_output, + command, $[ "TERM" : "raw"]); + + if (output["exit"]:-1!=0) + y2error("Error while running initscript %1 :\n%2", command, output); + return output["exit"]:-1; } @@ -520,7 +524,7 @@ /** * Return the first of the list of services which is available - * (has init script) + * (has init script) or "" if none is. * @param list<string> list of service names * @return string the first found service */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.35/library/runlevel/testsuite/tests/RunInitScript.out new/yast2-2.17.37/library/runlevel/testsuite/tests/RunInitScript.out --- old/yast2-2.17.35/library/runlevel/testsuite/tests/RunInitScript.out 2008-09-30 09:57:46.000000000 +0200 +++ new/yast2-2.17.37/library/runlevel/testsuite/tests/RunInitScript.out 2008-10-03 10:11:54.000000000 +0200 @@ -1,2 +1,2 @@ -Execute .target.bash "/etc/init.d/aaa start" $["TERM":"raw"] 0 +Execute .target.bash_output "/etc/init.d/aaa start" $["TERM":"raw"] $["exit":0] Return 0 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.35/library/runlevel/testsuite/tests/RunInitScript.ycp new/yast2-2.17.37/library/runlevel/testsuite/tests/RunInitScript.ycp --- old/yast2-2.17.35/library/runlevel/testsuite/tests/RunInitScript.ycp 2008-09-30 09:57:46.000000000 +0200 +++ new/yast2-2.17.37/library/runlevel/testsuite/tests/RunInitScript.ycp 2008-10-03 10:11:54.000000000 +0200 @@ -3,6 +3,6 @@ import "Service"; TEST (``(Service::RunInitScript ("aaa", "start")), [$[], $[], $[ - "target" : $[ "bash" : 0 ] + "target" : $[ "bash" : 0, "bash_output" : $["exit":0] ] ]], nil); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.35/library/types/src/Hostname.ycp new/yast2-2.17.37/library/types/src/Hostname.ycp --- old/yast2-2.17.35/library/types/src/Hostname.ycp 2008-09-30 09:57:46.000000000 +0200 +++ new/yast2-2.17.37/library/types/src/Hostname.ycp 2008-10-03 10:11:55.000000000 +0200 @@ -5,7 +5,7 @@ * Authors: Michal Svec <msvec(a)suse.cz> * Flags: Stable * - * $Id: Hostname.ycp 49926 2008-08-11 11:05:00Z kmachalkova $ + * $Id: Hostname.ycp 51775 2008-10-02 09:31:01Z kmachalkova $ */ { @@ -143,7 +143,16 @@ map hostname_data = (map) SCR::Execute(.target.bash_output, "hostname --fqdn"); if (hostname_data == nil || hostname_data["exit"]:-1 != 0 ) - y2error("Failed to retrieve current FQ hostname"); + { + fqhostname = (string) SCR::Read(.target.string, "/etc/HOSTNAME"); + + if ( fqhostname == "" || fqhostname == nil ) + { + //last resort (#429792) + fqhostname = "linux.site"; + } + y2warning("Using fallback hostname %1", fqhostname); + } else { fqhostname = String::FirstChunk( hostname_data["stdout"]:"", "\n"); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.35/library/wizard/src/Confirm.ycp new/yast2-2.17.37/library/wizard/src/Confirm.ycp --- old/yast2-2.17.35/library/wizard/src/Confirm.ycp 2008-09-30 09:57:46.000000000 +0200 +++ new/yast2-2.17.37/library/wizard/src/Confirm.ycp 2008-10-06 13:25:54.000000000 +0200 @@ -9,7 +9,7 @@ * * Flags: Stable * - * $Id: Confirm.ycp 50726 2008-09-05 10:07:27Z locilka $ + * $Id: Confirm.ycp 51855 2008-10-06 11:25:53Z visnov $ */ { @@ -18,6 +18,7 @@ textdomain "base"; +import "Icon"; import "Label"; import "Mode"; import "Popup"; @@ -30,12 +31,18 @@ /** * Confirm hardware detection (only in manual installation) * @param class hardware class (network cards) + * @param icon_name name of the icon. If nil, generic hardware icon will be used * @return true on continue */ -global define boolean Detection(string class) ``{ +global boolean Detection(string class, string icon_name) { if(Linuxrc::manual () != true) return true; + if( icon_name == nil ) + icon_name = "yast-hardware"; + + term icon = Icon::Image ( icon_name, $[] ); + boolean result = detection_cache[class]:nil; if (result != nil) { y2milestone ("Detection cached result: %1 -> %2", class, result); @@ -62,7 +69,7 @@ // This is in information message. Next come the // hardware class name (network cards). `HVCenter(`Label(_("YaST2 will detect the following hardware:"))), - `HVCenter(`Heading(class)), + `HVCenter(`HBox(icon, `HSpacing(0.5), `Heading(class))), `VSpacing(0.5) ))), `ButtonBox ( @@ -104,7 +111,7 @@ * might not work * @return true if running as root */ -global define boolean MustBeRoot() +global boolean MustBeRoot() { if ((integer)SCR::Read (.target.size, "/usr/bin/id") <= 0) { @@ -140,7 +147,7 @@ * * @return boolean delete selected entry */ -global define boolean DeleteSelected() { +global boolean DeleteSelected() { return Popup::YesNo( /* Popup question */ _("Really delete selected entry?") @@ -156,7 +163,7 @@ * @param string file/entry name/etc. * @return boolean delete selected entry */ -global define boolean Delete(string delete) { +global boolean Delete(string delete) { return Popup::YesNo( /* Popup question, %1 is an item to delete (or filename, etc.) */ sformat(_("Really delete '%1'?"), delete) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.35/library/wizard/src/Wizard.ycp new/yast2-2.17.37/library/wizard/src/Wizard.ycp --- old/yast2-2.17.35/library/wizard/src/Wizard.ycp 2008-09-30 09:57:46.000000000 +0200 +++ new/yast2-2.17.37/library/wizard/src/Wizard.ycp 2008-10-01 15:52:52.000000000 +0200 @@ -1065,7 +1065,7 @@ string LanguageFull = ""; string filename = sformat("%1/%2.desktop", Directory::desktopdir, file); // Do not use .yast2.desktop.v.$filename, because ini-agent reads - // all the desktop files anyway which is wasteful for setting one icon. + // all the desktop files anyway which is wasteful for setting one title. // The config is adapted from .yast2.desktop. SCR::RegisterAgent (.yast2.desktop1, `ag_ini( `IniAgent( filename, @@ -1114,6 +1114,9 @@ y2debug("Set dialog title: %1", name); SetDialogTitle( name ); + + SCR::UnregisterAgent (.yast2.desktop1); + return ( name != nil && name != ""); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.35/VERSION new/yast2-2.17.37/VERSION --- old/yast2-2.17.35/VERSION 2008-09-30 09:57:50.000000000 +0200 +++ new/yast2-2.17.37/VERSION 2008-10-06 13:35:36.000000000 +0200 @@ -1 +1 @@ -2.17.35 +2.17.37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit glibc
by root＠Hilbert.suse.de 06 Oct '08

06 Oct '08

Hello community, here is the log from the commit of package glibc checked in at Mon Oct 6 15:40:43 CEST 2008. -------- --- glibc/glibc.changes 2008-09-18 14:12:39.000000000 +0200 +++ /mounts/work_src_done/STABLE/glibc/glibc.changes 2008-09-30 09:42:03.000000000 +0200 @@ -1,0 +2,11 @@ +Tue Sep 30 09:41:01 CEST 2008 - olh(a)suse.de + +- symlink tuned libs because rpmlint is unable to handle hardlinks + +------------------------------------------------------------------- +Wed Sep 29 11:01:41 CEST 2008 - olh(a)suse.de + +- enable cpu-tuned libraries for power6 and ppc-cell-be [fate#304000,bnc#408808] +- remove -mtune G4/RS64 from CFLAGS on ppc/ppc64 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glibc.spec ++++++ --- /var/tmp/diff_new_pack.M22410/_old 2008-10-06 15:36:36.000000000 +0200 +++ /var/tmp/diff_new_pack.M22410/_new 2008-10-06 15:36:36.000000000 +0200 @@ -25,10 +25,26 @@ %define run_testsuite 0 %define disable_assert 0 %define enable_stackguard_randomization 1 +%ifarch ppc64 +# Inconsistency detected by ld.so: dl-close.c: 719: _dl_close: Assertion `map->l_init_called' failed! +# Glibc 2.8 introduced the HP_TIMING element to the rtld_global_ro struct # definition. +# If the base is built prior to power4 the loader won't have this element in +# the struct whereas the power6 libc will so there will be a disconnect +# between the size of the rtld_global_ro struct between the two and dl_close +# ends up getting called incorrectly when it's actually attempting to call a +# resolver function. This is because the GLRO() macro simply attempts to +# compute an offset and gets the wrong one. +# Building the base glibc with --with-cpu=power4 solves this problem. +# ppc32 can not default to -mcpu=power4 because it would break G3, G4 etc. +%define optimize_power 1 +%else %define optimize_power 0 -%define powerpc_optimize_cpu_power4 1 -%define powerpc_optimize_cpu_power5 1 +%endif +%define powerpc_optimize_cpu_power4 0 +%define powerpc_optimize_cpu_power5 0 %define powerpc_optimize_cpu_power6 1 +%define powerpc_optimize_cpu_power7 0 +%define powerpc_optimize_cpu_cell 1 License: BSD 3-Clause; GPL v2 or later; LGPL v2.1 or later Summary: Standard Shared Libraries (from the GNU C Library) Group: System/Libraries @@ -37,7 +53,7 @@ Provides: rtld(GNU_HASH) AutoReqProv: on Version: 2.8.90 -Release: 12 +Release: 13 %define snapshot_date 2008090419 Url: http://www.gnu.org/software/libc/libc.html PreReq: filesystem @@ -294,7 +310,6 @@ # BuildFlags="$RPM_OPT_FLAGS -U_FORTIFY_SOURCE -fno-strict-aliasing" BuildFlags="$(echo $BuildFlags | sed -e 's#-fstack-protector##' -e 's#-ffortify=[0-9]*##')" -BuildTuneFLags="" BuildCC="gcc" BuildCCplus="g++" add_ons=",libidn" @@ -323,11 +338,7 @@ %ifarch ppc ppc64 BuildFlags="$(echo $BuildFlags | sed 's#-mminimal-toc##')" %endif -%ifarch ppc -BuildTuneFLags="-mtune=G4" -%endif %ifarch ppc64 -BuildTuneFLags="-mtune=rs64" BuildCC="$BuildCC -m64" BuildCCplus="$BuildCCplus -m64" %endif @@ -368,7 +379,12 @@ # mkdir cc-nptl cd cc-nptl -configure_and_build_glibc "$BuildFlags $BuildTuneFLags" "$add_ons" +configure_and_build_glibc "$BuildFlags" \ +%if %{optimize_power} +"$add_ons,powerpc-cpu" --with-cpu=power4 +%else +"$add_ons" +%endif cd .. %ifarch ppc ppc64 # @@ -386,12 +402,21 @@ %if %{powerpc_optimize_cpu_power6} power6 \ %endif +%if %{powerpc_optimize_cpu_power7} +power7 \ +%endif ; do mkdir cc-$pcpu cd cc-$pcpu configure_and_build_glibc "$BuildFlags -mcpu=$pcpu" "$add_ons,powerpc-cpu" --with-cpu=$pcpu cd .. done +%if %{powerpc_optimize_cpu_cell} +mkdir cc-ppc-cell-be +cd cc-ppc-cell-be +configure_and_build_glibc "$BuildFlags -mcpu=cell" "$add_ons" +cd .. +%endif # optimize_power %endif # ppc ppc64 @@ -459,6 +484,12 @@ %if %{powerpc_optimize_cpu_power6} power6 \ %endif +%if %{powerpc_optimize_cpu_power7} +power7 \ +%endif +%if %{powerpc_optimize_cpu_cell} +ppc-cell-be \ +%endif ; do make install_root=${RPM_BUILD_ROOT}/$pcpu install -C cc-$pcpu mkdir -p $RPM_BUILD_ROOT/%{_lib}/$pcpu @@ -475,8 +506,11 @@ if test -d $RPM_BUILD_ROOT/%{_lib}/power4 then mkdir -p $RPM_BUILD_ROOT/%{_lib}/ppc970 - ln -v $RPM_BUILD_ROOT/%{_lib}/power4/*.so \ - $RPM_BUILD_ROOT/%{_lib}/ppc970/ + for i in $RPM_BUILD_ROOT/%{_lib}/power4/*.so ; do + b=`basename $i` + ln -vs ../power4/$b \ + $RPM_BUILD_ROOT/%{_lib}/ppc970/$b + done $my_ldconfig -n $RPM_BUILD_ROOT/%{_lib}/ppc970/ fi %endif @@ -486,8 +520,11 @@ if test -d $RPM_BUILD_ROOT/%{_lib}/power5 then mkdir -p $RPM_BUILD_ROOT/%{_lib}/power5+ - ln -v $RPM_BUILD_ROOT/%{_lib}/power5/*.so \ - $RPM_BUILD_ROOT/%{_lib}/power5+/ + for i in $RPM_BUILD_ROOT/%{_lib}/power5/*.so ; do + b=`basename $i` + ln -vs ../power5/$b \ + $RPM_BUILD_ROOT/%{_lib}/power5+/$b + done $my_ldconfig -n $RPM_BUILD_ROOT/%{_lib}/power5+/ fi %endif @@ -497,8 +534,11 @@ if test -d $RPM_BUILD_ROOT/%{_lib}/power6 then mkdir -p $RPM_BUILD_ROOT/%{_lib}/power6x - ln -v $RPM_BUILD_ROOT/%{_lib}/power6/*.so \ - $RPM_BUILD_ROOT/%{_lib}/power6x/ + for i in $RPM_BUILD_ROOT/%{_lib}/power6/*.so ; do + b=`basename $i` + ln -vs ../power6/$b \ + $RPM_BUILD_ROOT/%{_lib}/power6x/$b + done $my_ldconfig -n $RPM_BUILD_ROOT/%{_lib}/power6x/ fi %endif @@ -809,6 +849,32 @@ /%{_lib}/power6x/libthread_db-1.0.so /%{_lib}/power6x/libthread_db.so.1 %endif +%if %{powerpc_optimize_cpu_power7} +%dir %attr(0755,root,root) /%{_lib}/power7 +/%{_lib}/power7/libc-%{version}.so +/%{_lib}/power7/libc.so.6* +/%{_lib}/power7/libm-%{version}.so +/%{_lib}/power7/libm.so.6* +/%{_lib}/power7/libpthread-%{version}.so +/%{_lib}/power7/libpthread.so.0 +/%{_lib}/power7/librt-%{version}.so +/%{_lib}/power7/librt.so.1 +/%{_lib}/power7/libthread_db-1.0.so +/%{_lib}/power7/libthread_db.so.1 +%endif +%if %{powerpc_optimize_cpu_cell} +%dir %attr(0755,root,root) /%{_lib}/ppc-cell-be +/%{_lib}/ppc-cell-be/libc-%{version}.so +/%{_lib}/ppc-cell-be/libc.so.6* +/%{_lib}/ppc-cell-be/libm-%{version}.so +/%{_lib}/ppc-cell-be/libm.so.6* +/%{_lib}/ppc-cell-be/libpthread-%{version}.so +/%{_lib}/ppc-cell-be/libpthread.so.0 +/%{_lib}/ppc-cell-be/librt-%{version}.so +/%{_lib}/ppc-cell-be/librt.so.1 +/%{_lib}/ppc-cell-be/libthread_db-1.0.so +/%{_lib}/ppc-cell-be/libthread_db.so.1 +%endif # optimize_power %endif # ppc ppc64 @@ -948,6 +1014,11 @@ %{_libdir}/libdl_p.a %changelog +* Tue Sep 30 2008 olh(a)suse.de +- symlink tuned libs because rpmlint is unable to handle hardlinks +* Mon Sep 29 2008 olh(a)suse.de +- enable cpu-tuned libraries for power6 and ppc-cell-be [fate#304000,bnc#408808] +- remove -mtune G4/RS64 from CFLAGS on ppc/ppc64 * Thu Sep 18 2008 rguenther(a)suse.de - Change .comment.SuSE.OPTs to .comment.SUSE.OPTs. Also strip from crti.o and crtn.o. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0