[arch-commits] Commit in murmur/trunk (4 files)
Sven-Hendrik Haase
svenstaro at archlinux.org
Sun Apr 28 14:29:53 UTC 2019
Date: Sunday, April 28, 2019 @ 14:29:53
Author: svenstaro
Revision: 455060
upgpkg: murmur 1.3.0rc1-1
Modified:
murmur/trunk/PKGBUILD
Deleted:
murmur/trunk/0003-fix-long-username-query.patch
murmur/trunk/0004-fix-username-validation.patch
murmur/trunk/ChangeLog
------------------------------------+
0003-fix-long-username-query.patch | 42 -----------------------------------
0004-fix-username-validation.patch | 36 ------------------------------
ChangeLog | 36 ------------------------------
PKGBUILD | 32 ++++++++++++--------------
4 files changed, 15 insertions(+), 131 deletions(-)
Deleted: 0003-fix-long-username-query.patch
===================================================================
--- 0003-fix-long-username-query.patch 2019-04-28 13:39:18 UTC (rev 455059)
+++ 0003-fix-long-username-query.patch 2019-04-28 14:29:53 UTC (rev 455060)
@@ -1,42 +0,0 @@
-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();
Deleted: 0004-fix-username-validation.patch
===================================================================
--- 0004-fix-username-validation.patch 2019-04-28 13:39:18 UTC (rev 455059)
+++ 0004-fix-username-validation.patch 2019-04-28 14:29:53 UTC (rev 455060)
@@ -1,36 +0,0 @@
-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;
Deleted: ChangeLog
===================================================================
--- ChangeLog 2019-04-28 13:39:18 UTC (rev 455059)
+++ ChangeLog 2019-04-28 14:29:53 UTC (rev 455060)
@@ -1,36 +0,0 @@
-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
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2019-04-28 13:39:18 UTC (rev 455059)
+++ PKGBUILD 2019-04-28 14:29:53 UTC (rev 455060)
@@ -1,43 +1,38 @@
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Maintainer: Sven-Hendrik Haase <svenstaro at gmail.com>
# Contributor: Otto Allmendinger <otto.allmendinger at googlemail.com>
# Contributor: Malte Rabenseifner <malte at zearan.de>
pkgname=murmur
-pkgver=1.2.19
-pkgrel=14
+pkgver=1.3.0rc1
+_pkgver=1.3.0-rc1
+__pkgver=1.3.0
+pkgrel=1
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')
+depends=(qt5-base avahi lsb-release protobuf icu zeroc-ice grpc)
+makedepends=(boost python qt5-tools)
backup=("etc/murmur.ini")
install="murmur.install"
-source=(https://github.com/mumble-voip/mumble/releases/download/${pkgver}/mumble-${pkgver}.tar.gz
+source=(https://github.com/mumble-voip/mumble/releases/download/${_pkgver}/mumble-${_pkgver}.tar.gz
"murmur.dbus.conf"
"murmur.service"
"murmur.sysusers")
-sha512sums=('f91111194a899149b500a94afcf7cc5b9691c7ce8669f07fca2c66adbb3916ddb863bf703d04fb8387133fb75f3c8edb52974d1acf3febfafa1f73da19946de4'
+sha512sums=('e993b18b0ecf620d3a9a89f145c18b9ecde3aaf9b7217e235b7472908c81a365323c8683dd6fc9ed14b108160f8bf5244369c2a9ee57c22595550220d158516c'
'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
+ cd "${srcdir}"/mumble-$__pkgver
- qmake-qt4 main.pro CONFIG+="c++11 no-client"
+ qmake-qt5 main.pro CONFIG+="no-client grpc"
make release
}
package() {
- cd "${srcdir}"/mumble-$pkgver
+ cd "${srcdir}"/mumble-$__pkgver
sed -e "1i# vi:ft=cfg" \
-e "s|database=|database=/var/db/murmur/murmur.sqlite|" \
@@ -54,6 +49,9 @@
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
+
+ install -Dm644 src/murmur/Murmur.ice ${pkgdir}/usr/share/murmur/Murmur.ice
+ install -Dm644 src/murmur/MurmurRPC.proto ${pkgdir}/usr/share/murmur/MurmurRPC.proto
}
# vim: sw=2:ts=2 et:
More information about the arch-commits
mailing list