[Pkg-voip-commits] r9494 - in /mumble/trunk/debian: changelog patches/04-set-file-permissions.diff patches/series

[pmatthaei at alioth.debian.org]

Author: pmatthaei
Date: Sun Feb 12 11:11:59 2012
New Revision: 9494

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

Added:
    mumble/trunk/debian/patches/04-set-file-permissions.diff
Modified:
    mumble/trunk/debian/changelog
    mumble/trunk/debian/patches/series

Modified: mumble/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/changelog?rev=9494&op=diff
==============================================================================
--- mumble/trunk/debian/changelog (original)
+++ mumble/trunk/debian/changelog Sun Feb 12 11:11:59 2012
@@ -10,8 +10,11 @@
   * Add patch 03-fix-cert-validation from Marc Deslauriers, which fixes the
     certificate validation with Qt 4.8.
     Closes: #659035
-
- -- Patrick Matthäi <pmatthaei at debian.org>  Sun, 12 Feb 2012 12:05:46 +0100
+  * Add patch 04-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 12:10:38 +0100
 
 mumble (1.2.3-192-g683d39b-1) experimental; urgency=low
 

Added: mumble/trunk/debian/patches/04-set-file-permissions.diff
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/patches/04-set-file-permissions.diff?rev=9494&op=file
==============================================================================
--- mumble/trunk/debian/patches/04-set-file-permissions.diff (added)
+++ mumble/trunk/debian/patches/04-set-file-permissions.diff Sun Feb 12 11:11:59 2012
@@ -1,0 +1,40 @@
+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.3-277-g98f4ac1.orig/src/mumble/Database.cpp mumble-1.2.3-277-g98f4ac1/src/mumble/Database.cpp
+--- mumble-1.2.3-277-g98f4ac1.orig/src/mumble/Database.cpp	2012-02-05 14:00:59.000000000 +0100
++++ mumble-1.2.3-277-g98f4ac1/src/mumble/Database.cpp	2012-02-12 12:08:45.784816280 +0100
+@@ -102,6 +102,11 @@
+ 		f.setPermissions(f.permissions() & ~(QFile::ReadGroup | QFile::WriteGroup | QFile::ExeGroup | QFile::ReadOther | QFile::WriteOther | QFile::ExeOther));
+ 	}
+ 
++	{
++		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 " MUMTEXT(DEFAULT_MUMBLE_PORT) ", `username` TEXT, `password` TEXT)"));
+diff -Naur mumble-1.2.3-277-g98f4ac1.orig/src/mumble/Settings.cpp mumble-1.2.3-277-g98f4ac1/src/mumble/Settings.cpp
+--- mumble-1.2.3-277-g98f4ac1.orig/src/mumble/Settings.cpp	2012-02-05 14:00:59.000000000 +0100
++++ mumble-1.2.3-277-g98f4ac1/src/mumble/Settings.cpp	2012-02-12 12:08:45.784816280 +0100
+@@ -730,6 +730,17 @@
+ 		f.setPermissions(f.permissions() & ~(QFile::ReadGroup | QFile::WriteGroup | QFile::ExeGroup | QFile::ReadOther | QFile::WriteOther | QFile::ExeOther));
+ 	}
+ 
++	settings_ptr->setValue(QLatin1String("version"), QLatin1String(MUMTEXT(MUMBLE_VERSION_STRING)));
++	settings_ptr->sync();
++
++#if defined(Q_OS_WIN) || defined(Q_OS_MAC)
++	if (settings_ptr->format() == QSettings::IniFormat)
++#endif
++        {
++               QFile f(settings_ptr->fileName());
++               f.setPermissions(f.permissions() & ~(QFile::ReadGroup | QFile::WriteGroup | QFile::ExeGroup | QFile::ReadOther | QFile::WriteOther | QFile::ExeOther));
++        }
++
+ 	SAVELOAD(bEnable, "enable");
+ 
+ 	SAVELOAD(osShow, "show");

Modified: mumble/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/patches/series?rev=9494&op=diff
==============================================================================
--- mumble/trunk/debian/patches/series (original)
+++ mumble/trunk/debian/patches/series Sun Feb 12 11:11:59 2012
@@ -1,3 +1,4 @@
 01-fix-spelling-error.diff
 02-reject-with-ip-in-log.diff
 03-fix-cert-validation.diff
+04-set-file-permissions.diff