Hello community,
here is the log from the commit of package yast2-apparmor for openSUSE:Factory
checked in at Wed Oct 5 17:48:46 CEST 2011.
--------
--- openSUSE:Factory/yast2-apparmor/yast2-apparmor.changes 2011-09-23
12:53:05.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-apparmor/yast2-apparmor.changes
2011-10-05 14:58:33.000000000 +0200
@@ -1,0 +2,15 @@
+Fri Sep 30 11:57:42 UTC 2011 - jsrain@site
+
+- fixed enabling/disabling apparmor
+- fixed setting notifications (and enabling aaeventsd as part of
+ global switch only)
+- prevent profile generator from failing immediately
+- prevent window from disappearing when starting a module
+- don't close the module after running a report (bnc#531512)
+- run the dialog to select application for profiling without
+ pop-up (bnc#531512)
+- disabled Reports part due to changes in AppArmor
+- merged editation and deleting of a profile
+- 2.21.5
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-apparmor-2.21.4.tar.bz2
New:
----
yast2-apparmor-2.21.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-apparmor.spec ++++++
--- /var/tmp/diff_new_pack.RCFGAT/_old 2011-10-05 17:48:39.000000000 +0200
+++ /var/tmp/diff_new_pack.RCFGAT/_new 2011-10-05 17:48:39.000000000 +0200
@@ -19,16 +19,16 @@
Name: yast2-apparmor
-Version: 2.21.4
+Version: 2.21.5
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-apparmor-2.21.4.tar.bz2
+Source0: yast2-apparmor-2.21.5.tar.bz2
Prefix: /usr
Group: Productivity/Security
-License: GPL v2 or later
+License: GPL-2.0+
Summary: YaST2 - Plugins for AppArmor Profile Management
Requires: yast2 perl-TimeDate
@@ -53,7 +53,7 @@
SubDomain.
%prep
-%setup -n yast2-apparmor-2.21.4
+%setup -n yast2-apparmor-2.21.5
%build
%{prefix}/bin/y2tool y2autoconf
@@ -93,7 +93,7 @@
/usr/lib/YaST2/servers_non_y2
%dir %{perl_vendorlib}/Immunix
%{perl_vendorlib}/Immunix/Notify.pm
-# license is questionable, PDB says GPL v2 or later
+# license is questionable, PDB says GPL-2.0+
#%doc COPYING.LGPL
%dir %attr(-,root,root) /etc/apparmor
%config(noreplace) /etc/apparmor/reports.crontab
++++++ yast2-apparmor-2.21.4.tar.bz2 -> yast2-apparmor-2.21.5.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-apparmor-2.21.4/VERSION
new/yast2-apparmor-2.21.5/VERSION
--- old/yast2-apparmor-2.21.4/VERSION 2011-09-22 14:42:05.000000000 +0200
+++ new/yast2-apparmor-2.21.5/VERSION 2011-10-05 14:59:40.000000000 +0200
@@ -1 +1 @@
-2.21.4
+2.21.5
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-apparmor-2.21.4/configure
new/yast2-apparmor-2.21.5/configure
--- old/yast2-apparmor-2.21.4/configure 2011-09-22 14:46:20.000000000 +0200
+++ new/yast2-apparmor-2.21.5/configure 2011-10-05 15:03:16.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for yast2-apparmor 2.21.4.
+# Generated by GNU Autoconf 2.68 for yast2-apparmor 2.21.5.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-apparmor'
PACKAGE_TARNAME='yast2-apparmor'
-PACKAGE_VERSION='2.21.4'
-PACKAGE_STRING='yast2-apparmor 2.21.4'
+PACKAGE_VERSION='2.21.5'
+PACKAGE_STRING='yast2-apparmor 2.21.5'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
PACKAGE_URL=''
@@ -1230,7 +1230,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.21.4 to adapt to many kinds of
systems.
+\`configure' configures yast2-apparmor 2.21.5 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1301,7 +1301,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-apparmor 2.21.4:";;
+ short | recursive ) echo "Configuration of yast2-apparmor 2.21.5:";;
esac
cat <<\_ACEOF
@@ -1381,7 +1381,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-apparmor configure 2.21.4
+yast2-apparmor configure 2.21.5
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1398,7 +1398,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.21.4, which was
+It was created by yast2-apparmor $as_me 2.21.5, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2328,7 +2328,7 @@
# Define the identity of the package.
PACKAGE='yast2-apparmor'
- VERSION='2.21.4'
+ VERSION='2.21.5'
cat >>confdefs.h <<_ACEOF
@@ -2450,7 +2450,7 @@
-VERSION="2.21.4"
+VERSION="2.21.5"
RPMNAME="yast2-apparmor"
MAINTAINER="Katarina Machalkova <[email protected]>"
@@ -3383,7 +3383,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.21.4, which was
+This file was extended by yast2-apparmor $as_me 2.21.5, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3436,7 +3436,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-yast2-apparmor config.status 2.21.4
+yast2-apparmor config.status 2.21.5
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-apparmor-2.21.4/configure.in
new/yast2-apparmor-2.21.5/configure.in
--- old/yast2-apparmor-2.21.4/configure.in 2011-09-22 14:46:17.000000000
+0200
+++ new/yast2-apparmor-2.21.5/configure.in 2011-10-05 15:03:14.000000000
+0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-apparmor, 2.21.4, http://bugs.opensuse.org/, yast2-apparmor)
+AC_INIT(yast2-apparmor, 2.21.5, 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.21.4"
+VERSION="2.21.5"
RPMNAME="yast2-apparmor"
MAINTAINER="Katarina Machalkova <[email protected]>"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-apparmor-2.21.4/src/agents/ag_aa_config
new/yast2-apparmor-2.21.5/src/agents/ag_aa_config
--- old/yast2-apparmor-2.21.4/src/agents/ag_aa_config 2011-09-20
10:09:59.000000000 +0200
+++ new/yast2-apparmor-2.21.5/src/agents/ag_aa_config 2011-09-26
15:09:02.000000000 +0200
@@ -19,7 +19,6 @@
use Data::Dumper;
use Immunix::Notify;
-use Immunix::Reports;
# Subroutines
################################################################################
@@ -50,6 +49,10 @@
system("/sbin/insserv aaeventd");
}
} else {
+ if (-f "/etc/init.d/aaeventd") {
+ system("/sbin/rcaaeventd stop");
+ system("/sbin/insserv -r aaeventd");
+ }
if (-e "/sbin/rcapparmor") {
open(RUN, "/sbin/rcapparmor stop 2>&1 |");
} else {
@@ -66,10 +69,6 @@
} else {
system("/sbin/insserv -r boot.apparmor");
}
- if (-f "/etc/init.d/aaeventd") {
- system("/sbin/rcaaeventd stop");
- system("/sbin/insserv -r aaeventd");
- }
}
return $errmsg;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-apparmor-2.21.4/src/agents/ag_genprof
new/yast2-apparmor-2.21.5/src/agents/ag_genprof
--- old/yast2-apparmor-2.21.4/src/agents/ag_genprof 2011-09-20
10:09:59.000000000 +0200
+++ new/yast2-apparmor-2.21.5/src/agents/ag_genprof 2011-09-27
10:35:06.000000000 +0200
@@ -19,6 +19,7 @@
use Getopt::Long;
use Locale::gettext;
use POSIX;
+use Immunix::AppArmor;
# define textdomain so that y2makepot does not complain ..
textdomain("yast2-apparmor");
@@ -63,7 +64,7 @@
# tell 'em how to use it...
&usage && exit if $help;
-my $aa_mountpoint = check_for_apparmor();
+my $aa_mountpoint = Immunix::AppArmor::check_for_apparmor();
unless($aa_mountpoint) {
fatal_error( __("AppArmor does not appear to be started. Please enable
AppArmor and try again."));
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-apparmor-2.21.4/src/clients/AA_EditProfile.ycp
new/yast2-apparmor-2.21.5/src/clients/AA_EditProfile.ycp
--- old/yast2-apparmor-2.21.4/src/clients/AA_EditProfile.ycp 2011-09-20
10:10:00.000000000 +0200
+++ new/yast2-apparmor-2.21.5/src/clients/AA_EditProfile.ycp 2011-09-30
13:55:07.000000000 +0200
@@ -19,34 +19,44 @@
// Globalz
+map profiles = nil;
+
+define any Reread() {
+ profiles = (map) SCR::Read (.apparmor_profiles, "all");
+ return `next;
+}
define any MainSequence() ``{
//
// Read the profiles from the SCR agent
- map profiles = (map) SCR::Read (.apparmor_profiles, "all");
+ Reread();
map aliases = $[
"showProfile" :
``(DisplayProfileForm(Settings["CURRENT_PROFILE"]:"", false)),
"showHat" :
``(DisplayProfileForm(Settings["CURRENT_HAT"]:"", true)),
"chooseProfile" : ``(SelectProfileForm(profiles, _("Please make a
selection from the listed profiles and press Next to edit the profile."),
_("Edit Profile - Choose profile to edit"), "apparmor_edit_profile" )),
-
+ "reread" : ``(Reread()),
];
map sequence = $[
"ws_start" : "chooseProfile",
"chooseProfile" : $[
`abort : `abort,
- `next : "showProfile",
- `finish : `next,
+ `edit : "showProfile",
+ `reread : "reread",
+ `next : `next,
],
"showProfile" : $[
`abort : `abort,
- `next : `ws_finish,
+ `next : "reread",
`showhat : "showHat",
`finish : `next,
],
+ "reread" : $[
+ `next : "chooseProfile",
+ ],
"showHat" : $[
`abort : `abort,
`next : "showProfile",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-apparmor-2.21.4/src/clients/AA_Report.ycp
new/yast2-apparmor-2.21.5/src/clients/AA_Report.ycp
--- old/yast2-apparmor-2.21.4/src/clients/AA_Report.ycp 2011-09-20
10:10:00.000000000 +0200
+++ new/yast2-apparmor-2.21.5/src/clients/AA_Report.ycp 2011-09-29
11:16:56.000000000 +0200
@@ -59,7 +59,7 @@
"runReport": $[
`back : `back,
`abort : `abort,
- `next : `finish,
+ `next : "schedReport",
`finish : `ws_finish
],
"configreport" : $[
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-apparmor-2.21.4/src/clients/GenProf.ycp
new/yast2-apparmor-2.21.5/src/clients/GenProf.ycp
--- old/yast2-apparmor-2.21.4/src/clients/GenProf.ycp 2011-09-20
10:10:00.000000000 +0200
+++ new/yast2-apparmor-2.21.5/src/clients/GenProf.ycp 2011-09-29
14:41:45.000000000 +0200
@@ -287,37 +287,32 @@
`VSpacing(`opt(`vstretch), 0.25)
)
),
- `HBox( `HCenter(`PushButton(`id(`browse),
_("&Browse")))),
- `HBox(
- `HSpacing(`opt(`hstretch), 0.1),
- `HCenter(`PushButton(`id(`okay), `opt(`default),
okay_label)),
- `HCenter(`PushButton(`id(`cancel), cancel_label)),
- `HSpacing(`opt(`hstretch), 0.1),
- `VSpacing(1)
- )
+ `HBox( `HCenter(`PushButton(`id(`browse), _("&Browse"))))
);
- UI::OpenDialog(dialog);
+ string helptext = _("<p><h1>Application to Profile</h1>
+Select the application which you want to profile. Afterwards, when you run the
application, AppArmor will collect
+information about system resources it accesses.</p>");;
+ Wizard::SetContentsButtons(_("Application to Profile"), dialog,
helptext, Label::BackButton(), Label::NextButton());
map<string,string> answers = $[ ];
- any poo = false;
+ any ret = false;
repeat {
UI::SetFocus(`id(`filename));
- poo = UI::UserInput();
- if(poo == `okay) {
+ ret = UI::UserInput();
+ y2internal ("Poo: %1", ret);
+ if(ret == `next) {
answers["answer"] = "okay";
answers["filename"] = (string) UI::QueryWidget(`id(`filename),
`Value);
- } else if(poo == `cancel) {
+ } else if(ret == `cancel || ret == `abort || ret == `back) {
answers["answer"] = "cancel";
- } else if ( poo == `browse ) {
+ } else if ( ret == `browse ) {
string selectfilename = UI::AskForExistingFile( "/", "",
browse_desc);
UI::ChangeWidget(`id(`filename), `Value, selectfilename);
}
- } until ((poo == `okay) || (poo == `cancel));
-
- UI::CloseDialog();
+ } until ((ret == `next) || (ret == `cancel)|| ret == `abort || ret ==
`back);
// tell the backend what they picked
boolean written = SCR::Write(.genprof, answers);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-apparmor-2.21.4/src/clients/apparmor.ycp
new/yast2-apparmor-2.21.5/src/clients/apparmor.ycp
--- old/yast2-apparmor-2.21.4/src/clients/apparmor.ycp 2011-09-20
10:10:00.000000000 +0200
+++ new/yast2-apparmor-2.21.5/src/clients/apparmor.ycp 2011-09-30
13:39:56.000000000 +0200
@@ -29,10 +29,12 @@
`item(`id("apparmor-settings"), _("Settings"), true),
`item(`id("GenProf"), _("Generate Profile")),
`item(`id("LogProf"), _("Update Profile")),
- `item(`id("AA_Report"), _("Reports")),
- `item(`id("AA_EditProfile"), _("Edit Profile")),
- `item(`id("AA_AddProfile"), _("Add Manually Profile")),
- `item(`id("AA_DeleteProfile"), _("Delete Profile"))
+// disabled, since aa-eventd was removed from main AA package
+// and so was Reports.pm
+// `item(`id("AA_Report"), _("Reports")),
+ `item(`id("AA_EditProfile"), _("Manage Existing Profiles")),
+ `item(`id("AA_AddProfile"), _("Add Manually Profile"))//,
+// merged with EditProfile `item(`id("AA_DeleteProfile"), _("Delete
Profile"))
]),
`VSpacing(3)
),
@@ -41,7 +43,7 @@
);
Wizard::CreateDialog();
- Wizard::SetDesktopIcon("apparmor");
+ Wizard::SetDesktopTitleAndIcon("apparmor");
Wizard::SetContentsButtons(caption, contents, help,
Label::BackButton(), /* Label::FinishButton() */ _("&Launch"));
@@ -80,12 +82,13 @@
y2debug("launch=%1", launch);
}
- UI::CloseDialog();
-
if(ret == `next)
- return WFM::CallFunction(launch, WFM::Args());
+ ret = WFM::CallFunction(launch, WFM::Args());
else
- return `back;
+ ret = `back;
+
+ UI::CloseDialog();
+ return ret;
}
any ret = nil;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-apparmor-2.21.4/src/include/apparmor/aa-config.ycp
new/yast2-apparmor-2.21.5/src/include/apparmor/aa-config.ycp
--- old/yast2-apparmor-2.21.4/src/include/apparmor/aa-config.ycp
2011-09-20 10:10:06.000000000 +0200
+++ new/yast2-apparmor-2.21.5/src/include/apparmor/aa-config.ycp
2011-09-30 09:19:17.000000000 +0200
@@ -341,7 +341,8 @@
`HSpacing( `opt(`hstretch), 4 ),
`VBox(
`VSpacing(1),
- `Frame ( _("Security Event
Notification"),
+// event notification disabled due to changes in AppArmor
+/* `Frame ( _("Security Event
Notification"),
`HBox(
`VSpacing(1),
`HSpacing(1),
`HVCenter( `Label(
`id(`notifyLabel), evEnStr )),
@@ -350,7 +351,7 @@
)
),
`VSpacing(1), `HSpacing(20),
-
+*/
`Frame ( _("Configure Profile
Modes"),
`HBox(
`VSpacing(1), `HSpacing(1),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-apparmor-2.21.4/src/include/apparmor/profile_dialogs.ycp
new/yast2-apparmor-2.21.5/src/include/apparmor/profile_dialogs.ycp
--- old/yast2-apparmor-2.21.4/src/include/apparmor/profile_dialogs.ycp
2011-09-20 10:10:06.000000000 +0200
+++ new/yast2-apparmor-2.21.5/src/include/apparmor/profile_dialogs.ycp
2011-09-30 13:38:54.000000000 +0200
@@ -1088,6 +1088,10 @@
// Settings["PROFILE_MAP"]: map containing the profile
//
define symbol SelectProfileForm( map profiles, string formhelp, string
formtitle, string iconname ) {
+ // TODO switch to variable in a module
+ // TODO plain reread does not work here
+ SCR::UnmountAgent (.apparmor_profiles);
+ profiles = (map) SCR::Read (.apparmor_profiles, "all");
list<term> profilelisting = [];
integer indx = 0;
foreach( string p, any ignore, (map<string,any>) profiles, {
@@ -1099,8 +1103,14 @@
`VBox(
`VSpacing(2),
`SelectionBox( `id(`profilelist), `opt(`notify), _("Profile Name"),
profilelisting ),
- `VSpacing(3)
- );
+ `VSpacing(3),
+ `HBox (
+ `PushButton (`id (`edit), Label::EditButton()),
+ `PushButton (`id (`delete), Label::DeleteButton()),
+ `HStretch()
+ )
+
+ );
//
// Create the Dialog Window and parse user input
@@ -1116,8 +1126,8 @@
{
event = UI::WaitForEvent( timeout_millisec );
id = event["ID"]:nil; // We'll need this often - cache it
- if ( id == `next || id == `profilelist ) {
- profilename = tostring( UI::QueryWidget(`id(`profilelist),
`CurrentItem) );
+ profilename = tostring( UI::QueryWidget(`id(`profilelist),
`CurrentItem) );
+ if ( id == `edit ) {
if ( profilename != nil && profilename != "" ) {
break;
} else {
@@ -1125,6 +1135,18 @@
continue;
}
} // TODO ELSE POPUP NO ENTRY SELECTED ERROR
+ else if ( id == `delete ) {
+ if (Popup::YesNoHeadline( _("Delete profile confirmation"),
+ _("Are you sure you want to delete the profile ") +
profilename +
+ _(" ?\nAfter this operation the AppArmor module will reload
the profile set.") ) )
+ {
+ y2milestone("Deleted " + profilename );
+ boolean result = SCR::Write(.apparmor_profiles.delete,
profilename);
+ any result2 = SCR::Write(.apparmor_profiles.reload, "-");
+ }
+ id = `reread;
+ break;
+ }
if(id == `abort || id == `cancel) {
break;
} else if(id == `back) {
@@ -1134,10 +1156,9 @@
continue;
}
}
- if ( id == `next || id == `profilelist) {
+ if ( id == `edit ) {
Settings["CURRENT_PROFILE"] = profilename;
Settings["PROFILE_MAP"] = profiles[profilename]:nil;
- id = `next;
}
UI::CloseDialog();
return (symbol) id;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-apparmor-2.21.4/src/perl/Notify.pm
new/yast2-apparmor-2.21.5/src/perl/Notify.pm
--- old/yast2-apparmor-2.21.4/src/perl/Notify.pm 2011-09-20
10:10:00.000000000 +0200
+++ new/yast2-apparmor-2.21.5/src/perl/Notify.pm 2011-09-27
10:12:43.000000000 +0200
@@ -215,7 +215,7 @@
my $result = "success";
my $ntConf = NTCONF;
- Immunix::Reports::enableEventD();
+ # not enabling aaeventd here as it gets enabled as part of global apparmor
switch
if ( open(CFG, "> $ntConf") ) {
if($config->{terse}->{enable_terse} eq "yes") {
# if we didn't get passed a valid frequency, default to off
continue with "q"...
Remember to have fun...
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
