[Pkg-voip-commits] r9506 - in /mumble/branches/squeeze/debian: changelog patches/0005-set-file-permissions.patch patches/series

[pmatthaei at alioth.debian.org]

Author: pmatthaei
Date: Sun Feb 12 16:21:50 2012
New Revision: 9506

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9506
Log:
* Add patch 0005-set-file-permissions from Marc Deslauriers, which fixes the
  file permissions of the Mumble database.
  Closes: #659039

Added:
    mumble/branches/squeeze/debian/patches/0005-set-file-permissions.patch
Modified:
    mumble/branches/squeeze/debian/changelog
    mumble/branches/squeeze/debian/patches/series

Modified: mumble/branches/squeeze/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/branches/squeeze/debian/changelog?rev=9506&op=diff
==============================================================================
--- mumble/branches/squeeze/debian/changelog (original)
+++ mumble/branches/squeeze/debian/changelog Sun Feb 12 16:21:50 2012
@@ -1,3 +1,11 @@
+mumble (1.2.2-6+squeeze1) stable-security; urgency=high
+
+  * Add patch 0005-set-file-permissions from Marc Deslauriers, which fixes the
+    file permissions of the Mumble database.
+    Closes: #659039
+
+ -- Patrick Matthäi <pmatthaei at debian.org>  Sun, 12 Feb 2012 17:21:09 +0100
+
 mumble (1.2.2-6) unstable; urgency=high
 
   * Delete /var/lib/mumble-server on purge.

Added: mumble/branches/squeeze/debian/patches/0005-set-file-permissions.patch
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/branches/squeeze/debian/patches/0005-set-file-permissions.patch?rev=9506&op=file
==============================================================================
--- mumble/branches/squeeze/debian/patches/0005-set-file-permissions.patch (added)
+++ mumble/branches/squeeze/debian/patches/0005-set-file-permissions.patch Sun Feb 12 16:21:50 2012
@@ -1,0 +1,19 @@
+Description: Set restrictive permissions on data files.
+Origin: upstream, https://github.com/mumble-voip/mumble/commit/5632c35d6759f5e13a7dfe78e4ee6403ff6a8e3e
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/mumble/+bug/783405
+
+diff -Naur mumble-1.2.2.orig/src/mumble/Database.cpp mumble-1.2.2/src/mumble/Database.cpp
+--- mumble-1.2.2.orig/src/mumble/Database.cpp	2010-02-09 17:34:50.000000000 +0100
++++ mumble-1.2.2/src/mumble/Database.cpp	2012-02-12 17:14:38.294951062 +0100
+@@ -92,6 +92,11 @@
+ 		qWarning("Database: Database is read-only");
+ 	}
+ 
++	{
++		QFile f(db.databaseName());
++		f.setPermissions(f.permissions() & ~(QFile::ReadGroup | QFile::WriteGroup | QFile::ExeGroup | QFile::ReadOther | QFile::WriteOther | QFile::ExeOther));
++	}
++
+ 	QSqlQuery query;
+ 
+ 	query.exec(QLatin1String("CREATE TABLE IF NOT EXISTS `servers` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `name` TEXT, `hostname` TEXT, `port` INTEGER DEFAULT 64738, `username` TEXT, `password` TEXT)"));

Modified: mumble/branches/squeeze/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/branches/squeeze/debian/patches/series?rev=9506&op=diff
==============================================================================
--- mumble/branches/squeeze/debian/patches/series (original)
+++ mumble/branches/squeeze/debian/patches/series Sun Feb 12 16:21:50 2012
@@ -2,3 +2,4 @@
 0002-spelling-error.patch
 0003-fix-long-username-query.patch
 0004-fix-username-validation.patch
+0005-set-file-permissions.patch