diff options
Diffstat (limited to 'community/murmur')
| -rw-r--r-- | community/murmur/0003-fix-long-username-query.patch | 42 | ||||
| -rw-r--r-- | community/murmur/0004-fix-username-validation.patch | 36 | ||||
| -rw-r--r-- | community/murmur/ChangeLog | 36 | ||||
| -rw-r--r-- | community/murmur/PKGBUILD | 49 | ||||
| -rw-r--r-- | community/murmur/murmur.dbus.conf | 22 | ||||
| -rw-r--r-- | community/murmur/murmur.install | 16 | ||||
| -rw-r--r-- | community/murmur/murmur.service | 11 |
7 files changed, 0 insertions, 212 deletions
diff --git a/community/murmur/0003-fix-long-username-query.patch b/community/murmur/0003-fix-long-username-query.patch deleted file mode 100644 index 2fc52f70c..000000000 --- a/community/murmur/0003-fix-long-username-query.patch +++ /dev/null @@ -1,42 +0,0 @@ -commit 6b33dda344f89e5a039b7d79eb43925040654242 -Author: Benjamin Jemlich <pcgod@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(); diff --git a/community/murmur/0004-fix-username-validation.patch b/community/murmur/0004-fix-username-validation.patch deleted file mode 100644 index 493f78ba5..000000000 --- a/community/murmur/0004-fix-username-validation.patch +++ /dev/null @@ -1,36 +0,0 @@ -commit 5c40cfeb4b5f8911df926c19f2dd628703840f64 -Author: Stefan Hacker <dd0t@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; diff --git a/community/murmur/ChangeLog b/community/murmur/ChangeLog deleted file mode 100644 index 7537836fa..000000000 --- a/community/murmur/ChangeLog +++ /dev/null @@ -1,36 +0,0 @@ -2010-02-11 Otto Allmendinger <otto.allmendinger@googlemail.com> - * 1.2.2-1: - bump to version 1.2.2 - -2010-01-09 Otto Allmendinger <otto.allmendinger@googlemail.com> - * 1.2.1-1: - bump to version 1.2.1 - -2009-12-18 Otto Allmendinger <otto.allmendinger@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@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@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 diff --git a/community/murmur/PKGBUILD b/community/murmur/PKGBUILD deleted file mode 100644 index 9efba13a5..000000000 --- a/community/murmur/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# $Id: PKGBUILD 92168 2013-06-02 06:18:50Z svenstaro $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Otto Allmendinger <otto.allmendinger@googlemail.com> -# Contributor: Malte Rabenseifner <malte@zearan.de> - -pkgname=murmur -pkgver=1.2.4 -pkgrel=1 -pkgdesc="The voice chat application server for Mumble" -arch=('i686' 'x86_64') -url="http://mumble.sourceforge.net" -license=('BSD') -depends=('avahi' 'lsb-release' 'protobuf' 'qt4' 'icu') -makedepends=('boost') -backup=("etc/murmur.ini") -install="murmur.install" -source=("http://downloads.sourceforge.net/mumble/mumble-$pkgver.tar.gz" - "murmur.dbus.conf" - "murmur.service") -md5sums=('49bc6abea78f9c54298934c2c28a7c7c' - 'eddea4cdbd0bde4b960a67e16b5d5478' - 'd27a9adcd7561859e7b033046729bc0e') - -build() { - cd ${srcdir}/mumble-$pkgver - - qmake-qt4 main.pro CONFIG+="no-client no-ice" - make release -} - -package() { - cd ${srcdir}/mumble-$pkgver - - sed -e "1i# vi:ft=cfg" \ - -e "s|database=|database=/var/lib/murmur/murmur.sqlite|" \ - -e "s|#logfile=murmur.log|logfile=|" \ - -e "s|#uname=|uname=murmur|" \ - -i scripts/murmur.ini - - install -dm755 ${pkgdir}/var/lib/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}/etc/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 -} - -# vim: sw=2:ts=2 et: diff --git a/community/murmur/murmur.dbus.conf b/community/murmur/murmur.dbus.conf deleted file mode 100644 index cf937d7b1..000000000 --- a/community/murmur/murmur.dbus.conf +++ /dev/null @@ -1,22 +0,0 @@ -<!-- 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> diff --git a/community/murmur/murmur.install b/community/murmur/murmur.install deleted file mode 100644 index fecd2c2ca..000000000 --- a/community/murmur/murmur.install +++ /dev/null @@ -1,16 +0,0 @@ -post_install() { - getent group murmur > /dev/null || groupadd -r -g 86 murmur 1>/dev/null - getent passwd murmur > /dev/null || useradd -r -u 86 -d /var/lib/murmur -g murmur -s /bin/false murmur 1>/dev/null - - chown -R murmur:murmur /var/lib/murmur - - echo "You might have to reload dbus before launching murmur:" - echo " systemctl reload bus" - echo "Don't forget to set the superuser password:" - echo " murmurd -ini /etc/murmur.ini -supw <your-password>" -} - -post_remove() { - getent passwd murmur > /dev/null && userdel murmur 1>/dev/null - getent group murmur > /dev/null && groupdel murmur 1>/dev/null -} diff --git a/community/murmur/murmur.service b/community/murmur/murmur.service deleted file mode 100644 index 685b84d13..000000000 --- a/community/murmur/murmur.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Mumble Daemon -After=network.target - -[Service] -Type=simple -ExecStart=/usr/bin/murmurd -ini /etc/murmur.ini -fg -Restart=always - -[Install] -WantedBy=multi-user.target |