Hello community, here is the log from the commit of package yast2-apparmor checked in at Sat Nov 29 23:23:36 CET 2008. -------- --- yast2-apparmor/yast2-apparmor.changes 2008-10-20 10:39:43.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-apparmor/yast2-apparmor.changes 2008-11-28 18:06:40.833618000 +0100 @@ -1,0 +2,11 @@ +Fri Nov 28 17:53:44 CET 2008 - kmachalkova@suse.cz + +- Removed source of UI syntax error - invalid items listing + (bnc#441510) +- Integrated jjohansen's patch for bnc#258079 (e-mail address + validation) +- Make translatable strings from Perl agents really translated (and + correctly encoded) (bnc#448390) +- 2.17.4 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-apparmor-2.17.3.tar.bz2 New: ---- yast2-apparmor-2.17.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-apparmor.spec ++++++ --- /var/tmp/diff_new_pack.r18264/_old 2008-11-29 23:23:11.000000000 +0100 +++ /var/tmp/diff_new_pack.r18264/_new 2008-11-29 23:23:11.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-apparmor (Version 2.17.3) +# spec file for package yast2-apparmor (Version 2.17.4) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,12 +20,12 @@ Url: http://forge.novell.com/modules/xfmod/project/?apparmor Name: yast2-apparmor -Version: 2.17.3 +Version: 2.17.4 Release: 1 License: GPL v2 or later Group: Productivity/Security BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-apparmor-2.17.3.tar.bz2 +Source0: yast2-apparmor-2.17.4.tar.bz2 Prefix: /usr Summary: YaST2 - Plugins for AppArmor Profile Management Requires: yast2 perl-TimeDate @@ -51,7 +51,7 @@ jmichael@suse.de %prep -%setup -n yast2-apparmor-2.17.3 +%setup -n yast2-apparmor-2.17.4 %build %{prefix}/bin/y2tool y2autoconf @@ -100,8 +100,15 @@ [ -e $REPDIR ] || mkdir -p $REPDIR [ -e $REPDIR2 ] || mkdir -p $REPDIR2 [ -e $REPDIR3 ] || mkdir -p $REPDIR3 - %changelog +* Fri Nov 28 2008 kmachalkova@suse.cz +- Removed source of UI syntax error - invalid items listing + (bnc#441510) +- Integrated jjohansen's patch for bnc#258079 (e-mail address + validation) +- Make translatable strings from Perl agents really translated (and + correctly encoded) (bnc#448390) +- 2.17.4 * Sat Oct 18 2008 aschnell@suse.de - Fixed help text (bnc #436491) - 2.17.3 @@ -158,7 +165,7 @@ - Bug #305735 Add support for network toggles, append, and locking to the YaST2 EditProfile wizard. - Bug 302588 - 1 CD KDE version fails to install apparmor-docs -* Wed Aug 22 2007 dreynolds@suse.de +* Tue Aug 21 2007 dreynolds@suse.de - Updated spec to set theme-dir based on dist (openSUSE/sles) * Mon Aug 20 2007 dreynolds@suse.de - sbeattie@suse.de @@ -175,10 +182,10 @@ * Sat Nov 18 2006 ddrewelow@suse.de - Fixed usability and reporting bugs (bnc# 158599,171082,172624,173825) -* Wed Nov 15 2006 ddrewelow@suse.de +* Tue Nov 14 2006 ddrewelow@suse.de - Added the missing complain.scr to fix: https://bugzilla.novell.com/show_bug.cgi?id=219898 -* Tue Nov 14 2006 ddrewelow@suse.de +* Mon Nov 13 2006 ddrewelow@suse.de - Fixes for notification bugs: - configuration of e-mail recipient not saved in YaST (bnc#177039) ++++++ yast2-apparmor-2.17.3.tar.bz2 -> yast2-apparmor-2.17.4.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-apparmor-2.17.3/configure new/yast2-apparmor-2.17.4/configure --- old/yast2-apparmor-2.17.3/configure 2008-08-28 18:02:23.000000000 +0200 +++ new/yast2-apparmor-2.17.4/configure 2008-11-28 16:52:08.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for yast2-apparmor 2.16.4. +# Generated by GNU Autoconf 2.61 for yast2-apparmor 2.17.1. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -574,8 +574,8 @@ # Identity of this package. PACKAGE_NAME='yast2-apparmor' PACKAGE_TARNAME='yast2-apparmor' -PACKAGE_VERSION='2.16.4' -PACKAGE_STRING='yast2-apparmor 2.16.4' +PACKAGE_VERSION='2.17.1' +PACKAGE_STRING='yast2-apparmor 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-apparmor 2.16.4 to adapt to many kinds of systems. +\`configure' configures yast2-apparmor 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-apparmor 2.16.4:";; + short | recursive ) echo "Configuration of yast2-apparmor 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-apparmor configure 2.16.4 +yast2-apparmor 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-apparmor $as_me 2.16.4, which was +It was created by yast2-apparmor $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-apparmor' - VERSION='2.16.4' + VERSION='2.17.1' cat >>confdefs.h <<_ACEOF @@ -2409,7 +2409,7 @@ -VERSION="2.16.4" +VERSION="2.17.1" RPMNAME="yast2-apparmor" MAINTAINER="Katarina Machalkova <kmachalkova@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-apparmor $as_me 2.16.4, which was +This file was extended by yast2-apparmor $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-apparmor config.status 2.16.4 +yast2-apparmor 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-apparmor-2.17.3/configure.in new/yast2-apparmor-2.17.4/configure.in --- old/yast2-apparmor-2.17.3/configure.in 2008-08-28 18:02:18.000000000 +0200 +++ new/yast2-apparmor-2.17.4/configure.in 2008-11-28 16:52:01.000000000 +0100 @@ -1,9 +1,9 @@ dnl configure.in for yast2-apparmor dnl -dnl -- This file is generated by y2autoconf 2.17.0 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-apparmor, 2.16.4, http://bugs.opensuse.org/, yast2-apparmor) +AC_INIT(yast2-apparmor, 2.17.1, http://bugs.opensuse.org/, yast2-apparmor) 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.4" +VERSION="2.17.1" RPMNAME="yast2-apparmor" MAINTAINER="Katarina Machalkova <kmachalkova@suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-apparmor-2.17.3/src/agents/ag_complain new/yast2-apparmor-2.17.4/src/agents/ag_complain --- old/yast2-apparmor-2.17.3/src/agents/ag_complain 2008-06-12 17:41:04.000000000 +0200 +++ new/yast2-apparmor-2.17.4/src/agents/ag_complain 2008-11-28 17:53:05.000000000 +0100 @@ -31,15 +31,10 @@ ################################################################################ use strict; -use Locale::gettext; -use POSIX; use ycp; use Immunix::SubDomain; -setlocale(LC_MESSAGES, ""); -textdomain("yast2-apparmor"); - our $UI_Mode = "yast-agent"; sub getProfPath ($) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-apparmor-2.17.3/src/agents/ag_genprof new/yast2-apparmor-2.17.4/src/agents/ag_genprof --- old/yast2-apparmor-2.17.3/src/agents/ag_genprof 2008-04-29 16:40:03.000000000 +0200 +++ new/yast2-apparmor-2.17.4/src/agents/ag_genprof 2008-11-28 17:53:05.000000000 +0100 @@ -15,14 +15,19 @@ use warnings; use strict; use Data::Dumper; +use Encode; use Getopt::Long; use Locale::gettext; use POSIX; use Immunix::SubDomain; -# initialize the local poo +# !hack hack hack! +# Can't use YaST _macro for marking strings +# for translation, so we need to do it Perl-way setlocale(LC_MESSAGES, ""); +my $dom = Locale::gettext->domain("yast2-apparmor"); +$dom->dir("/usr/share/YaST2/locale"); textdomain("yast2-apparmor"); setup_yast(); @@ -40,17 +45,16 @@ # tell 'em how to use it... &usage && exit if $help; - my $sd_mountpoint = check_for_subdomain(); unless($sd_mountpoint) { - fatal_error(gettext("SubDomain does not appear to be started. Please enable SubDomain and try again.")); + fatal_error( decode("utf8", gettext("SubDomain does not appear to be started. Please enable SubDomain and try again."))); } # let's convert it to full path... $profiledir = get_full_path($profiledir); unless(-d $profiledir) { - fatal_error(sprintf(gettext("Can't find subdomain profiles in %s."), $profiledir)); + fatal_error( decode("utf8", sprintf(gettext("Can't find subdomain profiles in %s."), $profiledir))); } # what are we profiling? @@ -62,18 +66,18 @@ my $f = { description => -gettext("This wizard will help you create a new AppArmor security +decode( "utf8", gettext("This wizard will help you create a new AppArmor security profile for an application, or you can use it to enhance an existing profile by allowing AppArmor to learn new application behavior. Please enter the application name for which you would like to create a profile, or select Browse to find the -application on your system."), - file_label => gettext("&Application to Profile"), - okay_label => gettext("&Create"), - cancel_label => gettext("&Abort"), - browse_desc => gettext("Select Program to Profile"), +application on your system.") ), + file_label => decode("utf8", gettext("&Application to Profile")), + okay_label => decode("utf8", gettext("&Create")), + cancel_label => decode ("utf8", gettext("&Abort")), + browse_desc => decode("utf8", gettext("Select Program to Profile")), }; my $profiling = UI_GetFile( $f ); @@ -92,18 +96,18 @@ chomp($fqdbin); unless(-x $fqdbin) { - UI_Important(gettext("The specified file is not executable. + UI_Important( decode("utf8", gettext("The specified file is not executable. Please enter an application name to continue generating a profile or press -Abort to cancel this wizard.")); +Abort to cancel this wizard."))); } } elsif(-d $profiling) { - UI_Important(gettext("The specified pathname is a directory. + UI_Important( decode("utf8", gettext("The specified pathname is a directory. Please enter an application name to continue generating a profile or press -Abort to cancel this wizard.")); +Abort to cancel this wizard."))); } else { if($profiling !~ /\//) { my $which = which($profiling); @@ -113,22 +117,22 @@ } unless(-f $fqdbin) { - UI_Important(gettext("The specified file does not exist. + UI_Important( decode("utf8", gettext("The specified file does not exist. Please enter an application name to continue generating a profile or press -Abort to cancel this wizard.")); +Abort to cancel this wizard."))); } } } else { # they hit okay without entering anything - UI_Important(gettext("You have not entered or selected an + UI_Important( decode("utf8", gettext("You have not entered or selected an application to profile. Please enter an application name to continue generating a profile or press -Abort to cancel this wizard.")); +Abort to cancel this wizard."))); } } until($fqdbin && -x $fqdbin); @@ -170,8 +174,8 @@ } my $q = { }; - $q->{headers} = [ gettext("Profiling"), $fqdbin ]; - $q->{explanation} = gettext("Please start the application to be profiled in + $q->{headers} = [ decode("utf8", gettext("Profiling")), $fqdbin ]; + $q->{explanation} = decode("utf8", gettext("Please start the application to be profiled in another window and exercise its functionality now. Once completed, select the 'Scan' option below in @@ -179,7 +183,7 @@ For each AppArmor event, you will be given the opportunity to choose whether the access should be -allowed or denied."); +allowed or denied.")); $q->{functions} = [ "CMD_SCAN", "CMD_FINISHED" ]; $q->{default} = "CMD_SCAN"; @@ -195,7 +199,7 @@ } else { # make them confirm the exit command - my $ans = UI_YesNo(gettext("Are you sure you want to exit?"), "n"); + my $ans = UI_YesNo( decode("utf8", gettext("Are you sure you want to exit?")), "n"); if($ans eq "y") { $done_profiling = 1; } @@ -218,8 +222,8 @@ } } -UI_Info(gettext("Reloaded SubDomain profiles in enforce mode.")); -UI_Info(sprintf(gettext('Finished generating profile for %s.'), $fqdbin)); +UI_Info(decode("utf8", gettext("Reloaded SubDomain profiles in enforce mode."))); +UI_Info(decode("utf8", sprintf(gettext('Finished generating profile for %s.'), $fqdbin))); shutdown_yast(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-apparmor-2.17.3/src/agents/ag_logparse new/yast2-apparmor-2.17.4/src/agents/ag_logparse --- old/yast2-apparmor-2.17.3/src/agents/ag_logparse 2008-04-29 16:40:03.000000000 +0200 +++ new/yast2-apparmor-2.17.4/src/agents/ag_logparse 2008-11-28 17:53:05.000000000 +0100 @@ -39,6 +39,9 @@ use Immunix::Reports; +#FIXME: I don't know whether localizable strings +#from this agent are visible somewhere in UI, so possibly +#gettext include could be removed setlocale(LC_MESSAGES, ""); textdomain("yast2-apparmor"); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-apparmor-2.17.3/src/agents/ag_logprof new/yast2-apparmor-2.17.4/src/agents/ag_logprof --- old/yast2-apparmor-2.17.3/src/agents/ag_logprof 2008-04-29 16:40:03.000000000 +0200 +++ new/yast2-apparmor-2.17.4/src/agents/ag_logprof 2008-11-28 17:53:05.000000000 +0100 @@ -15,8 +15,6 @@ use strict; use Data::Dumper; use Getopt::Long; -use Locale::gettext; -use POSIX; use Immunix::SubDomain; @@ -25,10 +23,6 @@ exit 0; } -# initialize the local poo -setlocale(LC_MESSAGES, ""); -textdomain("yast2-apparmor"); - setup_yast(); # options variables diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-apparmor-2.17.3/src/agents/ag_reports_confined new/yast2-apparmor-2.17.4/src/agents/ag_reports_confined --- old/yast2-apparmor-2.17.3/src/agents/ag_reports_confined 2008-04-29 16:40:03.000000000 +0200 +++ new/yast2-apparmor-2.17.4/src/agents/ag_reports_confined 2008-11-28 17:53:05.000000000 +0100 @@ -14,6 +14,9 @@ use POSIX; use ycp; +#FIXME: I don't know whether localizable strings +#from this agent are visible somewhere in UI, so possibly +#gettext include could be removed setlocale(LC_MESSAGES, ""); textdomain("yast2-apparmor"); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-apparmor-2.17.3/src/agents/ag_reports_sched new/yast2-apparmor-2.17.4/src/agents/ag_reports_sched --- old/yast2-apparmor-2.17.3/src/agents/ag_reports_sched 2008-04-29 16:40:03.000000000 +0200 +++ new/yast2-apparmor-2.17.4/src/agents/ag_reports_sched 2008-11-28 18:01:23.000000000 +0100 @@ -42,6 +42,9 @@ use Immunix::Reports; +#FIXME:gettext is used in this agent but could be as well dropped +#as the translatable messages go into y2log only, so it does +#not hurt if they are not localized setlocale(LC_MESSAGES, ""); textdomain("yast2-apparmor"); @@ -633,7 +636,7 @@ my $db = undef; - if ( $args->{'name'} =~ /Edit\s+(\w.+)\s+Sched/ ) { + if ( defined( $args->{'name'}) && $args->{'name'} =~ /Edit\s+(\w.+)\s+Sched/ ) { $args->{'name'} = $1; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-apparmor-2.17.3/src/agents/ag_sd_config new/yast2-apparmor-2.17.4/src/agents/ag_sd_config --- old/yast2-apparmor-2.17.3/src/agents/ag_sd_config 2008-04-29 16:40:03.000000000 +0200 +++ new/yast2-apparmor-2.17.4/src/agents/ag_sd_config 2008-11-28 17:53:05.000000000 +0100 @@ -17,15 +17,10 @@ use strict; use ycp; use Data::Dumper; -use Locale::gettext; -use POSIX; use Immunix::Notify; use Immunix::Reports; -setlocale(LC_MESSAGES, ""); -textdomain("yast2-apparmor"); - # Subroutines ################################################################################ sub setSubdomain { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-apparmor-2.17.3/src/agents/ag_subdomain new/yast2-apparmor-2.17.4/src/agents/ag_subdomain --- old/yast2-apparmor-2.17.3/src/agents/ag_subdomain 2008-06-10 13:14:44.000000000 +0200 +++ new/yast2-apparmor-2.17.4/src/agents/ag_subdomain 2008-11-28 17:53:05.000000000 +0100 @@ -20,14 +20,9 @@ use strict; use ycp; use Data::Dumper; -use Locale::gettext; -use POSIX; use Immunix::Notify; use Immunix::SubDomain; -setlocale(LC_MESSAGES, ""); -textdomain("yast2-apparmor"); - # Subroutines ################################################################################ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-apparmor-2.17.3/src/include/subdomain/apparmor_ycp_utils.ycp new/yast2-apparmor-2.17.4/src/include/subdomain/apparmor_ycp_utils.ycp --- old/yast2-apparmor-2.17.3/src/include/subdomain/apparmor_ycp_utils.ycp 2008-05-15 18:05:43.000000000 +0200 +++ new/yast2-apparmor-2.17.4/src/include/subdomain/apparmor_ycp_utils.ycp 2008-11-28 16:49:22.000000000 +0100 @@ -93,6 +93,16 @@ return isSafe; } +define boolean checkEmailAddress( string emailAddr ) { + + if ( ! validEmailAddress( emailAddr, false ) ) { + string err_email_format = _("Email address format invalid.\nEmail address must be less than 129 characters \n and of the format \"name@domain\". \n Please enter another address."); + Popup::Error( err_email_format ); + return false; + } + return true; +} + /** UI_RepositorySignInDialog * Dialog to allow users to signin or register with an external AppArmor @@ -255,9 +265,8 @@ Popup::Error( _("Password is required for registration." )); } else if ( password != password_verify ) { Popup::Error( _("Passwords do not match. Please re-enter." )); - } else if ( ! validEmailAddress( email, false ) ) { - string err_email_format = _("Email address format invalid.\nEmail address must be less than 129 characters \n and of the format \"name@domain\". \n Please enter another address."); - Popup::Error( err_email_format ); + } else if ( ! checkEmailAddress( email ) ) { + any dummy = nil; } else { y2milestone( "APPARMOR : REPO - new registration: \n\tusername [" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-apparmor-2.17.3/src/include/subdomain/reporting_dialogues.ycp new/yast2-apparmor-2.17.4/src/include/subdomain/reporting_dialogues.ycp --- old/yast2-apparmor-2.17.3/src/include/subdomain/reporting_dialogues.ycp 2008-06-11 15:11:44.000000000 +0200 +++ new/yast2-apparmor-2.17.4/src/include/subdomain/reporting_dialogues.ycp 2008-11-28 17:53:05.000000000 +0100 @@ -1644,18 +1644,18 @@ `VSpacing(1), `HBox( `ComboBox(`id(`monthdate), `opt(`notify), _("Day of Month"), [ - `item(`id(`md_00)), _("All"), - `item(`id(`md_01)), "1", `item(`id(`md_02)), "2", `item(`id(`md_03)), "3", - `item(`id(`md_04)), "4", `item(`id(`md_05)), "5", `item(`id(`md_06)), "6", - `item(`id(`md_07)), "7", `item(`id(`md_08)), "8", `item(`id(`md_09)), "9", - `item(`id(`md_10)), "10", `item(`id(`md_11)), "11", `item(`id(`md_12)), "12", - `item(`id(`md_13)), "13", `item(`id(`md_14)), "14", `item(`id(`md_15)), "15", - `item(`id(`md_16)), "16", `item(`id(`md_17)), "17", `item(`id(`md_18)), "18", - `item(`id(`md_19)), "19", `item(`id(`md_20)), "20", `item(`id(`md_21)), "21", - `item(`id(`md_22)), "22", `item(`id(`md_23)), "23", `item(`id(`md_24)), "24", - `item(`id(`md_25)), "25", `item(`id(`md_26)), "26", `item(`id(`md_27)), "27", - `item(`id(`md_28)), "28", `item(`id(`md_29)), "29", `item(`id(`md_30)), "30", - `item(`id(`md_31)), "31" ]), + `item(`id(`md_00), _("All")), + `item(`id(`md_01), "1"), `item(`id(`md_02), "2"), `item(`id(`md_03), "3"), + `item(`id(`md_04), "4"), `item(`id(`md_05), "5"), `item(`id(`md_06), "6"), + `item(`id(`md_07), "7"), `item(`id(`md_08), "8"), `item(`id(`md_09), "9"), + `item(`id(`md_10), "10"), `item(`id(`md_11), "9"), `item(`id(`md_12), "12"), + `item(`id(`md_13), "13"), `item(`id(`md_14), "14"), `item(`id(`md_15), "15"), + `item(`id(`md_16), "16"), `item(`id(`md_17), "17"), `item(`id(`md_18), "18"), + `item(`id(`md_19), "19"), `item(`id(`md_20), "20"), `item(`id(`md_21), "21"), + `item(`id(`md_22), "22"), `item(`id(`md_23), "23"), `item(`id(`md_24), "24"), + `item(`id(`md_25), "25"), `item(`id(`md_26), "26"), `item(`id(`md_27), "27"), + `item(`id(`md_28), "28"), `item(`id(`md_29), "29"), `item(`id(`md_30), "30"), + `item(`id(`md_31), "31") ]), `ComboBox(`id(`weekday), `opt(`notify), _("Day of Week"), [ _("All"), _("Sun"), _("Mon"), _("Tue"), _("Wed"), _("Thu"), _("Fri"), _("Sat") ]), @@ -2417,7 +2417,7 @@ break; } else if ( id == `add ) { addSchedForm(); - //Wizard::SetContentsButtons( _("AppArmor Security Event Report"), schedForm, mainHelp, "Back", Label::NextButton() ); + Wizard::SetContentsButtons( _("AppArmor Security Event Report"), schedForm, mainHelp, Label::BackButton(), Label::NextButton() ); updateSched(); continue; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-apparmor-2.17.3/src/include/subdomain/sd-config.ycp new/yast2-apparmor-2.17.4/src/include/subdomain/sd-config.ycp --- old/yast2-apparmor-2.17.3/src/include/subdomain/sd-config.ycp 2008-05-09 11:18:07.000000000 +0200 +++ new/yast2-apparmor-2.17.4/src/include/subdomain/sd-config.ycp 2008-11-28 16:49:22.000000000 +0100 @@ -10,30 +10,11 @@ { include "subdomain/config_complain.ycp"; include "subdomain/event_notification_helptext.ycp"; +include "subdomain/apparmor_ycp_utils.ycp"; textdomain "yast2-apparmor"; import "Label"; -define boolean safeFormat (string emailAddr) { - - boolean isSafe = false; - integer emailAddrLength = size(emailAddr); - - // Allow only name@host formats - if ( emailAddrLength > 128 ) { - Popup::Error( _("Email address is too long. Please enter another address.") ); - } else if ( ! regexpmatch(emailAddr, "..+") && - regexpmatch(emailAddr, "/^(\w+\.?)+\w+\@(\w+\.?)+\w+$") ) { - isSafe = true; - } else if ( regexpmatch(emailAddr, "\\w+@\\w+") ) { - isSafe = true; - } else { - Popup::Error( _("Error in email address format. Please use \"name@host\" format.") ); - } - - return isSafe; -} - define boolean changeAppArmorState(boolean aaEnabled) { any error = nil; @@ -214,7 +195,7 @@ if ( t_email == nil || t_email == "" ) { Popup::Error( _("An email address is required for each selected notification method.") ); continue; - } else if ( ! safeFormat(t_email) ) { + } else if ( ! checkEmailAddress( t_email ) ) { continue; } @@ -240,7 +221,7 @@ if ( s_email == nil || s_email == "" ) { Popup::Error( _("An email address is required for each selected notification method.") ); continue; - } else if ( ! safeFormat(s_email) ) { + } else if ( ! checkEmailAddress(s_email) ) { continue; } @@ -265,7 +246,7 @@ if ( v_email == nil || v_email == "" ) { Popup::Error( _("An email address is required for each selected notification method.") ); continue; - } else if (! safeFormat(v_email) ) { + } else if (! checkEmailAddress(v_email) ) { continue; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-apparmor-2.17.3/src/perl/Notify.pm new/yast2-apparmor-2.17.4/src/perl/Notify.pm --- old/yast2-apparmor-2.17.3/src/perl/Notify.pm 2008-04-29 16:40:03.000000000 +0200 +++ new/yast2-apparmor-2.17.4/src/perl/Notify.pm 2008-11-28 16:49:22.000000000 +0100 @@ -66,9 +66,8 @@ my $safeFormat = 0; if ( $emailAddr && (length($emailAddr) < 129) ) { - #if ( $emailAddr =~ /^\w+[\.\w]+\@[\w+\.]+\w+$/ || - if ( $emailAddr =~ /^(\w+\.?)+\w+\@(\w+\.?)+\w+$/ || + if ( $emailAddr =~ /^([\w\+-]+\.?)*[\w\+-]+\@(\w+\.?)*\w+$/ || $emailAddr =~ /^\/var\/mail\/\w+$/ ) { $safeFormat = 1; } else { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-apparmor-2.17.3/VERSION new/yast2-apparmor-2.17.4/VERSION --- old/yast2-apparmor-2.17.3/VERSION 2008-10-20 10:35:42.000000000 +0200 +++ new/yast2-apparmor-2.17.4/VERSION 2008-11-28 18:01:20.000000000 +0100 @@ -1 +1 @@ -2.17.3 +2.17.4 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org