Accepting request 766422 from home:jimfunk:branches:network:messaging:mqtt

- Update apparmor profile to allow open of /etc/mosquitto/conf.d
- Update default config to include files under /etc/mosquitto/conf.d
  per the README in the directory

OBS-URL: https://build.opensuse.org/request/show/766422
OBS-URL: https://build.opensuse.org/package/show/network:messaging:mqtt/mosquitto?expand=0&rev=32

mosquitto-1.4.1_apparmor.patch

@@ -1,14 +1,20 @@
-Index: mosquitto-1.4.1/security/mosquitto.apparmor
+--- a/security/mosquitto.apparmor
-===================================================================
++++ b/security/mosquitto.apparmor
---- mosquitto-1.4.1.orig/security/mosquitto.apparmor
-+++ mosquitto-1.4.1/security/mosquitto.apparmor
 @@ -1,3 +1,5 @@
 +#include <tunables/global>
 +
  /usr/sbin/mosquitto {
  	#include <abstractions/base>
  	#include <abstractions/nameservice>
-@@ -24,4 +26,5 @@
+@@ -6,6 +8,7 @@
+ 	/etc/mosquitto/mosquitto.conf r,
+ 	/etc/mosquitto/ca_certificates/* r,
+ 	/etc/mosquitto/certs/* r,
++	/etc/mosquitto/conf.d r,
+ 	/etc/mosquitto/conf.d/* r,
+ 	/var/lib/mosquitto/ r,
+ 	/var/lib/mosquitto/mosquitto.db rwk,
+@@ -24,4 +27,5 @@
  	/lib{,32,64}/libwrap.so*  rm,
  	/etc/hosts.allow r,
  	/etc/hosts.deny r,

mosquitto-1.6.8-config.patch

@@ -0,0 +1,8 @@
+--- mosquitto-1.6.8.orig/mosquitto.conf
++++ mosquitto-1.6.8/mosquitto.conf
+@@ -985,4 +985,4 @@
+ # alphabetical order, with capital letters ordered first. If this option is
+ # given multiple times, all of the files from the first instance will be
+ # processed before the next instance. See the man page for examples.
+-#include_dir
++include_dir /etc/mosquitto/conf.d

mosquitto.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jan 22 22:03:28 UTC 2020 - James Oakley <jfunk@funktronics.ca>
+
+- Update apparmor profile to allow open of /etc/mosquitto/conf.d
+- Update default config to include files under /etc/mosquitto/conf.d
+  per the README in the directory
+
 -------------------------------------------------------------------
 Fri Nov 29 18:34:49 UTC 2019 - Martin Hauke <mardnh@gmx.de>
 

mosquitto.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package mosquitto
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -40,6 +40,7 @@ Source4:        README-conf-d
 Source5:        README-ca_certificates
 Source6:        README-certs
 Patch0:         mosquitto-1.4.1_apparmor.patch
+Patch1:         mosquitto-1.6.8-config.patch
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
 BuildRequires:  libcares-devel
@@ -121,6 +122,7 @@ Client for Mosquitto.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 find misc -type f -exec chmod a-x "{}" "+"
 
 %build