[Pkg-voip-commits] r8700 - in /mumble/branches/squeeze/debian: changelog mumble-server.postinst mumble-server.postrm

[pmatthaei at alioth.debian.org]

Author: pmatthaei
Date: Thu Jan 13 20:30:16 2011
New Revision: 8700

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8700
Log:
Merge changes from trunk.

Modified:
    mumble/branches/squeeze/debian/changelog
    mumble/branches/squeeze/debian/mumble-server.postinst
    mumble/branches/squeeze/debian/mumble-server.postrm

Modified: mumble/branches/squeeze/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/branches/squeeze/debian/changelog?rev=8700&op=diff
==============================================================================
--- mumble/branches/squeeze/debian/changelog (original)
+++ mumble/branches/squeeze/debian/changelog Thu Jan 13 20:30:16 2011
@@ -1,3 +1,11 @@
+mumble (1.2.2-6) unstable; urgency=high
+
+  * Delete /var/lib/mumble-server on purge.
+  * Do not make /etc/mumble-server.ini world readable.
+    Closes: #609919
+
+ -- Patrick Matthäi <pmatthaei at debian.org>  Thu, 13 Jan 2011 21:29:40 +0100
+
 mumble (1.2.2-5) unstable; urgency=low
 
   * Update fuzzy spanish debconf translation. Thanks to Omar Campagne Polaino.

Modified: mumble/branches/squeeze/debian/mumble-server.postinst
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/branches/squeeze/debian/mumble-server.postinst?rev=8700&op=diff
==============================================================================
--- mumble/branches/squeeze/debian/mumble-server.postinst (original)
+++ mumble/branches/squeeze/debian/mumble-server.postinst Thu Jan 13 20:30:16 2011
@@ -24,8 +24,10 @@
 		[ -d /var/lib/mumble-server ] || mkdir /var/lib/mumble-server
 		chmod 0750 /var/log/mumble-server
 		chmod 0750 /var/lib/mumble-server
+		chmod 0640 /etc/mumble-server.ini
 		chown mumble-server:adm /var/log/mumble-server
 		chown mumble-server:mumble-server /var/lib/mumble-server
+		chown root:mumble-server /etc/mumble-server.ini
 		# Workaround for when this was in .dirs
 		[ -d /var/run/mumble-server ] && chown mumble-server:adm /var/run/mumble-server
 

Modified: mumble/branches/squeeze/debian/mumble-server.postrm
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/branches/squeeze/debian/mumble-server.postrm?rev=8700&op=diff
==============================================================================
--- mumble/branches/squeeze/debian/mumble-server.postrm (original)
+++ mumble/branches/squeeze/debian/mumble-server.postrm Thu Jan 13 20:30:16 2011
@@ -19,8 +19,7 @@
 case "$1" in
 	purge)
 		[ -f /var/log/mumble-server/mumble-server.log ] && rm -f /var/log/mumble-server/mumble-server.log*
-		[ -f /var/lib/mumble-server/mumble-server.sqlite ] && rm -f /var/lib/mumble-server/mumble-server.sqlite
-		[ -d /var/lib/mumble-server/.config ] && rm -rf /var/lib/mumble-server/.config
+		[ -d /var/lib/mumble-server ] && rm -rf /var/lib/mumble-server
 		[ -f /var/run/mumble-server/mumble-server.pid ] && rm -f /var/run/mumble-server/mumble-server.pid
 		[ -d /var/run/mumble-server ] && rmdir --ignore-fail-on-non-empty /var/run/mumble-server