[arch-commits] Commit in murmur/repos (9 files)

Jan Steffens heftig at archlinux.org
Mon Mar 4 22:16:36 UTC 2019


    Date: Monday, March 4, 2019 @ 22:16:36
  Author: heftig
Revision: 437659

archrelease: copy trunk to community-staging-x86_64

Added:
  murmur/repos/community-staging-x86_64/
  murmur/repos/community-staging-x86_64/0003-fix-long-username-query.patch
    (from rev 437658, murmur/trunk/0003-fix-long-username-query.patch)
  murmur/repos/community-staging-x86_64/0004-fix-username-validation.patch
    (from rev 437658, murmur/trunk/0004-fix-username-validation.patch)
  murmur/repos/community-staging-x86_64/ChangeLog
    (from rev 437658, murmur/trunk/ChangeLog)
  murmur/repos/community-staging-x86_64/PKGBUILD
    (from rev 437658, murmur/trunk/PKGBUILD)
  murmur/repos/community-staging-x86_64/murmur.dbus.conf
    (from rev 437658, murmur/trunk/murmur.dbus.conf)
  murmur/repos/community-staging-x86_64/murmur.install
    (from rev 437658, murmur/trunk/murmur.install)
  murmur/repos/community-staging-x86_64/murmur.service
    (from rev 437658, murmur/trunk/murmur.service)
  murmur/repos/community-staging-x86_64/murmur.sysusers
    (from rev 437658, murmur/trunk/murmur.sysusers)

------------------------------------+
 0003-fix-long-username-query.patch |   42 ++++++++++++++++++++++++
 0004-fix-username-validation.patch |   36 +++++++++++++++++++++
 ChangeLog                          |   36 +++++++++++++++++++++
 PKGBUILD                           |   59 +++++++++++++++++++++++++++++++++++
 murmur.dbus.conf                   |   22 +++++++++++++
 murmur.install                     |    6 +++
 murmur.service                     |   12 +++++++
 murmur.sysusers                    |    1 
 8 files changed, 214 insertions(+)

Copied: murmur/repos/community-staging-x86_64/0003-fix-long-username-query.patch (from rev 437658, murmur/trunk/0003-fix-long-username-query.patch)
===================================================================
--- community-staging-x86_64/0003-fix-long-username-query.patch	                        (rev 0)
+++ community-staging-x86_64/0003-fix-long-username-query.patch	2019-03-04 22:16:36 UTC (rev 437659)
@@ -0,0 +1,42 @@
+commit 6b33dda344f89e5a039b7d79eb43925040654242
+Author: Benjamin Jemlich <pcgod at users.sourceforge.net>
+Date:   Tue Jun 29 14:49:14 2010 +0200
+
+    Don't crash on long usernames
+
+diff --git a/src/murmur/Messages.cpp b/src/murmur/Messages.cpp
+index f12867a..de307ea 100644
+--- a/src/murmur/Messages.cpp
++++ b/src/murmur/Messages.cpp
+@@ -1231,6 +1231,9 @@ void Server::msgQueryUsers(ServerUser *uSource, MumbleProto::QueryUsers &msg) {
+ 
+ 	for (int i=0;i<msg.names_size();++i) {
+ 		QString name = u8(msg.names(i));
++		if (!validateUserName(name)) {
++			continue;
++		}
+ 		int id = getUserID(name);
+ 		if (id >= 0) {
+ 			name = getUserName(id);
+diff --git a/src/murmur/ServerDB.cpp b/src/murmur/ServerDB.cpp
+index 11b6906..7e15def 100644
+--- a/src/murmur/ServerDB.cpp
++++ b/src/murmur/ServerDB.cpp
+@@ -810,7 +810,7 @@ int Server::authenticate(QString &name, const QString &pw, const QStringList &em
+ 	TransactionHolder th;
+ 	QSqlQuery &query = *th.qsqQuery;
+ 
+-	SQLPREP("SELECT `user_id`,`name`,`pw` FROM `%1users` WHERE `server_id` = ? AND `name` like ?");
++	SQLPREP("SELECT `user_id`,`name`,`pw` FROM `%1users` WHERE `server_id` = ? AND LOWER(`name`) = LOWER(?)");
+ 	query.addBindValue(iServerNum);
+ 	query.addBindValue(name);
+ 	SQLEXEC();
+@@ -1051,7 +1051,7 @@ int Server::getUserID(const QString &name) {
+ 	TransactionHolder th;
+ 
+ 	QSqlQuery &query = *th.qsqQuery;
+-	SQLPREP("SELECT `user_id` FROM `%1users` WHERE `server_id` = ? AND `name` like ?");
++	SQLPREP("SELECT `user_id` FROM `%1users` WHERE `server_id` = ? AND LOWER(`name`) = LOWER(?)");
+ 	query.addBindValue(iServerNum);
+ 	query.addBindValue(name);
+ 	SQLEXEC();

Copied: murmur/repos/community-staging-x86_64/0004-fix-username-validation.patch (from rev 437658, murmur/trunk/0004-fix-username-validation.patch)
===================================================================
--- community-staging-x86_64/0004-fix-username-validation.patch	                        (rev 0)
+++ community-staging-x86_64/0004-fix-username-validation.patch	2019-03-04 22:16:36 UTC (rev 437659)
@@ -0,0 +1,36 @@
+commit 5c40cfeb4b5f8911df926c19f2dd628703840f64
+Author: Stefan Hacker <dd0t at users.sourceforge.net>
+Date:   Tue Jun 29 23:39:16 2010 +0200
+
+    Don't validate the name before we are sure it wasn't already validated by an authenticator
+
+diff --git a/src/murmur/Messages.cpp b/src/murmur/Messages.cpp
+index de307ea..f12867a 100644
+--- a/src/murmur/Messages.cpp
++++ b/src/murmur/Messages.cpp
+@@ -1231,9 +1231,6 @@ void Server::msgQueryUsers(ServerUser *uSource, MumbleProto::QueryUsers &msg) {
+ 
+ 	for (int i=0;i<msg.names_size();++i) {
+ 		QString name = u8(msg.names(i));
+-		if (!validateUserName(name)) {
+-			continue;
+-		}
+ 		int id = getUserID(name);
+ 		if (id >= 0) {
+ 			name = getUserName(id);
+diff --git a/src/murmur/ServerDB.cpp b/src/murmur/ServerDB.cpp
+index 7e15def..70b4ca4 100644
+--- a/src/murmur/ServerDB.cpp
++++ b/src/murmur/ServerDB.cpp
+@@ -1048,6 +1048,11 @@ int Server::getUserID(const QString &name) {
+ 		qhUserNameCache.insert(id, name);
+ 		return id;
+ 	}
++
++	if (!validateUserName(name)) {
++	    return id;
++	}
++
+ 	TransactionHolder th;
+ 
+ 	QSqlQuery &query = *th.qsqQuery;

Copied: murmur/repos/community-staging-x86_64/ChangeLog (from rev 437658, murmur/trunk/ChangeLog)
===================================================================
--- community-staging-x86_64/ChangeLog	                        (rev 0)
+++ community-staging-x86_64/ChangeLog	2019-03-04 22:16:36 UTC (rev 437659)
@@ -0,0 +1,36 @@
+2010-02-11 Otto Allmendinger <otto.allmendinger at googlemail.com>
+	* 1.2.2-1:
+	bump to version 1.2.2
+
+2010-01-09 Otto Allmendinger <otto.allmendinger at googlemail.com>
+	* 1.2.1-1:
+	bump to version 1.2.1
+
+2009-12-18 Otto Allmendinger <otto.allmendinger at googlemail.com>
+	* 1.2.0-8:
+	included dbus configuration file, changed default dbus settings
+
+	* 1.2.0-7:
+	included manfile
+	renamed binary "murmur" to "murmurd" to be consistent with manfile
+	changed murmur user shell to /bin/false (shell access not required anymore)
+
+2009-12-17 Malte Rabenseifner <malte at zearan.de>
+	* 1.2.0-6:
+	included manfile
+	using mumbles included privilige dropping
+	added some files to backup array
+	added logrotate configuration file
+
+2009-12-15 Otto Allmendinger <otto.allmendinger at googlemail.com>
+	* 1.2.0-5 :
+	simplified dependencies
+	increased visibility of install messages
+
+	* 1.2.0-4 :
+	added boost to makedepends
+
+	* 1.2.0-3 :
+	added ChangeLog
+	added post_upgrade() function
+	added x86_64 to arch

Copied: murmur/repos/community-staging-x86_64/PKGBUILD (from rev 437658, murmur/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2019-03-04 22:16:36 UTC (rev 437659)
@@ -0,0 +1,59 @@
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Contributor: Otto Allmendinger <otto.allmendinger at googlemail.com>
+# Contributor: Malte Rabenseifner <malte at zearan.de>
+
+pkgname=murmur
+pkgver=1.2.19
+pkgrel=14
+pkgdesc="The voice chat application server for Mumble"
+arch=('x86_64')
+url="http://mumble.sourceforge.net"
+license=('BSD')
+depends=('avahi' 'lsb-release' 'protobuf' 'qt4' 'icu' 'zeroc-ice')
+makedepends=('boost')
+backup=("etc/murmur.ini")
+install="murmur.install"
+source=(https://github.com/mumble-voip/mumble/releases/download/${pkgver}/mumble-${pkgver}.tar.gz
+        "murmur.dbus.conf"
+        "murmur.service"
+        "murmur.sysusers")
+sha512sums=('f91111194a899149b500a94afcf7cc5b9691c7ce8669f07fca2c66adbb3916ddb863bf703d04fb8387133fb75f3c8edb52974d1acf3febfafa1f73da19946de4'
+            '97c7effdddec324e40195c36ef4927950a5de26d2ee2d268d89df6fb547207bbbe30292773316cae6f57ec9923244f205fb0edc377b798771ba7385e3c11d86a'
+            '1773802b938ae2a80fa21e26cd33d162f00de00e074af9f1481f1c682ef32756ffdd2384a1d1f5a4202df55a982a80067efa78d7ad4e077bf5c7f7ccfc4399e4'
+            '5af28d0c2b2b072cfbd500b5f63549e88a86cf3fc15e4d2df89e787c4d2bafdecbe078a518e0d1b25d82f9873cb06838ec1c9ebed625ffb7e8c80fcd942ebf74')
+
+prepare() {
+  cd "${srcdir}"/mumble-$pkgver
+
+  sed -i "s|/usr/local/share/Ice|/usr/share/ice/slice|g" src/murmur/murmur.pro
+  sed -i "s|-lIceUtil|-lIce|g" src/murmur/murmur.pro
+}
+
+build() {
+  cd "${srcdir}"/mumble-$pkgver
+
+  qmake-qt4 main.pro CONFIG+="c++11 no-client"
+  make release
+}
+
+package() {
+  cd "${srcdir}"/mumble-$pkgver
+
+  sed -e "1i# vi:ft=cfg" \
+    -e "s|database=|database=/var/db/murmur/murmur.sqlite|" \
+    -e "s|#logfile=murmur.log|logfile=|" \
+    -e "s|#uname=|uname=murmur|" \
+    -i scripts/murmur.ini
+
+  install -dm755 -o 122 -g 122 "${pkgdir}"/var/db/murmur
+  install -Dm755 release/murmurd "${pkgdir}"/usr/bin/murmurd
+  install -Dm644 scripts/murmur.ini "${pkgdir}"/etc/murmur.ini
+  install -Dm644 "${srcdir}"/murmur.dbus.conf "${pkgdir}"/usr/share/dbus-1/system.d/murmur.conf
+  install -Dm644 README "${pkgdir}"/usr/share/doc/murmur/README
+  install -Dm644 man/murmurd.1 "${pkgdir}"/usr/share/man/man1/murmurd.1
+  install -Dm644 "${srcdir}"/murmur.service "${pkgdir}"/usr/lib/systemd/system/murmur.service
+  install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+  install -Dm644 "${srcdir}"/murmur.sysusers "${pkgdir}"/usr/lib/sysusers.d/$pkgname.conf
+}
+
+# vim: sw=2:ts=2 et:

Copied: murmur/repos/community-staging-x86_64/murmur.dbus.conf (from rev 437658, murmur/trunk/murmur.dbus.conf)
===================================================================
--- community-staging-x86_64/murmur.dbus.conf	                        (rev 0)
+++ community-staging-x86_64/murmur.dbus.conf	2019-03-04 22:16:36 UTC (rev 437659)
@@ -0,0 +1,22 @@
+<!-- vi: set ft=xml: -->
+<!-- 
+    As described in http://mumble.sourceforge.net/DBus, 
+    but with different username
+-->
+<!DOCTYPE busconfig PUBLIC
+ "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+
+  <policy user="murmur">
+    <allow own="net.sourceforge.mumble.murmur"/>
+  </policy>
+  <policy user="root">
+    <allow own="net.sourceforge.mumble.murmur"/>
+  </policy>
+
+  <policy context="default">
+    <allow send_destination="net.sourceforge.mumble.murmur"/>
+    <allow receive_sender="net.sourceforge.mumble.murmur"/>
+  </policy>
+</busconfig>

Copied: murmur/repos/community-staging-x86_64/murmur.install (from rev 437658, murmur/trunk/murmur.install)
===================================================================
--- community-staging-x86_64/murmur.install	                        (rev 0)
+++ community-staging-x86_64/murmur.install	2019-03-04 22:16:36 UTC (rev 437659)
@@ -0,0 +1,6 @@
+post_install() {
+    echo "You might have to reload dbus before launching murmur:"
+    echo "    systemctl reload dbus"
+    echo "Don't forget to set the superuser password:"
+    echo "    murmurd -ini /etc/murmur.ini -supw <your-password>"
+}

Copied: murmur/repos/community-staging-x86_64/murmur.service (from rev 437658, murmur/trunk/murmur.service)
===================================================================
--- community-staging-x86_64/murmur.service	                        (rev 0)
+++ community-staging-x86_64/murmur.service	2019-03-04 22:16:36 UTC (rev 437659)
@@ -0,0 +1,12 @@
+[Unit]
+Description=Mumble Daemon
+After=network.target
+
+[Service]
+Type=simple
+ExecStartPre=/usr/bin/sleep 10
+ExecStart=/usr/bin/murmurd -ini /etc/murmur.ini -fg
+Restart=always
+
+[Install]
+WantedBy=multi-user.target

Copied: murmur/repos/community-staging-x86_64/murmur.sysusers (from rev 437658, murmur/trunk/murmur.sysusers)
===================================================================
--- community-staging-x86_64/murmur.sysusers	                        (rev 0)
+++ community-staging-x86_64/murmur.sysusers	2019-03-04 22:16:36 UTC (rev 437659)
@@ -0,0 +1 @@
+u murmur 122 "Murmur User" /var/db/murmur


More information about the arch-commits mailing list