Merge ~paelzer/ubuntu/+source/rsyslog:fix-1827253-container-apparmor-bionic into ubuntu/+source/rsyslog:ubuntu/bionic-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

Trivial fix in default-disabled apparmor profile, but to be sure against e.g. unexpected FTBFS.
Test build PPA: https://launchpad.net/~paelzer/+archive/ubuntu/bug-1827253-rsyslog-apparmor

[Rafael David Tinoco (rafaeldtinoco)]

Like you stated to Simon, perfect bug. Root cause, a way to reproduce, a workaround, a patch included with SRU template. I saw you added changelog adding credits, change is trivial but PPA confirmed no FTBFS. Version look good to disco (4.1). +1 on my side.

review: Approve

[Christian Ehrhardt  (paelzer)]

thanks - tagged and uploaded

diff --git a/debian/changelog b/debian/changelog
index 9b7c094..45c012d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+rsyslog (8.32.0-1ubuntu4.1) bionic; urgency=medium
+
+  [ Simon Deziel ]
+  * d/usr.sbin.rsyslogd: allow reading/mmap'ing rsyslog binary
+    This is required for usage inside containers (LP: #1827253)
+
+ -- Christian Ehrhardt <[e-mail]>  Mon, 14 Oct 2019 08:54:45 +0200
+
 rsyslog (8.32.0-1ubuntu4) bionic; urgency=medium
 
   [ Jamie Strandboge ]
diff --git a/debian/usr.sbin.rsyslogd b/debian/usr.sbin.rsyslogd
index d9b502a..9af2681 100644
--- a/debian/usr.sbin.rsyslogd
+++ b/debian/usr.sbin.rsyslogd
@@ -29,6 +29,7 @@
   /var/spool/rsyslog/ r,
   /var/spool/rsyslog/** rwk,
 
+  /usr/sbin/rsyslog mr,
   /usr/lib{,32,64}/{,@{multiarch}/}rsyslog/*.so mr,
 
   /dev/tty*                     rw,