Commits

Roger Light  committed 155bf12

Debian updates for 1.0.5.

  • Participants
  • Parent commits d53750d

Comments (0)

Files changed (8)

File debian/README.Debian

+Apparmor Profile
+----------------
+If your system uses AppArmor, please note that the shipped enforcing profile
+works with the default installation, and changes in your configuration may
+require changes to the installed apparmor profile. Please see
+https://wiki.ubuntu.com/DebuggingApparmor before filing a bug against this
+software.

File debian/changelog

-mosquitto (1.0-1) unstable; urgency=low
+mosquitto (1.0.5-1) experimental; urgency=low
 
-  * New upstream release: http://mosquitto.org/2012/08/version-1-0-released/
+  * New upstream release: http://mosquitto.org/2012/11/version-1-0-5-released/
+    (Closes: #685119, LP: #972389, LP: #1035328)
   * Bumped standards release to 3.9.3. No changes needed.
   * Added mosquitto-dbg package for binary debug information.
   * Added python3-mosquitto binary package.
   * Use dh_python2 (and dh_python3) instead of python-support.
 
- -- Roger A. Light <roger@atchoo.org>  Tue, 14 Aug 2012 00:20:18 +0100
+ -- Roger A. Light <roger@atchoo.org>  Sat, 03 Nov 2012 23:38:07 +0000
 
 mosquitto (0.15-1) unstable; urgency=low
 

File debian/mosquitto.install

 usr/sbin/mosquitto
 usr/bin/mosquitto_passwd
 etc/mosquitto/mosquitto.conf
+etc/mosquitto/aclfile.example
+etc/mosquitto/pskfile.example
+etc/mosquitto/pwfile.example
+etc/mosquitto/conf.d/README
+etc/mosquitto/ca_certificates/README
+etc/mosquitto/certs/README
 usr/share/man/man8/mosquitto.8
 usr/share/man/man1/mosquitto_passwd.1
 usr/share/man/man5/mosquitto.conf.5

File debian/mosquitto.postinst

 	;;
 esac
 
+# Reload AppArmor profile
+APP_PROFILE="/etc/apparmor.d/usr.sbin.mosquitto"
+if [ -f "$APP_PROFILE" ] && aa-status --enabled 2>/dev/null; then
+	apparmor_parser -r "$APP_PROFILE" || true
+fi
 
 #DEBHELPER#
 

File debian/mosquitto.postrm

 		if [ -d /var/lib/mosquitto ]; then
 			rmdir --ignore-fail-on-non-empty /var/lib/mosquitto
 		fi
+		APP_PROFILE="usr.sbin.mosquitto"
+		rm -f /etc/apparmor.d/disable/$APP_PROFILE >/dev/null 2>&1 || true
 	;;
 	remove|abort-install|abort-upgrade|disappear)
 		if which deluser >/dev/null 2>&1; then

File debian/patches/fix-prefix.patch

 Forwarded: not-needed
 --- a/config.mk
 +++ b/config.mk
-@@ -181,6 +181,6 @@
+@@ -187,6 +187,6 @@
  
  
  INSTALL?=install

File debian/patches/mosquitto.conf.patch

 Description: Configure sensible values for daemon.
 Author: Roger Light <roger@atchoo.org>
-Forwarded: not-needed
 --- a/mosquitto.conf
 +++ b/mosquitto.conf
-@@ -327,7 +327,7 @@
+@@ -1,3 +1,6 @@
++# Place your local configuration in /etc/mosquitto/conf.d/
++
++
+ # Config file for mosquitto
+ #
+ # See mosquitto.conf(5) for more information.
+@@ -31,7 +34,7 @@
+ # This should be set to /var/run/mosquitto.pid if mosquitto is
+ # being run automatically on boot with an init script and 
+ # start-stop-daemon or similar.
+-#pid_file
++pid_file /var/run/mosquitto.pid
+ 
+ # When run as root, drop privileges to this user and its primary 
+ # group.
+@@ -327,7 +330,7 @@
  # subscriptions, currently in-flight messages and retained 
  # messages.
  # retained_persistence is a synonym for this option.
  
  # The filename to use for the persistent database, not including 
  # the path.
-@@ -336,7 +336,7 @@
+@@ -336,7 +339,7 @@
  # Location for persistent database. Must include trailing /
  # Default is an empty string (current directory).
  # Set to /var/lib/mosquitto/ if running as a proper service.
  
  # =================================================================
  # Logging
-@@ -352,7 +352,7 @@
- # where severity is one of D, E, W, N, I which are debug, error, 
- # warning, notice and information.
+@@ -354,7 +357,7 @@
+ # Note that if the broker is running as a Windows service it will default to
+ # "log_dest none" and neither stdout nor stderr logging is available.
  # Use "log_dest none" if you wish to disable logging.
 -#log_dest stderr
 +log_dest none
  
  # Types of messages to log. Use multiple log_type lines for logging
  # multiple types of messages.
-@@ -645,3 +645,5 @@
+@@ -647,3 +650,5 @@
  #max_log_entries
  #trace_level
  #trace_output

File debian/patches/nostrip.patch

  	$(INSTALL) mosquitto.h ${DESTDIR}${prefix}/include/mosquitto.h
 --- a/src/Makefile
 +++ b/src/Makefile
-@@ -91,9 +91,9 @@
+@@ -91,10 +91,10 @@
  
  install : all
  	$(INSTALL) -d ${DESTDIR}$(prefix)/sbin
 -	$(INSTALL) -s mosquitto ${DESTDIR}${prefix}/sbin/mosquitto
 +	$(INSTALL) mosquitto ${DESTDIR}${prefix}/sbin/mosquitto
  	$(INSTALL) mosquitto_plugin.h ${DESTDIR}${prefix}/include/mosquitto_plugin.h
+ ifeq ($(WITH_TLS),yes)
 -	$(INSTALL) -s mosquitto_passwd ${DESTDIR}${prefix}/bin/mosquitto_passwd
 +	$(INSTALL) mosquitto_passwd ${DESTDIR}${prefix}/bin/mosquitto_passwd
+ endif
  
  uninstall :
- 	-rm -f ${DESTDIR}${prefix}/sbin/mosquitto