Commit 97afb8fb authored by amnon's avatar amnon

boost rebuilds

parent 46e8eac4
#
# Apps Packages for Chakra, part of chakra-project.org
#
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# include global config
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
# If you want support for your G15 Keyboard, please add 'g15daemon'
# to the depends and delete "no-g15" in the configure line below
pkgname=mumble
pkgver=1.2.2
pkgrel=1
arch=('i686' 'x86_64')
pkgdesc="A voice chat application similar to TeamSpeak"
license=('GPL')
depends=('qt' 'speex' 'celt-0.7' 'lsb-release' 'libxi' 'avahi' 'libsndfile' 'protobuf')
makedepends=('boost' 'mesa' 'avahi')
#optdepends=('portaudio: for portaudio back-end' 'g15daemon: G15 Keyboard support')
options=('!libtool')
install=mumble.install
url="http://mumble.sourceforge.net/"
source=("http://downloads.sourceforge.net/mumble/$pkgname-$pkgver.tar.gz" \
mumble11x.desktop )
md5sums=('de30ee85170e183b66568b53b04c5727'
'70dcaa8ad2ecf68c6ba52ea03d112bcd')
build() {
cd $srcdir/$pkgname-$pkgver
# Building mumble
/usr/bin/qmake main.pro \
CONFIG+="no-bundled-speex no-speechd no-bundled-celt no-g15 no-xevie no-server \
no-embed-qt-translations no-pulseaudio packaged" \
DEFINES+="PLUGIN_PATH=/usr/lib/mumble/plugins"
make
}
package() {
cd $srcdir/$pkgname-$pkgver
# create directories and copy files
install -m755 -D ./release/mumble $pkgdir/usr/bin/mumble
install -m755 -D ./release/mumble11x $pkgdir/usr/bin/mumble11x
install -m755 -D ./scripts/mumble-overlay $pkgdir/usr/bin/mumble-overlay
install -m755 -d $pkgdir/usr/lib/mumble/plugins
install -m755 -D ./release/libmumble.so.$pkgver $pkgdir/usr/lib/mumble/
ln -s libmumble.so.$pkgver $pkgdir/usr/lib/mumble/libmumble.so
ln -s libmumble.so.$pkgver $pkgdir/usr/lib/mumble/libmumble.so.1
ln -s libmumble.so.$pkgver $pkgdir/usr/lib/mumble/libmumble.so.1.2
install -m755 -D ./release/plugins/liblink.so $pkgdir/usr/lib/mumble/plugins/
install -m755 -d $pkgdir/usr/share/applications
install -m644 -D ./scripts/mumble.desktop $pkgdir/usr/share/applications/mumble.desktop
install -m644 -D $srcdir/mumble11x.desktop $pkgdir/usr/share/applications/mumble11x.desktop
install -m755 -d $pkgdir/usr/share/man/man1
install -m644 -D ./man/mum* $pkgdir/usr/share/man/man1/
install -m644 -D ./icons/mumble.svg $pkgdir/usr/share/icons/hicolor/scalable/apps/mumble.svg
}
# vim: sw=2:ts=2 et:
post_install() {
gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
echo "If you are using pulseaudio, you should consider installing mumble-pulse from AUR."
}
post_upgrade() {
post_install
}
post_remove() {
post_install
}
[Desktop Entry]
Name=Mumble (1.1.X compatible)
GenericName=Voice Chat
Comment=Voice chat program (compatible with Mumble 1.1.X)
Exec=mumble11x
Icon=mumble
Terminal=false
Type=Application
StartupNotify=false
Categories=Network;Chat;Qt;
Version=1.2.1
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();
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;
#
# Core Packages for Chakra, part of chakra-project.org
#
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# include global config
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=murmur
pkgver=1.2.2
pkgrel=1
pkgdesc="The voice chat application server for Mumble"
arch=('i686' 'x86_64')
url="http://mumble.sourceforge.net"
license=('GPL')
depends=('avahi' 'lsb-release' 'protobuf' 'qt>=4.4.0')
makedepends=('boost')
conflicts=('murmur-ice' 'murmur-static' 'murmur-git')
backup=("etc/murmur.ini"
"etc/logrotate.d/murmur"
"etc/conf.d/murmur" )
install="murmur.install"
source=("http://downloads.sourceforge.net/mumble/mumble-$pkgver.tar.gz"
"murmur.rc.d"
"murmur.conf.d"
"murmur.dbus.conf"
"murmur.logrotate.d"
"0003-fix-long-username-query.patch"
"0004-fix-username-validation.patch"
)
md5sums=('de30ee85170e183b66568b53b04c5727'
'b99061be67c54bf0bb4a061fd1280281'
'11c1cc875e8021739ec2087252cf0533'
'eddea4cdbd0bde4b960a67e16b5d5478'
'c56726cb267ead68f37f35c28e36e6fa'
'6285045568457cd4858232d9c2b23616'
'088ade43d532f37c3d989590c0e428ab')
build() {
cd ${srcdir}/mumble-$pkgver
# Le security fixes.
patch -Np1 < "${srcdir}/0003-fix-long-username-query.patch"
patch -Np1 < "${srcdir}/0004-fix-username-validation.patch"
qmake main.pro CONFIG+="no-client no-ice"
make
}
package() {
cd ${srcdir}/mumble-$pkgver
sed -e "1i# vi:ft=cfg" \
-e "s|database=|database=/var/lib/murmur/murmur.sqlite|" \
-e "s|dbus=session|#dbus=system|" \
-e "s|#logfile=murmur.log|logfile=/var/log/murmur/murmur.log|" \
-e "s|#pidfile=|pidfile=/var/run/murmur/murmur.pid|" \
-e "s|#uname=|uname=murmur|" \
-i scripts/murmur.ini
install -dm755 ${pkgdir}/var/lib/murmur
install -dm755 ${pkgdir}/var/log/murmur
install -dm755 ${pkgdir}/var/run/murmur
install -Dm755 release/murmurd ${pkgdir}/usr/sbin/murmurd
install -Dm644 scripts/murmur.ini ${pkgdir}/etc/murmur.ini
install -Dm755 ${srcdir}/murmur.rc.d ${pkgdir}/etc/rc.d/murmur
install -Dm644 ${srcdir}/murmur.conf.d ${pkgdir}/etc/conf.d/murmur
install -Dm644 ${srcdir}/murmur.dbus.conf \
${pkgdir}/etc/dbus-1/system.d/murmur.conf
install -Dm644 ${srcdir}/murmur.logrotate.d \
${pkgdir}/etc/logrotate.d/murmur
install -Dm644 README ${pkgdir}/usr/share/doc/murmur/README
install -Dm644 man/murmurd.1 ${pkgdir}/usr/share/man/man1/murmurd.1
}
# vim: sw=2:ts=2 et:
# Use /etc/murmur.ini as configuration file
PARAMS="-ini /etc/murmur.ini"
<!-- 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>
post_install() {
# bug: dbus reload here doesn't work
# workaround: it seems to work if you do it a few seconds later, manually
/etc/rc.d/dbus reload > /dev/null
/usr/bin/getent group murmur > /dev/null || /usr/sbin/groupadd murmur
/usr/bin/getent passwd murmur > /dev/null || \
/usr/sbin/useradd -d /var/lib/murmur -g murmur -s /bin/false murmur
chown -R murmur:murmur /var/lib/murmur
chown -R murmur:murmur /var/run/murmur
chown -R murmur:murmur /var/log/murmur
echo
echo '==> Set the SuperUser password with (as root):'
echo '==> murmurd -ini /etc/murmur.ini -supw PASSWORD'
}
post_upgrade() {
post_install
}
pre_remove() {
[ -f /var/run/daemons/murmur ] && /etc/rc.d/murmur stop > /dev/null
killall -u murmur -5
sleep 1
}
post_remove() {
/etc/rc.d/dbus reload > /dev/null
/usr/sbin/userdel murmur > /dev/null
}
/var/log/murmur/murmur.log {
missingok
postrotate
/bin/kill -HUP `cat /var/run/murmur/murmur.pid 2>/dev/null` 2> /dev/null || true
endscript
}
#!/bin/bash
CONF=/etc/conf.d/murmur
. /etc/rc.conf
. /etc/rc.d/functions
[ -f $CONF ] && . $CONF
PID=$(pidof -o %PPID /usr/sbin/murmurd)
case "$1" in
start)
stat_busy "Starting murmur"
[ -z "$PID" ] && /usr/sbin/murmurd $PARAMS
if [ $? -gt 0 ]; then
stat_fail
else
add_daemon murmur
stat_done
fi
;;
stop)
stat_busy "Stopping murmur"
[ ! -z "$PID" ] && kill $PID &> /dev/null
if [ $? -gt 0 ]; then
stat_fail
else
rm_daemon murmur
stat_done
fi
;;
restart)
$0 stop
sleep 1
$0 start
;;
*)
echo "usage: $0 {start|stop|restart}"
esac
exit 0
......@@ -9,7 +9,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=videocatcher
pkgver=0.1.5
pkgrel=2
pkgrel=3
pkgdesc="A videocast client for KDE. It makes it possible to subscribe to video RSS (and ATOM etc.) feeds and easily download videos"
arch=('i686' 'x86_64')
url="http://kde-apps.org/content/show.php/Videocatcher?content=121556"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment