Hello community, here is the log from the commit of package apparmor for openSUSE:Factory checked in at 2015-03-03 11:11:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apparmor (Old) and /work/SRC/openSUSE:Factory/.apparmor.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apparmor" Changes: -------- --- /work/SRC/openSUSE:Factory/apparmor/apparmor.changes 2015-02-25 02:15:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.apparmor.new/apparmor.changes 2015-03-03 11:11:11.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Feb 24 13:19:10 UTC 2015 - rguent...@suse.com + +- add apparmor-fix-stl-ostream.diff which fixes odd uses of + std::ostream which are not valid. Fixes build with GCC 5 + +------------------------------------------------------------------- New: ---- apparmor-fix-stl-ostream.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apparmor.spec ++++++ --- /var/tmp/diff_new_pack.7MwTHE/_old 2015-03-03 11:11:13.000000000 +0100 +++ /var/tmp/diff_new_pack.7MwTHE/_new 2015-03-03 11:11:13.000000000 +0100 @@ -98,6 +98,9 @@ # 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 @@ %patch6 %patch7 -p1 %patch8 +%patch9 # search for left-over multiline rules test -z "$(grep -r '^\s*\(unix\|dbus\)[^,]\(([^)]*)\)*[^,]*$' profiles/apparmor.d/)" ++++++ apparmor-fix-stl-ostream.diff ++++++ 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; -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
