pool/apparmor
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 287520 from home:rguenther:branches:security:apparmor

Browse Source 
- add apparmor-fix-stl-ostream.diff which fixes odd uses of
  std::ostream which are not valid.  Fixes build with GCC 5

OBS-URL: https://build.opensuse.org/request/show/287520
OBS-URL: https://build.opensuse.org/package/show/security:apparmor/apparmor?expand=0&rev=125
This commit is contained in:
Christian Boltz 2015-02-26 19:33:32 +00:00 committed by Git OBS Bridge
parent 2e99500a06
commit 218655ab95
3 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
apparmor-fix-stl-ostream.diff Normal file
View File

@ -0,0 +1,35 @@
Index: parser/dbus.cc
===================================================================
--- parser/dbus.cc.orig 2014-10-08 22:20:20.000000000 +0200
+++ parser/dbus.cc 2015-02-24 14:10:15.656288643 +0100
@@ -149,7 +149,7 @@ ostream &dbus_rule::dump(ostream &os)
if (interface)
os << " interface=\"" << interface << "\"";
if (member)
- os << " member=\"" << member << os << "\"";
+ os << " member=\"" << member << "\"";
if (!(mode & AA_DBUS_BIND) && (peer_label || name)) {
os << " peer=( ";
Index: parser/af_rule.cc
===================================================================
--- parser/af_rule.cc.orig 2014-09-03 22:34:10.000000000 +0200
+++ parser/af_rule.cc 2015-02-24 14:14:31.851251654 +0100
@@ -148,11 +148,14 @@ ostream &af_rule::dump_peer(ostream &os)
ostream &af_rule::dump(ostream &os)
{
- os << dump_prefix(os);
+ dump_prefix(os);
os << af_name;
- os << dump_local(os);
+ dump_local(os);
if (has_peer_conds())
- os << " peer=(" << dump_peer(os) << ")";
+ {
+ os << " peer=(";
+ dump_peer(os) << ")";
+ }
os << ",\n";
return os;

6
apparmor.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Feb 24 13:19:10 UTC 2015 - rguenther@suse.com
- add apparmor-fix-stl-ostream.diff which fixes odd uses of
std::ostream which are not valid. Fixes build with GCC 5
-------------------------------------------------------------------
Fri Feb 20 18:15:18 UTC 2015 - opensuse@cboltz.de

4
apparmor.spec
View File

@ -98,6 +98,9 @@ Patch7: apparmor-lessopen-profile.patch
# upstream changes since the 2.9.1 release - bzr diff -r2832..2839 (2.9 branch)
Patch8: apparmor-changes-since-2.9.1.diff
# fix build with GCC 5 due to bad ostream use
Patch9: apparmor-fix-stl-ostream.diff
Url: https://launchpad.net/apparmor
PreReq: sed
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -439,6 +442,7 @@ SubDomain.
%patch6
%patch7 -p1
%patch8
%patch9
# search for left-over multiline rules
test -z "$(grep -r '^\s*\(unix\|dbus\)[^,]\(([^)]*)\)*[^,]*$' profiles/apparmor.d/)"