Hello community,
here is the log from the commit of package haproxy for openSUSE:Factory checked
in at 2020-11-03 15:15:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/haproxy (Old)
and /work/SRC/openSUSE:Factory/.haproxy.new.3463 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "haproxy"
Tue Nov 3 15:15:45 2020 rev:93 rq:845120 version:2.2.4+git0.de456726d
Changes:
--------
--- /work/SRC/openSUSE:Factory/haproxy/haproxy.changes 2020-10-08
13:09:00.110999563 +0200
+++ /work/SRC/openSUSE:Factory/.haproxy.new.3463/haproxy.changes
2020-11-03 15:15:57.344004825 +0100
@@ -1,0 +2,10 @@
+Sat Oct 24 01:18:29 UTC 2020 - Marcus Rueckert <mrueck...@suse.de>
+
+- apparmor profile fixes:
+ - include abstractions that give access to the openssl config,
+ ssl certs and ssl keys
+ - include local configs only with "if exists" so they do not have
+ to exist.
+- move local files to %ghost
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ haproxy.spec ++++++
--- /var/tmp/diff_new_pack.VVbcj8/_old 2020-11-03 15:15:58.476005915 +0100
+++ /var/tmp/diff_new_pack.VVbcj8/_new 2020-11-03 15:15:58.476005915 +0100
@@ -203,6 +203,7 @@
install -D -m 0644 doc/%{pkg_name}.1
%{buildroot}%{_mandir}/man1/%{pkg_name}.1
%if %{with apparmor}
install -D -m 0644 %{S:2}
%{buildroot}/etc/apparmor.d/usr.sbin.haproxy
+install -D -m 0644 %{S:3}
%{buildroot}/etc/apparmor.d/local/haproxy
install -D -m 0644 %{S:3}
%{buildroot}/etc/apparmor.d/local/usr.sbin.haproxy
%endif
@@ -282,7 +283,8 @@
%dir /etc/apparmor.d/local/
%endif
%config(noreplace) /etc/apparmor.d/usr.sbin.haproxy
-%config(noreplace) /etc/apparmor.d/local/usr.sbin.haproxy
+%config(noreplace) %ghost /etc/apparmor.d/local/haproxy
+%config(noreplace) %ghost /etc/apparmor.d/local/usr.sbin.haproxy
%endif
%changelog
++++++ usr.sbin.haproxy.apparmor ++++++
--- /var/tmp/diff_new_pack.VVbcj8/_old 2020-11-03 15:15:58.632006065 +0100
+++ /var/tmp/diff_new_pack.VVbcj8/_new 2020-11-03 15:15:58.632006065 +0100
@@ -2,6 +2,9 @@
profile haproxy /usr/sbin/haproxy {
#include <abstractions/base>
+ #include <abstractions/openssl>
+ #include <abstractions/ssl_certs>
+ #include <abstractions/ssl_keys>
#include <abstractions/nameservice>
capability net_bind_service,
capability setgid,
@@ -29,5 +32,6 @@
/{,var/}run/haproxy-master.sock* rwlk,
# Site-specific additions and overrides. See local/README for details.
- #include <local/usr.sbin.haproxy>
+ #include if exists <local/haproxy>
+ #include if exists <local/usr.sbin.haproxy>
}
