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

2020-05-20 Thread David Runge via arch-commits 
Date: Wednesday, May 20, 2020 @ 21:36:55
  Author: dvzrv
Revision: 631003

archrelease: copy trunk to community-staging-x86_64

Added:
  murmur/repos/community-staging-x86_64/
  murmur/repos/community-staging-x86_64/PKGBUILD
(from rev 631002, murmur/trunk/PKGBUILD)
  
murmur/repos/community-staging-x86_64/a48aea18b6c7ee534cd21f7febfe253e31b33eda.patch
(from rev 631002, 
murmur/trunk/a48aea18b6c7ee534cd21f7febfe253e31b33eda.patch)
  murmur/repos/community-staging-x86_64/murmur.dbus.conf
(from rev 631002, murmur/trunk/murmur.dbus.conf)
  murmur/repos/community-staging-x86_64/murmur.install
(from rev 631002, murmur/trunk/murmur.install)
  murmur/repos/community-staging-x86_64/murmur.service
(from rev 631002, murmur/trunk/murmur.service)
  murmur/repos/community-staging-x86_64/murmur.sysusers
(from rev 631002, murmur/trunk/murmur.sysusers)
  murmur/repos/community-staging-x86_64/murmur.tmpfiles
(from rev 631002, murmur/trunk/murmur.tmpfiles)

+
 PKGBUILD   |   70 +++
 a48aea18b6c7ee534cd21f7febfe253e31b33eda.patch |   42 +
 murmur.dbus.conf   |   22 +++
 murmur.install |6 +
 murmur.service |   15 
 murmur.sysusers|1 
 murmur.tmpfiles|2 
 7 files changed, 158 insertions(+)

Copied: murmur/repos/community-staging-x86_64/PKGBUILD (from rev 631002, 
murmur/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2020-05-20 21:36:55 UTC (rev 631003)
@@ -0,0 +1,70 @@
+# Maintainer: Sven-Hendrik Haase 
+# Contributor: David Runge 
+# Contributor: Otto Allmendinger 
+# Contributor: Malte Rabenseifner 
+
+_name=mumble
+pkgname=murmur
+pkgver=1.3.0
+pkgrel=8
+pkgdesc="The voice chat application server for Mumble"
+arch=('x86_64')
+url="https://wiki.mumble.info/wiki/Main_Page;
+license=('BSD')
+depends=('gcc-libs' 'glibc' 'grpc' 'lsb-release' 'openssl' 'qt5-base'
+'zeroc-ice')
+makedepends=('avahi' 'boost' 'libcap' 'protobuf' 'python' 'qt5-tools')
+backup=("etc/murmur.ini")
+install="murmur.install"
+source=("https://github.com/mumble-voip/${_name}/releases/download/${pkgver}/${_name}-${pkgver}.tar.gz"{,.sig}
+a48aea18b6c7ee534cd21f7febfe253e31b33eda.patch
+"murmur.dbus.conf"
+"murmur.service"
+"murmur.sysusers"
+"murmur.tmpfiles")
+sha512sums=('2a629fc97f3c7c587c9a3b40fc96cf15d668acada37282ec1c4a5b169ad37717d60af94d12c7bce45f2816c265f76a99ebad40a006adcf8ca38a117e7c0a4122'
+'SKIP'
+
'2f379e355227e37f2d23d984d3a59779e3b7a2206865db8c9e4c9cb4eba563ca468744d862e29892919d8d2798576d2e011c658b48ca0acdde63e8a5cc577119'
+
'97c7effdddec324e40195c36ef4927950a5de26d2ee2d268d89df6fb547207bbbe30292773316cae6f57ec9923244f205fb0edc377b798771ba7385e3c11d86a'
+
'2059eeac32cc078168a2ea56fe3034df69814516303adeffb8062c7b90a88177a536e6a6742196ee90370084d4e536f825b1744f8bed2bb704159a8a8bccb606'
+
'5af28d0c2b2b072cfbd500b5f63549e88a86cf3fc15e4d2df89e787c4d2bafdecbe078a518e0d1b25d82f9873cb06838ec1c9ebed625ffb7e8c80fcd942ebf74'
+
'411784e8e0dcf6c163780ae895ae1a6bdad0bb2dd2b128911c484ac3eff073d95c5791b625493a2b8296d24bd7e6ac72d3c42180817e48b29f0c6a8fd841807c')
+validpgpkeys=('56D0B23AE00B1EE9A8BAAC0F5B8CF87BB893449B') # Mumble Automatic 
Build Infrastructure 2019 
+
+prepare() {
+  mv -v "${_name}-${pkgver}" "${pkgname}-${pkgver}"
+  cd "${pkgname}-${pkgver}"
+  # setting default configuration
+  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
+
+  # See https://github.com/mumble-voip/mumble/pull/4032
+  patch -Np1 -i "$srcdir"/a48aea18b6c7ee534cd21f7febfe253e31b33eda.patch
+}
+
+build() {
+  cd "${pkgname}-${pkgver}"
+
+  qmake-qt5 main.pro CONFIG+="no-client grpc"
+  make release
+}
+
+package() {
+  depends+=('libcap.so' 'libdns_sd.so' 'libprotobuf.so')
+  cd "${pkgname}-${pkgver}"
+  # murmur has no install target: 
https://github.com/mumble-voip/mumble/issues/1029
+  install -vDm 755 release/murmurd -t "${pkgdir}"/usr/bin
+  install -vDm 640 scripts/murmur.ini -t "${pkgdir}"/etc
+  install -vDm 644 "${srcdir}"/murmur.dbus.conf 
"${pkgdir}"/usr/share/dbus-1/system.d/murmur.conf
+  install -vDm 644 README -t "${pkgdir}/usr/share/doc/${pkgname}"
+  install -vDm 644 man/murmur*.1 -t "${pkgdir}/usr/share/man/man1/"
+  install -vDm 644 "${srcdir}"/murmur.service -t 
"${pkgdir}/usr/lib/systemd/system/"
+  install -vDm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -vDm 644 "${srcdir}"/murmur.sysusers

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

2019-12-11 Thread Lukas Fleischer via arch-commits 
Date: Thursday, December 12, 2019 @ 03:10:46
  Author: lfleischer
Revision: 537147

db-move: moved murmur from [community-staging] to [community-testing] (x86_64)

Added:
  murmur/repos/community-testing-x86_64/
  murmur/repos/community-testing-x86_64/PKGBUILD
(from rev 537146, murmur/repos/community-staging-x86_64/PKGBUILD)
  murmur/repos/community-testing-x86_64/murmur.dbus.conf
(from rev 537146, murmur/repos/community-staging-x86_64/murmur.dbus.conf)
  murmur/repos/community-testing-x86_64/murmur.install
(from rev 537146, murmur/repos/community-staging-x86_64/murmur.install)
  murmur/repos/community-testing-x86_64/murmur.service
(from rev 537146, murmur/repos/community-staging-x86_64/murmur.service)
  murmur/repos/community-testing-x86_64/murmur.sysusers
(from rev 537146, murmur/repos/community-staging-x86_64/murmur.sysusers)
  murmur/repos/community-testing-x86_64/murmur.tmpfiles
(from rev 537146, murmur/repos/community-staging-x86_64/murmur.tmpfiles)
Deleted:
  murmur/repos/community-staging-x86_64/

--+
 PKGBUILD |   64 +
 murmur.dbus.conf |   22 ++
 murmur.install   |6 
 murmur.service   |   12 +
 murmur.sysusers  |1 
 murmur.tmpfiles  |2 +
 6 files changed, 107 insertions(+)

Copied: murmur/repos/community-testing-x86_64/PKGBUILD (from rev 537146, 
murmur/repos/community-staging-x86_64/PKGBUILD)
===
--- community-testing-x86_64/PKGBUILD   (rev 0)
+++ community-testing-x86_64/PKGBUILD   2019-12-12 03:10:46 UTC (rev 537147)
@@ -0,0 +1,64 @@
+# Maintainer: Sven-Hendrik Haase 
+# Contributor: David Runge 
+# Contributor: Otto Allmendinger 
+# Contributor: Malte Rabenseifner 
+
+_name=mumble
+pkgname=murmur
+pkgver=1.3.0
+pkgrel=4
+pkgdesc="The voice chat application server for Mumble"
+arch=('x86_64')
+url="https://wiki.mumble.info/wiki/Main_Page;
+license=('BSD')
+depends=('avahi' 'gcc-libs' 'glibc' 'grpc' 'libcap' 'libprotobuf.so'
+'lsb-release' 'openssl' 'qt5-base' 'zeroc-ice')
+makedepends=('boost' 'python' 'qt5-tools')
+backup=("etc/murmur.ini")
+install="murmur.install"
+source=("https://github.com/mumble-voip/${_name}/releases/download/${pkgver}/${_name}-${pkgver}.tar.gz"{,.sig}
+"murmur.dbus.conf"
+"murmur.service"
+"murmur.sysusers"
+"murmur.tmpfiles")
+sha512sums=('2a629fc97f3c7c587c9a3b40fc96cf15d668acada37282ec1c4a5b169ad37717d60af94d12c7bce45f2816c265f76a99ebad40a006adcf8ca38a117e7c0a4122'
+'SKIP'
+
'97c7effdddec324e40195c36ef4927950a5de26d2ee2d268d89df6fb547207bbbe30292773316cae6f57ec9923244f205fb0edc377b798771ba7385e3c11d86a'
+
'1773802b938ae2a80fa21e26cd33d162f00de00e074af9f1481f1c682ef32756ffdd2384a1d1f5a4202df55a982a80067efa78d7ad4e077bf5c7f7ccfc4399e4'
+
'5af28d0c2b2b072cfbd500b5f63549e88a86cf3fc15e4d2df89e787c4d2bafdecbe078a518e0d1b25d82f9873cb06838ec1c9ebed625ffb7e8c80fcd942ebf74'
+
'411784e8e0dcf6c163780ae895ae1a6bdad0bb2dd2b128911c484ac3eff073d95c5791b625493a2b8296d24bd7e6ac72d3c42180817e48b29f0c6a8fd841807c')
+validpgpkeys=('56D0B23AE00B1EE9A8BAAC0F5B8CF87BB893449B') # Mumble Automatic 
Build Infrastructure 2019 
+
+prepare() {
+  mv -v "${_name}-${pkgver}" "${pkgname}-${pkgver}"
+  cd "${pkgname}-${pkgver}"
+  # setting default configuration
+  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
+}
+
+build() {
+  cd "${pkgname}-${pkgver}"
+
+  qmake-qt5 main.pro CONFIG+="no-client grpc"
+  make release
+}
+
+package() {
+  cd "${pkgname}-${pkgver}"
+  # murmur has no install target: 
https://github.com/mumble-voip/mumble/issues/1029
+  install -vDm 755 release/murmurd -t "${pkgdir}"/usr/bin
+  install -vDm 640 scripts/murmur.ini -t "${pkgdir}"/etc
+  install -vDm 644 "${srcdir}"/murmur.dbus.conf 
"${pkgdir}"/usr/share/dbus-1/system.d/murmur.conf
+  install -vDm 644 README -t "${pkgdir}/usr/share/doc/${pkgname}"
+  install -vDm 644 man/murmur*.1 -t "${pkgdir}/usr/share/man/man1/"
+  install -vDm 644 "${srcdir}"/murmur.service -t 
"${pkgdir}/usr/lib/systemd/system/"
+  install -vDm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -vDm 644 "${srcdir}"/murmur.sysusers 
"${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
+  install -vDm 644 "${srcdir}"/murmur.tmpfiles 
"${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf"
+  install -vDm 644 src/murmur/{Murmur.ice,MurmurRPC.proto} -t 
"${pkgdir}/usr/share/${pkgname}"
+}
+# vim: sw=2:ts=2 et:

Copied: murmur/repos/community-testing-x86_64/murmur.dbus.conf (from rev 
537146, murmur/repos/community-staging-x86_64/murmur.dbus.conf)
===
--- community-testing-x86_64/murmur.dbus.conf

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

2017-12-12 Thread Sven-Hendrik Haase via arch-commits 
Date: Wednesday, December 13, 2017 @ 04:25:03
  Author: svenstaro
Revision: 274096

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 274095, murmur/trunk/0003-fix-long-username-query.patch)
  murmur/repos/community-staging-x86_64/0004-fix-username-validation.patch
(from rev 274095, murmur/trunk/0004-fix-username-validation.patch)
  murmur/repos/community-staging-x86_64/ChangeLog
(from rev 274095, murmur/trunk/ChangeLog)
  murmur/repos/community-staging-x86_64/PKGBUILD
(from rev 274095, murmur/trunk/PKGBUILD)
  murmur/repos/community-staging-x86_64/murmur.dbus.conf
(from rev 274095, murmur/trunk/murmur.dbus.conf)
  murmur/repos/community-staging-x86_64/murmur.install
(from rev 274095, murmur/trunk/murmur.install)
  murmur/repos/community-staging-x86_64/murmur.service
(from rev 274095, murmur/trunk/murmur.service)

+
 0003-fix-long-username-query.patch |   42 +
 0004-fix-username-validation.patch |   36 ++
 ChangeLog  |   36 ++
 PKGBUILD   |   57 +++
 murmur.dbus.conf   |   22 +
 murmur.install |9 +
 murmur.service |   12 +++
 7 files changed, 214 insertions(+)

Copied: 
murmur/repos/community-staging-x86_64/0003-fix-long-username-query.patch (from 
rev 274095, 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 2017-12-13 
04:25:03 UTC (rev 274096)
@@ -0,0 +1,42 @@
+commit 6b33dda344f89e5a039b7d79eb43925040654242
+Author: Benjamin Jemlich 
+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 ) {
+ 
+   for (int i=0;i= 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 , const QString , 
const QStringList 
+   TransactionHolder th;
+   QSqlQuery  = *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 ) {
+   TransactionHolder th;
+ 
+   QSqlQuery  = *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 274095, 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 2017-12-13 
04:25:03 UTC (rev 274096)
@@ -0,0 +1,36 @@
+commit 5c40cfeb4b5f8911df926c19f2dd628703840f64
+Author: Stefan Hacker 
+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 ) {
+ 
+   for (int i=0;i= 0) {
+   name =