From bf575dcce01f8c9d377f314ccac3fc16c9880090 Mon Sep 17 00:00:00 2001 From: Giovanni Harting <539@idlegandalf.com> Date: Fri, 12 May 2017 15:36:53 +0200 Subject: [PATCH 01/25] v1.3.0_2380_g97c34f4; initial upload --- .SRCINFO | 28 ++++++++++++++++++++++++++++ PKGBUILD | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+) create mode 100644 .SRCINFO create mode 100644 PKGBUILD diff --git a/.SRCINFO b/.SRCINFO new file mode 100644 index 0000000..341f735 --- /dev/null +++ b/.SRCINFO @@ -0,0 +1,28 @@ +pkgbase = murmur-snapshot-ice + pkgdesc = The voice chat application server for Mumble (development snapshot) + pkgver = 1.3.0_2380_g97c34f4 + pkgrel = 1 + url = https://wiki.mumble.info/wiki/ + arch = i686 + arch = x86_64 + arch = armv7h + license = BSD + makedepends = boost + makedepends = python + depends = protobuf + depends = qt5-base + depends = zeroc-ice + provides = murmur + conflicts = murmur + conflicts = murmur-static + conflicts = murmur-ice + conflicts = murmur-snapshot-noice + backup = etc/murmur.ini + source = https://mumble.info/snapshot/mumble-1.3.0~2380~g97c34f4~snapshot.tar.gz + source = https://mumble.info/snapshot/mumble-1.3.0~2380~g97c34f4~snapshot.tar.gz.sig + validpgpkeys = C4666C6767A26017CE68406988048D0D625297A0 + sha256sums = ece9f42cc11b63b9380fcb03847e4543d91a42b11241b1f8827c127ac3ce5c5a + sha256sums = SKIP + +pkgname = murmur-snapshot-ice + diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 0000000..7d6d592 --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,55 @@ +# Maintainer: Giovanni Harting <539@idlegandalf.com> +# Contributor: Felix Singer +# Contributor: Lari Tikkanen +# Contributor: Sven-Hendrik Haase +# Contributor: Otto Allmendinger +# Contributor: Malte Rabenseifner + +pkgname=murmur-snapshot-ice +pkgver=1.3.0_2380_g97c34f4 +pkgrel=1 +pkgdesc="The voice chat application server for Mumble (development snapshot)" +arch=('i686' 'x86_64' 'armv7h') +url="https://wiki.mumble.info/wiki/" +license=('BSD') +depends=('protobuf' 'qt5-base' 'zeroc-ice') + +makedepends=('boost' 'python') +conflicts=('murmur' 'murmur-static' 'murmur-ice' 'murmur-snapshot-noice') +provides=('murmur') +backup=("etc/murmur.ini") +source=("https://mumble.info/snapshot/mumble-${pkgver//_/\~}~snapshot.tar.gz" + "https://mumble.info/snapshot/mumble-${pkgver//_/\~}~snapshot.tar.gz.sig") +sha256sums=('ece9f42cc11b63b9380fcb03847e4543d91a42b11241b1f8827c127ac3ce5c5a' + 'SKIP') +validpgpkeys=('C4666C6767A26017CE68406988048D0D625297A0') + + +build() { + cd $srcdir/mumble-${pkgver//_/\~}~snapshot + + qmake-qt5 main.pro CONFIG+="no-client no-bonjour optimize" INCLUDEPATH+="/usr/include/openssl-1.0" QMAKE_LFLAGS+="-L/usr/lib/openssl-1.0 -lssl -lcrypto" + make release +} + +package() { + cd $srcdir/mumble-${pkgver//_/\~}~snapshot + + 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 + + sed -e "s|||" -i scripts/murmur.conf + + install -dm755 -o 122 -g 122 ${pkgdir}/var/lib/murmur + install -Dm755 release/murmurd ${pkgdir}/usr/bin/murmurd + install -Dm644 scripts/murmur.ini ${pkgdir}/etc/murmur.ini + install -Dm644 scripts/murmur.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 scripts/murmur.service ${pkgdir}/usr/lib/systemd/system/murmur.service + install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + install -Dm644 src/murmur/Murmur.ice ${pkgdir}/usr/share/murmur/Murmur.ice +} From 419682403493492eacebc06fa5219f250e33d625 Mon Sep 17 00:00:00 2001 From: Giovanni Harting <539@idlegandalf.com> Date: Fri, 12 May 2017 17:41:12 +0200 Subject: [PATCH 02/25] added .install --- .SRCINFO | 3 ++- PKGBUILD | 5 +++-- murmur.install | 15 +++++++++++++++ 3 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 murmur.install diff --git a/.SRCINFO b/.SRCINFO index 341f735..08352a5 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,8 +1,9 @@ pkgbase = murmur-snapshot-ice pkgdesc = The voice chat application server for Mumble (development snapshot) pkgver = 1.3.0_2380_g97c34f4 - pkgrel = 1 + pkgrel = 2 url = https://wiki.mumble.info/wiki/ + install = murmur.install arch = i686 arch = x86_64 arch = armv7h diff --git a/PKGBUILD b/PKGBUILD index 7d6d592..9522415 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,7 +7,7 @@ pkgname=murmur-snapshot-ice pkgver=1.3.0_2380_g97c34f4 -pkgrel=1 +pkgrel=2 pkgdesc="The voice chat application server for Mumble (development snapshot)" arch=('i686' 'x86_64' 'armv7h') url="https://wiki.mumble.info/wiki/" @@ -18,6 +18,7 @@ makedepends=('boost' 'python') conflicts=('murmur' 'murmur-static' 'murmur-ice' 'murmur-snapshot-noice') provides=('murmur') backup=("etc/murmur.ini") +install="murmur.install" source=("https://mumble.info/snapshot/mumble-${pkgver//_/\~}~snapshot.tar.gz" "https://mumble.info/snapshot/mumble-${pkgver//_/\~}~snapshot.tar.gz.sig") sha256sums=('ece9f42cc11b63b9380fcb03847e4543d91a42b11241b1f8827c127ac3ce5c5a' @@ -39,11 +40,11 @@ package() { -e "s|database=|database=/var/lib/murmur/murmur.sqlite|" \ -e "s|;logfile=murmur.log|logfile=|" \ -e "s|;uname=|uname=murmur|" \ + -e "s|;pidfile=|pidfile=/run/murmur/murmur.pid|" \ -i scripts/murmur.ini sed -e "s|||" -i scripts/murmur.conf - install -dm755 -o 122 -g 122 ${pkgdir}/var/lib/murmur install -Dm755 release/murmurd ${pkgdir}/usr/bin/murmurd install -Dm644 scripts/murmur.ini ${pkgdir}/etc/murmur.ini install -Dm644 scripts/murmur.conf ${pkgdir}/etc/dbus-1/system.d/murmur.conf diff --git a/murmur.install b/murmur.install new file mode 100644 index 0000000..9a52b86 --- /dev/null +++ b/murmur.install @@ -0,0 +1,15 @@ +post_install () { + # Check user/group murmur exists + getent group murmur >/dev/null || groupadd --system murmur + getent passwd murmur >/dev/null || \ + useradd --system -c "Murmur voice server" -g murmur -s /bin/false -d /var/lib/murmur murmur + post_upgrade +} + +post_upgrade() { + # Ensure directories exist + mkdir -p /var/lib/murmur /run/murmur + # Fix permissions on necessary directories + chown murmur.murmur /var/lib/murmur /run/murmur +} + From f2abb5752c30899cdd2b3bec811f050a947fb41e Mon Sep 17 00:00:00 2001 From: Giovanni Harting <539@idlegandalf.com> Date: Sat, 13 May 2017 14:27:02 +0200 Subject: [PATCH 03/25] moved storage dir back into package --- .SRCINFO | 2 +- PKGBUILD | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 08352a5..c3ab288 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = murmur-snapshot-ice pkgdesc = The voice chat application server for Mumble (development snapshot) pkgver = 1.3.0_2380_g97c34f4 - pkgrel = 2 + pkgrel = 3 url = https://wiki.mumble.info/wiki/ install = murmur.install arch = i686 diff --git a/PKGBUILD b/PKGBUILD index 9522415..f07d469 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,7 +7,7 @@ pkgname=murmur-snapshot-ice pkgver=1.3.0_2380_g97c34f4 -pkgrel=2 +pkgrel=3 pkgdesc="The voice chat application server for Mumble (development snapshot)" arch=('i686' 'x86_64' 'armv7h') url="https://wiki.mumble.info/wiki/" @@ -45,6 +45,7 @@ package() { sed -e "s|||" -i scripts/murmur.conf + 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 scripts/murmur.conf ${pkgdir}/etc/dbus-1/system.d/murmur.conf From 6beee3229ef8b53bc1a1ff75c793ee7d781e8683 Mon Sep 17 00:00:00 2001 From: Giovanni Harting <539@idlegandalf.com> Date: Thu, 25 May 2017 01:29:34 +0200 Subject: [PATCH 04/25] v1.3.0~2389 --- .SRCINFO | 10 +++++----- PKGBUILD | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index c3ab288..c0089a7 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = murmur-snapshot-ice pkgdesc = The voice chat application server for Mumble (development snapshot) - pkgver = 1.3.0_2380_g97c34f4 - pkgrel = 3 + pkgver = 1.3.0_2389_gdde8173 + pkgrel = 1 url = https://wiki.mumble.info/wiki/ install = murmur.install arch = i686 @@ -19,10 +19,10 @@ pkgbase = murmur-snapshot-ice conflicts = murmur-ice conflicts = murmur-snapshot-noice backup = etc/murmur.ini - source = https://mumble.info/snapshot/mumble-1.3.0~2380~g97c34f4~snapshot.tar.gz - source = https://mumble.info/snapshot/mumble-1.3.0~2380~g97c34f4~snapshot.tar.gz.sig + source = https://mumble.info/snapshot/mumble-1.3.0~2389~gdde8173~snapshot.tar.gz + source = https://mumble.info/snapshot/mumble-1.3.0~2389~gdde8173~snapshot.tar.gz.sig validpgpkeys = C4666C6767A26017CE68406988048D0D625297A0 - sha256sums = ece9f42cc11b63b9380fcb03847e4543d91a42b11241b1f8827c127ac3ce5c5a + sha256sums = facba5c71d8e610ece1c966d898dcb9a0511debdb9ea823d1979398fc60fa343 sha256sums = SKIP pkgname = murmur-snapshot-ice diff --git a/PKGBUILD b/PKGBUILD index f07d469..6c59a2a 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -6,8 +6,8 @@ # Contributor: Malte Rabenseifner pkgname=murmur-snapshot-ice -pkgver=1.3.0_2380_g97c34f4 -pkgrel=3 +pkgver=1.3.0_2389_gdde8173 +pkgrel=1 pkgdesc="The voice chat application server for Mumble (development snapshot)" arch=('i686' 'x86_64' 'armv7h') url="https://wiki.mumble.info/wiki/" @@ -21,7 +21,7 @@ backup=("etc/murmur.ini") install="murmur.install" source=("https://mumble.info/snapshot/mumble-${pkgver//_/\~}~snapshot.tar.gz" "https://mumble.info/snapshot/mumble-${pkgver//_/\~}~snapshot.tar.gz.sig") -sha256sums=('ece9f42cc11b63b9380fcb03847e4543d91a42b11241b1f8827c127ac3ce5c5a' +sha256sums=('facba5c71d8e610ece1c966d898dcb9a0511debdb9ea823d1979398fc60fa343' 'SKIP') validpgpkeys=('C4666C6767A26017CE68406988048D0D625297A0') From e56c47ee161ef14a8e458000adaa1405d9fcf6dc Mon Sep 17 00:00:00 2001 From: Giovanni Harting <539@idlegandalf.com> Date: Thu, 15 Jun 2017 19:44:19 +0200 Subject: [PATCH 05/25] v1.3.0-2424 --- .SRCINFO | 8 ++++---- PKGBUILD | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index c0089a7..5e732e0 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = murmur-snapshot-ice pkgdesc = The voice chat application server for Mumble (development snapshot) - pkgver = 1.3.0_2389_gdde8173 + pkgver = 1.3.0_2424_gd66eeeb pkgrel = 1 url = https://wiki.mumble.info/wiki/ install = murmur.install @@ -19,10 +19,10 @@ pkgbase = murmur-snapshot-ice conflicts = murmur-ice conflicts = murmur-snapshot-noice backup = etc/murmur.ini - source = https://mumble.info/snapshot/mumble-1.3.0~2389~gdde8173~snapshot.tar.gz - source = https://mumble.info/snapshot/mumble-1.3.0~2389~gdde8173~snapshot.tar.gz.sig + source = https://mumble.info/snapshot/mumble-1.3.0~2424~gd66eeeb~snapshot.tar.gz + source = https://mumble.info/snapshot/mumble-1.3.0~2424~gd66eeeb~snapshot.tar.gz.sig validpgpkeys = C4666C6767A26017CE68406988048D0D625297A0 - sha256sums = facba5c71d8e610ece1c966d898dcb9a0511debdb9ea823d1979398fc60fa343 + sha256sums = bcbe826d94f0020883125cb16256ed3eb6d657a43e9c50698dda02d5cd886462 sha256sums = SKIP pkgname = murmur-snapshot-ice diff --git a/PKGBUILD b/PKGBUILD index 6c59a2a..5386c92 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -6,7 +6,7 @@ # Contributor: Malte Rabenseifner pkgname=murmur-snapshot-ice -pkgver=1.3.0_2389_gdde8173 +pkgver=1.3.0_2424_gd66eeeb pkgrel=1 pkgdesc="The voice chat application server for Mumble (development snapshot)" arch=('i686' 'x86_64' 'armv7h') @@ -21,7 +21,7 @@ backup=("etc/murmur.ini") install="murmur.install" source=("https://mumble.info/snapshot/mumble-${pkgver//_/\~}~snapshot.tar.gz" "https://mumble.info/snapshot/mumble-${pkgver//_/\~}~snapshot.tar.gz.sig") -sha256sums=('facba5c71d8e610ece1c966d898dcb9a0511debdb9ea823d1979398fc60fa343' +sha256sums=('bcbe826d94f0020883125cb16256ed3eb6d657a43e9c50698dda02d5cd886462' 'SKIP') validpgpkeys=('C4666C6767A26017CE68406988048D0D625297A0') From c52f7a1f08b38f8cee62a4a2c67d94c2b928f612 Mon Sep 17 00:00:00 2001 From: Giovanni Harting <539@idlegandalf.com> Date: Sun, 23 Jul 2017 18:20:13 +0200 Subject: [PATCH 06/25] v1.3.0~2466~gfcb367f --- .SRCINFO | 8 ++++---- PKGBUILD | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 5e732e0..1cebc04 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = murmur-snapshot-ice pkgdesc = The voice chat application server for Mumble (development snapshot) - pkgver = 1.3.0_2424_gd66eeeb + pkgver = 1.3.0_2466_gfcb367f pkgrel = 1 url = https://wiki.mumble.info/wiki/ install = murmur.install @@ -19,10 +19,10 @@ pkgbase = murmur-snapshot-ice conflicts = murmur-ice conflicts = murmur-snapshot-noice backup = etc/murmur.ini - source = https://mumble.info/snapshot/mumble-1.3.0~2424~gd66eeeb~snapshot.tar.gz - source = https://mumble.info/snapshot/mumble-1.3.0~2424~gd66eeeb~snapshot.tar.gz.sig + source = https://mumble.info/snapshot/mumble-1.3.0~2466~gfcb367f~snapshot.tar.gz + source = https://mumble.info/snapshot/mumble-1.3.0~2466~gfcb367f~snapshot.tar.gz.sig validpgpkeys = C4666C6767A26017CE68406988048D0D625297A0 - sha256sums = bcbe826d94f0020883125cb16256ed3eb6d657a43e9c50698dda02d5cd886462 + sha256sums = a212d7984222a16ba62bf340c2e75f63a6d2177f93f8d52ed521b9dd72596c1b sha256sums = SKIP pkgname = murmur-snapshot-ice diff --git a/PKGBUILD b/PKGBUILD index 5386c92..9c6f762 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -6,7 +6,7 @@ # Contributor: Malte Rabenseifner pkgname=murmur-snapshot-ice -pkgver=1.3.0_2424_gd66eeeb +pkgver=1.3.0_2466_gfcb367f pkgrel=1 pkgdesc="The voice chat application server for Mumble (development snapshot)" arch=('i686' 'x86_64' 'armv7h') @@ -21,7 +21,7 @@ backup=("etc/murmur.ini") install="murmur.install" source=("https://mumble.info/snapshot/mumble-${pkgver//_/\~}~snapshot.tar.gz" "https://mumble.info/snapshot/mumble-${pkgver//_/\~}~snapshot.tar.gz.sig") -sha256sums=('bcbe826d94f0020883125cb16256ed3eb6d657a43e9c50698dda02d5cd886462' +sha256sums=('a212d7984222a16ba62bf340c2e75f63a6d2177f93f8d52ed521b9dd72596c1b' 'SKIP') validpgpkeys=('C4666C6767A26017CE68406988048D0D625297A0') From 33802f2c006340bd299661e714dc945671b68842 Mon Sep 17 00:00:00 2001 From: Giovanni Harting <539@idlegandalf.com> Date: Thu, 3 Aug 2017 02:11:55 +0200 Subject: [PATCH 07/25] v1.3.0~2460~gc93b087 --- .SRCINFO | 8 +++++--- PKGBUILD | 12 +++++++----- murmur.tmpfilesd | 1 + 3 files changed, 13 insertions(+), 8 deletions(-) create mode 100644 murmur.tmpfilesd diff --git a/.SRCINFO b/.SRCINFO index 1cebc04..c2fefb5 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = murmur-snapshot-ice pkgdesc = The voice chat application server for Mumble (development snapshot) - pkgver = 1.3.0_2466_gfcb367f + pkgver = 1.3.0_2460_gc93b087 pkgrel = 1 url = https://wiki.mumble.info/wiki/ install = murmur.install @@ -19,11 +19,13 @@ pkgbase = murmur-snapshot-ice conflicts = murmur-ice conflicts = murmur-snapshot-noice backup = etc/murmur.ini - source = https://mumble.info/snapshot/mumble-1.3.0~2466~gfcb367f~snapshot.tar.gz - source = https://mumble.info/snapshot/mumble-1.3.0~2466~gfcb367f~snapshot.tar.gz.sig + source = https://mumble.info/snapshot/mumble-1.3.0~2460~gc93b087~snapshot.tar.gz + source = https://mumble.info/snapshot/mumble-1.3.0~2460~gc93b087~snapshot.tar.gz.sig + source = murmur.tmpfilesd validpgpkeys = C4666C6767A26017CE68406988048D0D625297A0 sha256sums = a212d7984222a16ba62bf340c2e75f63a6d2177f93f8d52ed521b9dd72596c1b sha256sums = SKIP + sha256sums = 25bf2dbd7574459724b4621fb93c09484dc7520297fa1d0f247a19b592d8cb8e pkgname = murmur-snapshot-ice diff --git a/PKGBUILD b/PKGBUILD index 9c6f762..0b7d561 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -6,7 +6,7 @@ # Contributor: Malte Rabenseifner pkgname=murmur-snapshot-ice -pkgver=1.3.0_2466_gfcb367f +pkgver=1.3.0_2460_gc93b087 pkgrel=1 pkgdesc="The voice chat application server for Mumble (development snapshot)" arch=('i686' 'x86_64' 'armv7h') @@ -18,11 +18,12 @@ makedepends=('boost' 'python') conflicts=('murmur' 'murmur-static' 'murmur-ice' 'murmur-snapshot-noice') provides=('murmur') backup=("etc/murmur.ini") -install="murmur.install" -source=("https://mumble.info/snapshot/mumble-${pkgver//_/\~}~snapshot.tar.gz" - "https://mumble.info/snapshot/mumble-${pkgver//_/\~}~snapshot.tar.gz.sig") +install=murmur.install +source=("https://mumble.info/snapshot/mumble-${pkgver//_/\~}~snapshot.tar.gz"{,.sig} + murmur.tmpfilesd) sha256sums=('a212d7984222a16ba62bf340c2e75f63a6d2177f93f8d52ed521b9dd72596c1b' - 'SKIP') + 'SKIP' + '25bf2dbd7574459724b4621fb93c09484dc7520297fa1d0f247a19b592d8cb8e') validpgpkeys=('C4666C6767A26017CE68406988048D0D625297A0') @@ -54,4 +55,5 @@ package() { install -Dm644 scripts/murmur.service ${pkgdir}/usr/lib/systemd/system/murmur.service install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE install -Dm644 src/murmur/Murmur.ice ${pkgdir}/usr/share/murmur/Murmur.ice + install -Dm644 ${srcdir}/murmur.tmpfilesd ${pkgdir}/usr/lib/tmpfiles.d/murmur.conf } diff --git a/murmur.tmpfilesd b/murmur.tmpfilesd new file mode 100644 index 0000000..5a789b2 --- /dev/null +++ b/murmur.tmpfilesd @@ -0,0 +1 @@ +d /run/murmur 0755 murmur murmur - From 54f9f892145248988c10100ed6462a033aaa7ac2 Mon Sep 17 00:00:00 2001 From: Giovanni Harting <539@idlegandalf.com> Date: Thu, 3 Aug 2017 02:19:08 +0200 Subject: [PATCH 08/25] v1.3.0~2523~g5aaf1ed --- .SRCINFO | 8 ++++---- PKGBUILD | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index c2fefb5..57726a1 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = murmur-snapshot-ice pkgdesc = The voice chat application server for Mumble (development snapshot) - pkgver = 1.3.0_2460_gc93b087 + pkgver = 1.3.0_2523_g5aaf1ed pkgrel = 1 url = https://wiki.mumble.info/wiki/ install = murmur.install @@ -19,11 +19,11 @@ pkgbase = murmur-snapshot-ice conflicts = murmur-ice conflicts = murmur-snapshot-noice backup = etc/murmur.ini - source = https://mumble.info/snapshot/mumble-1.3.0~2460~gc93b087~snapshot.tar.gz - source = https://mumble.info/snapshot/mumble-1.3.0~2460~gc93b087~snapshot.tar.gz.sig + source = https://mumble.info/snapshot/mumble-1.3.0~2523~g5aaf1ed~snapshot.tar.gz + source = https://mumble.info/snapshot/mumble-1.3.0~2523~g5aaf1ed~snapshot.tar.gz.sig source = murmur.tmpfilesd validpgpkeys = C4666C6767A26017CE68406988048D0D625297A0 - sha256sums = a212d7984222a16ba62bf340c2e75f63a6d2177f93f8d52ed521b9dd72596c1b + sha256sums = e08c5f5a3e0fdb147b917657d2e20a015ba4864fc2917642af8c61cd0ef26917 sha256sums = SKIP sha256sums = 25bf2dbd7574459724b4621fb93c09484dc7520297fa1d0f247a19b592d8cb8e diff --git a/PKGBUILD b/PKGBUILD index 0b7d561..54f8259 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -6,7 +6,7 @@ # Contributor: Malte Rabenseifner pkgname=murmur-snapshot-ice -pkgver=1.3.0_2460_gc93b087 +pkgver=1.3.0_2523_g5aaf1ed pkgrel=1 pkgdesc="The voice chat application server for Mumble (development snapshot)" arch=('i686' 'x86_64' 'armv7h') @@ -21,7 +21,7 @@ backup=("etc/murmur.ini") install=murmur.install source=("https://mumble.info/snapshot/mumble-${pkgver//_/\~}~snapshot.tar.gz"{,.sig} murmur.tmpfilesd) -sha256sums=('a212d7984222a16ba62bf340c2e75f63a6d2177f93f8d52ed521b9dd72596c1b' +sha256sums=('e08c5f5a3e0fdb147b917657d2e20a015ba4864fc2917642af8c61cd0ef26917' 'SKIP' '25bf2dbd7574459724b4621fb93c09484dc7520297fa1d0f247a19b592d8cb8e') validpgpkeys=('C4666C6767A26017CE68406988048D0D625297A0') From d8e97f254a2aa34a9fc7a7d86f217e9cfd6bc8a2 Mon Sep 17 00:00:00 2001 From: Giovanni Harting <539@idlegandalf.com> Date: Thu, 3 Aug 2017 21:06:07 +0200 Subject: [PATCH 09/25] added patch for ice 3.7 --- .SRCINFO | 2 ++ PKGBUILD | 11 +++++++++-- murmur-ice3.7.patch | 42 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 murmur-ice3.7.patch diff --git a/.SRCINFO b/.SRCINFO index 57726a1..252de9f 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -22,10 +22,12 @@ pkgbase = murmur-snapshot-ice source = https://mumble.info/snapshot/mumble-1.3.0~2523~g5aaf1ed~snapshot.tar.gz source = https://mumble.info/snapshot/mumble-1.3.0~2523~g5aaf1ed~snapshot.tar.gz.sig source = murmur.tmpfilesd + source = murmur-ice3.7.patch validpgpkeys = C4666C6767A26017CE68406988048D0D625297A0 sha256sums = e08c5f5a3e0fdb147b917657d2e20a015ba4864fc2917642af8c61cd0ef26917 sha256sums = SKIP sha256sums = 25bf2dbd7574459724b4621fb93c09484dc7520297fa1d0f247a19b592d8cb8e + sha256sums = 4e67c3de52d7fe856dd9e0eb7be5eabb0f088bd85c7ded413108e1b8bf4fe327 pkgname = murmur-snapshot-ice diff --git a/PKGBUILD b/PKGBUILD index 54f8259..6eea299 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -20,12 +20,19 @@ provides=('murmur') backup=("etc/murmur.ini") install=murmur.install source=("https://mumble.info/snapshot/mumble-${pkgver//_/\~}~snapshot.tar.gz"{,.sig} - murmur.tmpfilesd) + murmur.tmpfilesd + murmur-ice3.7.patch) sha256sums=('e08c5f5a3e0fdb147b917657d2e20a015ba4864fc2917642af8c61cd0ef26917' 'SKIP' - '25bf2dbd7574459724b4621fb93c09484dc7520297fa1d0f247a19b592d8cb8e') + '25bf2dbd7574459724b4621fb93c09484dc7520297fa1d0f247a19b592d8cb8e' + '4e67c3de52d7fe856dd9e0eb7be5eabb0f088bd85c7ded413108e1b8bf4fe327') validpgpkeys=('C4666C6767A26017CE68406988048D0D625297A0') +prepare() { + cd $srcdir/mumble-${pkgver//_/\~}~snapshot + + patch -p1 -i "${srcdir}/murmur-ice3.7.patch" +} build() { cd $srcdir/mumble-${pkgver//_/\~}~snapshot diff --git a/murmur-ice3.7.patch b/murmur-ice3.7.patch new file mode 100644 index 0000000..30ef2bb --- /dev/null +++ b/murmur-ice3.7.patch @@ -0,0 +1,42 @@ +diff --git a/src/murmur/murmur.pro b/src/murmur/murmur.pro +index bee4dc15..7ed20d6e 100644 +--- a/src/murmur/murmur.pro ++++ b/src/murmur/murmur.pro +@@ -88,8 +88,23 @@ ice { + win32:CONFIG(debug, debug|release) { + LIBS *= -lIceD -lIceUtilD + } else { +- LIBS *= -lIce -lIceUtil ++ # check Ice version, 3.7 merged IceUtil into Ice ++ ICE_VERSION = $$system(slice2cpp --version 2>&1) ++ ICE_MAJOR_VERSION = $$section(ICE_VERSION, ., 0, 0) ++ ICE_MINOR_VERSION = $$section(ICE_VERSION, ., 1, 1) ++ ++ !equals(ICE_MAJOR_VERSION, 3) { ++ error("Unsupported Ice version") ++ } ++ lessThan(ICE_MINOR_VERSION, 7) { ++ # Ice < 3.7 ++ LIBS *= -lIce -lIceUtil ++ } else { ++ # Ice 3.7+ ++ LIBS *= -lIce ++ } + } ++ + DEFINES *= USE_ICE + + win32 { +diff --git a/src/murmur/murmur_ice/murmur_ice.pro b/src/murmur/murmur_ice/murmur_ice.pro +index cbbf5e9b..62cc7abd 100644 +--- a/src/murmur/murmur_ice/murmur_ice.pro ++++ b/src/murmur/murmur_ice/murmur_ice.pro +@@ -16,7 +16,7 @@ win32 { + !isEmpty(ICE_VERSION) { + EXTRA_SLICEFLAGS = -I/usr/share/Ice-$$ICE_VERSION/slice/ + } +- slice.commands = slice2cpp --checksum -I/usr/local/share/Ice -I/usr/share/Ice/slice -I/usr/share/slice $$EXTRA_SLICEFLAGS ${QMAKE_FILE_NAME} ++ slice.commands = slice2cpp --checksum -I/usr/local/share/Ice -I/usr/share/Ice/slice -I/usr/share/ice/slice -I/usr/share/slice $$EXTRA_SLICEFLAGS ${QMAKE_FILE_NAME} + } + slice.input = SLICEFILES + slice.CONFIG *= no_link explicit_dependencies From f63458aaaee1073b958d60b18443861788b05adb Mon Sep 17 00:00:00 2001 From: Giovanni Harting <539@idlegandalf.com> Date: Fri, 11 Aug 2017 11:05:58 +0200 Subject: [PATCH 10/25] v1.3.0~2569~gd196a4b; removed upstreamed patch --- .SRCINFO | 10 ++++------ PKGBUILD | 16 ++++------------ murmur-ice3.7.patch | 42 ------------------------------------------ 3 files changed, 8 insertions(+), 60 deletions(-) delete mode 100644 murmur-ice3.7.patch diff --git a/.SRCINFO b/.SRCINFO index 252de9f..6b72cae 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = murmur-snapshot-ice pkgdesc = The voice chat application server for Mumble (development snapshot) - pkgver = 1.3.0_2523_g5aaf1ed + pkgver = 1.3.0_2569_gd196a4b pkgrel = 1 url = https://wiki.mumble.info/wiki/ install = murmur.install @@ -19,15 +19,13 @@ pkgbase = murmur-snapshot-ice conflicts = murmur-ice conflicts = murmur-snapshot-noice backup = etc/murmur.ini - source = https://mumble.info/snapshot/mumble-1.3.0~2523~g5aaf1ed~snapshot.tar.gz - source = https://mumble.info/snapshot/mumble-1.3.0~2523~g5aaf1ed~snapshot.tar.gz.sig + source = https://mumble.info/snapshot/mumble-1.3.0~2569~gd196a4b~snapshot.tar.gz + source = https://mumble.info/snapshot/mumble-1.3.0~2569~gd196a4b~snapshot.tar.gz.sig source = murmur.tmpfilesd - source = murmur-ice3.7.patch validpgpkeys = C4666C6767A26017CE68406988048D0D625297A0 - sha256sums = e08c5f5a3e0fdb147b917657d2e20a015ba4864fc2917642af8c61cd0ef26917 + sha256sums = 7ed89709a3dd51aa149e2bd215bb14463118669e8bb1b43854f9581c9b535503 sha256sums = SKIP sha256sums = 25bf2dbd7574459724b4621fb93c09484dc7520297fa1d0f247a19b592d8cb8e - sha256sums = 4e67c3de52d7fe856dd9e0eb7be5eabb0f088bd85c7ded413108e1b8bf4fe327 pkgname = murmur-snapshot-ice diff --git a/PKGBUILD b/PKGBUILD index 6eea299..29724d1 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -6,7 +6,7 @@ # Contributor: Malte Rabenseifner pkgname=murmur-snapshot-ice -pkgver=1.3.0_2523_g5aaf1ed +pkgver=1.3.0_2569_gd196a4b pkgrel=1 pkgdesc="The voice chat application server for Mumble (development snapshot)" arch=('i686' 'x86_64' 'armv7h') @@ -20,20 +20,12 @@ provides=('murmur') backup=("etc/murmur.ini") install=murmur.install source=("https://mumble.info/snapshot/mumble-${pkgver//_/\~}~snapshot.tar.gz"{,.sig} - murmur.tmpfilesd - murmur-ice3.7.patch) -sha256sums=('e08c5f5a3e0fdb147b917657d2e20a015ba4864fc2917642af8c61cd0ef26917' + murmur.tmpfilesd) +sha256sums=('7ed89709a3dd51aa149e2bd215bb14463118669e8bb1b43854f9581c9b535503' 'SKIP' - '25bf2dbd7574459724b4621fb93c09484dc7520297fa1d0f247a19b592d8cb8e' - '4e67c3de52d7fe856dd9e0eb7be5eabb0f088bd85c7ded413108e1b8bf4fe327') + '25bf2dbd7574459724b4621fb93c09484dc7520297fa1d0f247a19b592d8cb8e') validpgpkeys=('C4666C6767A26017CE68406988048D0D625297A0') -prepare() { - cd $srcdir/mumble-${pkgver//_/\~}~snapshot - - patch -p1 -i "${srcdir}/murmur-ice3.7.patch" -} - build() { cd $srcdir/mumble-${pkgver//_/\~}~snapshot diff --git a/murmur-ice3.7.patch b/murmur-ice3.7.patch deleted file mode 100644 index 30ef2bb..0000000 --- a/murmur-ice3.7.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/src/murmur/murmur.pro b/src/murmur/murmur.pro -index bee4dc15..7ed20d6e 100644 ---- a/src/murmur/murmur.pro -+++ b/src/murmur/murmur.pro -@@ -88,8 +88,23 @@ ice { - win32:CONFIG(debug, debug|release) { - LIBS *= -lIceD -lIceUtilD - } else { -- LIBS *= -lIce -lIceUtil -+ # check Ice version, 3.7 merged IceUtil into Ice -+ ICE_VERSION = $$system(slice2cpp --version 2>&1) -+ ICE_MAJOR_VERSION = $$section(ICE_VERSION, ., 0, 0) -+ ICE_MINOR_VERSION = $$section(ICE_VERSION, ., 1, 1) -+ -+ !equals(ICE_MAJOR_VERSION, 3) { -+ error("Unsupported Ice version") -+ } -+ lessThan(ICE_MINOR_VERSION, 7) { -+ # Ice < 3.7 -+ LIBS *= -lIce -lIceUtil -+ } else { -+ # Ice 3.7+ -+ LIBS *= -lIce -+ } - } -+ - DEFINES *= USE_ICE - - win32 { -diff --git a/src/murmur/murmur_ice/murmur_ice.pro b/src/murmur/murmur_ice/murmur_ice.pro -index cbbf5e9b..62cc7abd 100644 ---- a/src/murmur/murmur_ice/murmur_ice.pro -+++ b/src/murmur/murmur_ice/murmur_ice.pro -@@ -16,7 +16,7 @@ win32 { - !isEmpty(ICE_VERSION) { - EXTRA_SLICEFLAGS = -I/usr/share/Ice-$$ICE_VERSION/slice/ - } -- slice.commands = slice2cpp --checksum -I/usr/local/share/Ice -I/usr/share/Ice/slice -I/usr/share/slice $$EXTRA_SLICEFLAGS ${QMAKE_FILE_NAME} -+ slice.commands = slice2cpp --checksum -I/usr/local/share/Ice -I/usr/share/Ice/slice -I/usr/share/ice/slice -I/usr/share/slice $$EXTRA_SLICEFLAGS ${QMAKE_FILE_NAME} - } - slice.input = SLICEFILES - slice.CONFIG *= no_link explicit_dependencies From 0c6f234de313a55c12c5f58500df23185299c568 Mon Sep 17 00:00:00 2001 From: Giovanni Harting <539@idlegandalf.com> Date: Thu, 12 Oct 2017 21:19:26 +0200 Subject: [PATCH 11/25] switched to sysusers --- murmur.sysusers | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 murmur.sysusers diff --git a/murmur.sysusers b/murmur.sysusers new file mode 100644 index 0000000..d372879 --- /dev/null +++ b/murmur.sysusers @@ -0,0 +1,2 @@ +u murmur - "Murmur voice server" /var/lib/murmur + From 8fd434e8bfc2cb8bf2ae761becb18dead6a0ff91 Mon Sep 17 00:00:00 2001 From: Giovanni Harting <539@idlegandalf.com> Date: Thu, 12 Oct 2017 21:21:16 +0200 Subject: [PATCH 12/25] make neccessary changes in other files --- .SRCINFO | 5 ++++- PKGBUILD | 10 +++++++--- murmur.install | 10 ---------- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 6b72cae..36ec634 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = murmur-snapshot-ice pkgdesc = The voice chat application server for Mumble (development snapshot) pkgver = 1.3.0_2569_gd196a4b - pkgrel = 1 + pkgrel = 2 url = https://wiki.mumble.info/wiki/ install = murmur.install arch = i686 @@ -18,14 +18,17 @@ pkgbase = murmur-snapshot-ice conflicts = murmur-static conflicts = murmur-ice conflicts = murmur-snapshot-noice + options = emptydirs backup = etc/murmur.ini source = https://mumble.info/snapshot/mumble-1.3.0~2569~gd196a4b~snapshot.tar.gz source = https://mumble.info/snapshot/mumble-1.3.0~2569~gd196a4b~snapshot.tar.gz.sig source = murmur.tmpfilesd + source = murmur.sysusers validpgpkeys = C4666C6767A26017CE68406988048D0D625297A0 sha256sums = 7ed89709a3dd51aa149e2bd215bb14463118669e8bb1b43854f9581c9b535503 sha256sums = SKIP sha256sums = 25bf2dbd7574459724b4621fb93c09484dc7520297fa1d0f247a19b592d8cb8e + sha256sums = ff58059e77eb73a5c9ad8eb4ad8d8d7c865f3ae1fb6cb236a729f742da95d83d pkgname = murmur-snapshot-ice diff --git a/PKGBUILD b/PKGBUILD index 29724d1..1257737 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,7 +7,7 @@ pkgname=murmur-snapshot-ice pkgver=1.3.0_2569_gd196a4b -pkgrel=1 +pkgrel=2 pkgdesc="The voice chat application server for Mumble (development snapshot)" arch=('i686' 'x86_64' 'armv7h') url="https://wiki.mumble.info/wiki/" @@ -20,11 +20,14 @@ provides=('murmur') backup=("etc/murmur.ini") install=murmur.install source=("https://mumble.info/snapshot/mumble-${pkgver//_/\~}~snapshot.tar.gz"{,.sig} - murmur.tmpfilesd) + murmur.tmpfilesd + murmur.sysusers) sha256sums=('7ed89709a3dd51aa149e2bd215bb14463118669e8bb1b43854f9581c9b535503' 'SKIP' - '25bf2dbd7574459724b4621fb93c09484dc7520297fa1d0f247a19b592d8cb8e') + '25bf2dbd7574459724b4621fb93c09484dc7520297fa1d0f247a19b592d8cb8e' + 'ff58059e77eb73a5c9ad8eb4ad8d8d7c865f3ae1fb6cb236a729f742da95d83d') validpgpkeys=('C4666C6767A26017CE68406988048D0D625297A0') +options=('emptydirs') build() { cd $srcdir/mumble-${pkgver//_/\~}~snapshot @@ -55,4 +58,5 @@ package() { install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE install -Dm644 src/murmur/Murmur.ice ${pkgdir}/usr/share/murmur/Murmur.ice install -Dm644 ${srcdir}/murmur.tmpfilesd ${pkgdir}/usr/lib/tmpfiles.d/murmur.conf + install -dm644 ${srcdir}/murmur.sysusers ${pkgdir}/usr/lib/sysusers.d/murmur.conf } diff --git a/murmur.install b/murmur.install index 9a52b86..39a108a 100644 --- a/murmur.install +++ b/murmur.install @@ -1,14 +1,4 @@ -post_install () { - # Check user/group murmur exists - getent group murmur >/dev/null || groupadd --system murmur - getent passwd murmur >/dev/null || \ - useradd --system -c "Murmur voice server" -g murmur -s /bin/false -d /var/lib/murmur murmur - post_upgrade -} - post_upgrade() { - # Ensure directories exist - mkdir -p /var/lib/murmur /run/murmur # Fix permissions on necessary directories chown murmur.murmur /var/lib/murmur /run/murmur } From 706db3b68ddfb4f6c7b71a7c63a5636c0a7edf41 Mon Sep 17 00:00:00 2001 From: Giovanni Harting <539@idlegandalf.com> Date: Thu, 12 Oct 2017 21:32:26 +0200 Subject: [PATCH 13/25] fixed fatal typo --- .SRCINFO | 2 +- PKGBUILD | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 36ec634..903a392 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = murmur-snapshot-ice pkgdesc = The voice chat application server for Mumble (development snapshot) pkgver = 1.3.0_2569_gd196a4b - pkgrel = 2 + pkgrel = 3 url = https://wiki.mumble.info/wiki/ install = murmur.install arch = i686 diff --git a/PKGBUILD b/PKGBUILD index 1257737..f78645c 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,7 +7,7 @@ pkgname=murmur-snapshot-ice pkgver=1.3.0_2569_gd196a4b -pkgrel=2 +pkgrel=3 pkgdesc="The voice chat application server for Mumble (development snapshot)" arch=('i686' 'x86_64' 'armv7h') url="https://wiki.mumble.info/wiki/" @@ -58,5 +58,5 @@ package() { install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE install -Dm644 src/murmur/Murmur.ice ${pkgdir}/usr/share/murmur/Murmur.ice install -Dm644 ${srcdir}/murmur.tmpfilesd ${pkgdir}/usr/lib/tmpfiles.d/murmur.conf - install -dm644 ${srcdir}/murmur.sysusers ${pkgdir}/usr/lib/sysusers.d/murmur.conf + install -Dm644 ${srcdir}/murmur.sysusers ${pkgdir}/usr/lib/sysusers.d/murmur.conf } From e1cfbed6f6be26ee7bbccb23c81f204527f19fee Mon Sep 17 00:00:00 2001 From: Giovanni Harting <539@idlegandalf.com> Date: Tue, 24 Oct 2017 10:41:48 +0200 Subject: [PATCH 14/25] v1.3.0~g53c5a91~snapshot --- .SRCINFO | 10 +++++----- PKGBUILD | 6 +++--- murmur.install | 4 ++++ 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 903a392..1b68269 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = murmur-snapshot-ice pkgdesc = The voice chat application server for Mumble (development snapshot) - pkgver = 1.3.0_2569_gd196a4b - pkgrel = 3 + pkgver = 1.3.0_2584_g53c5a91 + pkgrel = 1 url = https://wiki.mumble.info/wiki/ install = murmur.install arch = i686 @@ -20,12 +20,12 @@ pkgbase = murmur-snapshot-ice conflicts = murmur-snapshot-noice options = emptydirs backup = etc/murmur.ini - source = https://mumble.info/snapshot/mumble-1.3.0~2569~gd196a4b~snapshot.tar.gz - source = https://mumble.info/snapshot/mumble-1.3.0~2569~gd196a4b~snapshot.tar.gz.sig + source = https://mumble.info/snapshot/mumble-1.3.0~2584~g53c5a91~snapshot.tar.gz + source = https://mumble.info/snapshot/mumble-1.3.0~2584~g53c5a91~snapshot.tar.gz.sig source = murmur.tmpfilesd source = murmur.sysusers validpgpkeys = C4666C6767A26017CE68406988048D0D625297A0 - sha256sums = 7ed89709a3dd51aa149e2bd215bb14463118669e8bb1b43854f9581c9b535503 + sha256sums = 0f5b042d56da91fdaada7016ca8f94bedf4fbaa0a78c7c57f54ca5b97c3ead82 sha256sums = SKIP sha256sums = 25bf2dbd7574459724b4621fb93c09484dc7520297fa1d0f247a19b592d8cb8e sha256sums = ff58059e77eb73a5c9ad8eb4ad8d8d7c865f3ae1fb6cb236a729f742da95d83d diff --git a/PKGBUILD b/PKGBUILD index f78645c..f3ab16a 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -6,8 +6,8 @@ # Contributor: Malte Rabenseifner pkgname=murmur-snapshot-ice -pkgver=1.3.0_2569_gd196a4b -pkgrel=3 +pkgver=1.3.0_2584_g53c5a91 +pkgrel=1 pkgdesc="The voice chat application server for Mumble (development snapshot)" arch=('i686' 'x86_64' 'armv7h') url="https://wiki.mumble.info/wiki/" @@ -22,7 +22,7 @@ install=murmur.install source=("https://mumble.info/snapshot/mumble-${pkgver//_/\~}~snapshot.tar.gz"{,.sig} murmur.tmpfilesd murmur.sysusers) -sha256sums=('7ed89709a3dd51aa149e2bd215bb14463118669e8bb1b43854f9581c9b535503' +sha256sums=('0f5b042d56da91fdaada7016ca8f94bedf4fbaa0a78c7c57f54ca5b97c3ead82' 'SKIP' '25bf2dbd7574459724b4621fb93c09484dc7520297fa1d0f247a19b592d8cb8e' 'ff58059e77eb73a5c9ad8eb4ad8d8d7c865f3ae1fb6cb236a729f742da95d83d') diff --git a/murmur.install b/murmur.install index 39a108a..fcc2a80 100644 --- a/murmur.install +++ b/murmur.install @@ -1,3 +1,7 @@ +post_install() { + post_upgrade +} + post_upgrade() { # Fix permissions on necessary directories chown murmur.murmur /var/lib/murmur /run/murmur From 9117c8bf7d1b31c6af436228ac6cc250fd4fda84 Mon Sep 17 00:00:00 2001 From: Giovanni Harting <539@idlegandalf.com> Date: Sun, 3 Dec 2017 11:07:18 +0100 Subject: [PATCH 15/25] v1.3.0~2586~g894ade2 --- .SRCINFO | 8 ++++---- PKGBUILD | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 1b68269..c7fbfff 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = murmur-snapshot-ice pkgdesc = The voice chat application server for Mumble (development snapshot) - pkgver = 1.3.0_2584_g53c5a91 + pkgver = 1.3.0_2586_g894ade2 pkgrel = 1 url = https://wiki.mumble.info/wiki/ install = murmur.install @@ -20,12 +20,12 @@ pkgbase = murmur-snapshot-ice conflicts = murmur-snapshot-noice options = emptydirs backup = etc/murmur.ini - source = https://mumble.info/snapshot/mumble-1.3.0~2584~g53c5a91~snapshot.tar.gz - source = https://mumble.info/snapshot/mumble-1.3.0~2584~g53c5a91~snapshot.tar.gz.sig + source = https://mumble.info/snapshot/mumble-1.3.0~2586~g894ade2~snapshot.tar.gz + source = https://mumble.info/snapshot/mumble-1.3.0~2586~g894ade2~snapshot.tar.gz.sig source = murmur.tmpfilesd source = murmur.sysusers validpgpkeys = C4666C6767A26017CE68406988048D0D625297A0 - sha256sums = 0f5b042d56da91fdaada7016ca8f94bedf4fbaa0a78c7c57f54ca5b97c3ead82 + sha256sums = a0b8720e01495c399d14c2051bcf5e7356ceea8e0162a75cc4e10039a5324f7e sha256sums = SKIP sha256sums = 25bf2dbd7574459724b4621fb93c09484dc7520297fa1d0f247a19b592d8cb8e sha256sums = ff58059e77eb73a5c9ad8eb4ad8d8d7c865f3ae1fb6cb236a729f742da95d83d diff --git a/PKGBUILD b/PKGBUILD index f3ab16a..2187eb6 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -6,7 +6,7 @@ # Contributor: Malte Rabenseifner pkgname=murmur-snapshot-ice -pkgver=1.3.0_2584_g53c5a91 +pkgver=1.3.0_2586_g894ade2 pkgrel=1 pkgdesc="The voice chat application server for Mumble (development snapshot)" arch=('i686' 'x86_64' 'armv7h') @@ -22,7 +22,7 @@ install=murmur.install source=("https://mumble.info/snapshot/mumble-${pkgver//_/\~}~snapshot.tar.gz"{,.sig} murmur.tmpfilesd murmur.sysusers) -sha256sums=('0f5b042d56da91fdaada7016ca8f94bedf4fbaa0a78c7c57f54ca5b97c3ead82' +sha256sums=('a0b8720e01495c399d14c2051bcf5e7356ceea8e0162a75cc4e10039a5324f7e' 'SKIP' '25bf2dbd7574459724b4621fb93c09484dc7520297fa1d0f247a19b592d8cb8e' 'ff58059e77eb73a5c9ad8eb4ad8d8d7c865f3ae1fb6cb236a729f742da95d83d') From 571090253a20efb7c649b4ac687937e767d6fa7e Mon Sep 17 00:00:00 2001 From: Giovanni Harting <539@idlegandalf.com> Date: Thu, 22 Mar 2018 00:56:22 +0100 Subject: [PATCH 16/25] v1.3.0~2717~gb25db3e; removed openssl-1.0 workaround --- .SRCINFO | 10 +++++----- PKGBUILD | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index c7fbfff..1a7474d 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = murmur-snapshot-ice pkgdesc = The voice chat application server for Mumble (development snapshot) - pkgver = 1.3.0_2586_g894ade2 + pkgver = 1.3.0_2717_gb25db3e pkgrel = 1 url = https://wiki.mumble.info/wiki/ install = murmur.install @@ -20,12 +20,12 @@ pkgbase = murmur-snapshot-ice conflicts = murmur-snapshot-noice options = emptydirs backup = etc/murmur.ini - source = https://mumble.info/snapshot/mumble-1.3.0~2586~g894ade2~snapshot.tar.gz - source = https://mumble.info/snapshot/mumble-1.3.0~2586~g894ade2~snapshot.tar.gz.sig + source = https://mumble.info/snapshot/mumble-1.3.0~2717~gb25db3e~snapshot.tar.gz + source = https://mumble.info/snapshot/mumble-1.3.0~2717~gb25db3e~snapshot.tar.gz.sig source = murmur.tmpfilesd source = murmur.sysusers - validpgpkeys = C4666C6767A26017CE68406988048D0D625297A0 - sha256sums = a0b8720e01495c399d14c2051bcf5e7356ceea8e0162a75cc4e10039a5324f7e + validpgpkeys = F3F5324A14AD0B32568F7839F0413B5CB858BD0E + sha256sums = ce4647fd7f525edf8ac00880682715d88c93160fa2a25666b16c6e41d21d3c41 sha256sums = SKIP sha256sums = 25bf2dbd7574459724b4621fb93c09484dc7520297fa1d0f247a19b592d8cb8e sha256sums = ff58059e77eb73a5c9ad8eb4ad8d8d7c865f3ae1fb6cb236a729f742da95d83d diff --git a/PKGBUILD b/PKGBUILD index 2187eb6..7ba531e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -6,7 +6,7 @@ # Contributor: Malte Rabenseifner pkgname=murmur-snapshot-ice -pkgver=1.3.0_2586_g894ade2 +pkgver=1.3.0_2717_gb25db3e pkgrel=1 pkgdesc="The voice chat application server for Mumble (development snapshot)" arch=('i686' 'x86_64' 'armv7h') @@ -22,17 +22,17 @@ install=murmur.install source=("https://mumble.info/snapshot/mumble-${pkgver//_/\~}~snapshot.tar.gz"{,.sig} murmur.tmpfilesd murmur.sysusers) -sha256sums=('a0b8720e01495c399d14c2051bcf5e7356ceea8e0162a75cc4e10039a5324f7e' +sha256sums=('ce4647fd7f525edf8ac00880682715d88c93160fa2a25666b16c6e41d21d3c41' 'SKIP' '25bf2dbd7574459724b4621fb93c09484dc7520297fa1d0f247a19b592d8cb8e' 'ff58059e77eb73a5c9ad8eb4ad8d8d7c865f3ae1fb6cb236a729f742da95d83d') -validpgpkeys=('C4666C6767A26017CE68406988048D0D625297A0') +validpgpkeys=('F3F5324A14AD0B32568F7839F0413B5CB858BD0E') options=('emptydirs') build() { cd $srcdir/mumble-${pkgver//_/\~}~snapshot - qmake-qt5 main.pro CONFIG+="no-client no-bonjour optimize" INCLUDEPATH+="/usr/include/openssl-1.0" QMAKE_LFLAGS+="-L/usr/lib/openssl-1.0 -lssl -lcrypto" + qmake-qt5 main.pro CONFIG+="no-client no-bonjour optimize" make release } From 7beb4b898262d1163d7f857f141418eb09848783 Mon Sep 17 00:00:00 2001 From: Giovanni Harting <539@idlegandalf.com> Date: Sat, 31 Mar 2018 13:21:07 +0200 Subject: [PATCH 17/25] v1.3.0~2723~g109ddd4 --- .SRCINFO | 8 ++++---- PKGBUILD | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 1a7474d..4b9054d 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = murmur-snapshot-ice pkgdesc = The voice chat application server for Mumble (development snapshot) - pkgver = 1.3.0_2717_gb25db3e + pkgver = 1.3.0_2723_g109ddd4 pkgrel = 1 url = https://wiki.mumble.info/wiki/ install = murmur.install @@ -20,12 +20,12 @@ pkgbase = murmur-snapshot-ice conflicts = murmur-snapshot-noice options = emptydirs backup = etc/murmur.ini - source = https://mumble.info/snapshot/mumble-1.3.0~2717~gb25db3e~snapshot.tar.gz - source = https://mumble.info/snapshot/mumble-1.3.0~2717~gb25db3e~snapshot.tar.gz.sig + source = https://mumble.info/snapshot/mumble-1.3.0~2723~g109ddd4~snapshot.tar.gz + source = https://mumble.info/snapshot/mumble-1.3.0~2723~g109ddd4~snapshot.tar.gz.sig source = murmur.tmpfilesd source = murmur.sysusers validpgpkeys = F3F5324A14AD0B32568F7839F0413B5CB858BD0E - sha256sums = ce4647fd7f525edf8ac00880682715d88c93160fa2a25666b16c6e41d21d3c41 + sha256sums = e366e2e09f48207e7a9089ac34819071fddb147824dea87b44760cfa173b9484 sha256sums = SKIP sha256sums = 25bf2dbd7574459724b4621fb93c09484dc7520297fa1d0f247a19b592d8cb8e sha256sums = ff58059e77eb73a5c9ad8eb4ad8d8d7c865f3ae1fb6cb236a729f742da95d83d diff --git a/PKGBUILD b/PKGBUILD index 7ba531e..7a0e3f7 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -6,7 +6,7 @@ # Contributor: Malte Rabenseifner pkgname=murmur-snapshot-ice -pkgver=1.3.0_2717_gb25db3e +pkgver=1.3.0_2723_g109ddd4 pkgrel=1 pkgdesc="The voice chat application server for Mumble (development snapshot)" arch=('i686' 'x86_64' 'armv7h') @@ -22,7 +22,7 @@ install=murmur.install source=("https://mumble.info/snapshot/mumble-${pkgver//_/\~}~snapshot.tar.gz"{,.sig} murmur.tmpfilesd murmur.sysusers) -sha256sums=('ce4647fd7f525edf8ac00880682715d88c93160fa2a25666b16c6e41d21d3c41' +sha256sums=('e366e2e09f48207e7a9089ac34819071fddb147824dea87b44760cfa173b9484' 'SKIP' '25bf2dbd7574459724b4621fb93c09484dc7520297fa1d0f247a19b592d8cb8e' 'ff58059e77eb73a5c9ad8eb4ad8d8d7c865f3ae1fb6cb236a729f742da95d83d') From ef97fc821b05068651cdddd39953ee7120cf1009 Mon Sep 17 00:00:00 2001 From: Giovanni Harting <539@idlegandalf.com> Date: Fri, 11 May 2018 04:46:28 +0200 Subject: [PATCH 18/25] 1.3.0~2729~g2126495 --- .SRCINFO | 8 ++++---- PKGBUILD | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 4b9054d..613f8a3 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = murmur-snapshot-ice pkgdesc = The voice chat application server for Mumble (development snapshot) - pkgver = 1.3.0_2723_g109ddd4 + pkgver = 1.3.0_2729_g2126495 pkgrel = 1 url = https://wiki.mumble.info/wiki/ install = murmur.install @@ -20,12 +20,12 @@ pkgbase = murmur-snapshot-ice conflicts = murmur-snapshot-noice options = emptydirs backup = etc/murmur.ini - source = https://mumble.info/snapshot/mumble-1.3.0~2723~g109ddd4~snapshot.tar.gz - source = https://mumble.info/snapshot/mumble-1.3.0~2723~g109ddd4~snapshot.tar.gz.sig + source = https://mumble.info/snapshot/mumble-1.3.0~2729~g2126495~snapshot.tar.gz + source = https://mumble.info/snapshot/mumble-1.3.0~2729~g2126495~snapshot.tar.gz.sig source = murmur.tmpfilesd source = murmur.sysusers validpgpkeys = F3F5324A14AD0B32568F7839F0413B5CB858BD0E - sha256sums = e366e2e09f48207e7a9089ac34819071fddb147824dea87b44760cfa173b9484 + sha256sums = 31b199b33329be15b4c385d8a8922ecacd33c55a8e5a56930513937551c17272 sha256sums = SKIP sha256sums = 25bf2dbd7574459724b4621fb93c09484dc7520297fa1d0f247a19b592d8cb8e sha256sums = ff58059e77eb73a5c9ad8eb4ad8d8d7c865f3ae1fb6cb236a729f742da95d83d diff --git a/PKGBUILD b/PKGBUILD index 7a0e3f7..fa16b0a 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -6,7 +6,7 @@ # Contributor: Malte Rabenseifner pkgname=murmur-snapshot-ice -pkgver=1.3.0_2723_g109ddd4 +pkgver=1.3.0_2729_g2126495 pkgrel=1 pkgdesc="The voice chat application server for Mumble (development snapshot)" arch=('i686' 'x86_64' 'armv7h') @@ -22,7 +22,7 @@ install=murmur.install source=("https://mumble.info/snapshot/mumble-${pkgver//_/\~}~snapshot.tar.gz"{,.sig} murmur.tmpfilesd murmur.sysusers) -sha256sums=('e366e2e09f48207e7a9089ac34819071fddb147824dea87b44760cfa173b9484' +sha256sums=('31b199b33329be15b4c385d8a8922ecacd33c55a8e5a56930513937551c17272' 'SKIP' '25bf2dbd7574459724b4621fb93c09484dc7520297fa1d0f247a19b592d8cb8e' 'ff58059e77eb73a5c9ad8eb4ad8d8d7c865f3ae1fb6cb236a729f742da95d83d') From beb6399ae5f7711792405b2032635df609ae7f88 Mon Sep 17 00:00:00 2001 From: Giovanni Harting <539@idlegandalf.com> Date: Sun, 27 May 2018 16:43:16 +0200 Subject: [PATCH 19/25] Qt version bump --- .SRCINFO | 2 +- PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 613f8a3..47fa7cd 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = murmur-snapshot-ice pkgdesc = The voice chat application server for Mumble (development snapshot) pkgver = 1.3.0_2729_g2126495 - pkgrel = 1 + pkgrel = 2 url = https://wiki.mumble.info/wiki/ install = murmur.install arch = i686 diff --git a/PKGBUILD b/PKGBUILD index fa16b0a..2fa7872 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,7 +7,7 @@ pkgname=murmur-snapshot-ice pkgver=1.3.0_2729_g2126495 -pkgrel=1 +pkgrel=2 pkgdesc="The voice chat application server for Mumble (development snapshot)" arch=('i686' 'x86_64' 'armv7h') url="https://wiki.mumble.info/wiki/" From 00fb9c7cf8816157421a8b95ecaaaa8d243aa0e8 Mon Sep 17 00:00:00 2001 From: Giovanni Harting <539@idlegandalf.com> Date: Tue, 7 Aug 2018 21:09:32 +0200 Subject: [PATCH 20/25] .so bump --- .SRCINFO | 2 +- PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 47fa7cd..b5de63c 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = murmur-snapshot-ice pkgdesc = The voice chat application server for Mumble (development snapshot) pkgver = 1.3.0_2729_g2126495 - pkgrel = 2 + pkgrel = 3 url = https://wiki.mumble.info/wiki/ install = murmur.install arch = i686 diff --git a/PKGBUILD b/PKGBUILD index 2fa7872..ddb9eab 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,7 +7,7 @@ pkgname=murmur-snapshot-ice pkgver=1.3.0_2729_g2126495 -pkgrel=2 +pkgrel=3 pkgdesc="The voice chat application server for Mumble (development snapshot)" arch=('i686' 'x86_64' 'armv7h') url="https://wiki.mumble.info/wiki/" From 8adcb934d17e8e10344fe178bfead2faf94a395e Mon Sep 17 00:00:00 2001 From: Giovanni Harting <539@idlegandalf.com> Date: Thu, 13 Sep 2018 10:13:38 +0200 Subject: [PATCH 21/25] 1.3.0~2868~g44b9004 --- .SRCINFO | 10 +++++----- PKGBUILD | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index b5de63c..6888819 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = murmur-snapshot-ice pkgdesc = The voice chat application server for Mumble (development snapshot) - pkgver = 1.3.0_2729_g2126495 - pkgrel = 3 + pkgver = 1.3.0_2868_g44b9004 + pkgrel = 1 url = https://wiki.mumble.info/wiki/ install = murmur.install arch = i686 @@ -20,12 +20,12 @@ pkgbase = murmur-snapshot-ice conflicts = murmur-snapshot-noice options = emptydirs backup = etc/murmur.ini - source = https://mumble.info/snapshot/mumble-1.3.0~2729~g2126495~snapshot.tar.gz - source = https://mumble.info/snapshot/mumble-1.3.0~2729~g2126495~snapshot.tar.gz.sig + source = https://mumble.info/snapshot/mumble-1.3.0~2868~g44b9004~snapshot.tar.gz + source = https://mumble.info/snapshot/mumble-1.3.0~2868~g44b9004~snapshot.tar.gz.sig source = murmur.tmpfilesd source = murmur.sysusers validpgpkeys = F3F5324A14AD0B32568F7839F0413B5CB858BD0E - sha256sums = 31b199b33329be15b4c385d8a8922ecacd33c55a8e5a56930513937551c17272 + sha256sums = 28ba96277537376c7eee12a93832ba4a5909ec4833ab648d74de84b778d1275d sha256sums = SKIP sha256sums = 25bf2dbd7574459724b4621fb93c09484dc7520297fa1d0f247a19b592d8cb8e sha256sums = ff58059e77eb73a5c9ad8eb4ad8d8d7c865f3ae1fb6cb236a729f742da95d83d diff --git a/PKGBUILD b/PKGBUILD index ddb9eab..5911ec4 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -6,8 +6,8 @@ # Contributor: Malte Rabenseifner pkgname=murmur-snapshot-ice -pkgver=1.3.0_2729_g2126495 -pkgrel=3 +pkgver=1.3.0_2868_g44b9004 +pkgrel=1 pkgdesc="The voice chat application server for Mumble (development snapshot)" arch=('i686' 'x86_64' 'armv7h') url="https://wiki.mumble.info/wiki/" @@ -22,7 +22,7 @@ install=murmur.install source=("https://mumble.info/snapshot/mumble-${pkgver//_/\~}~snapshot.tar.gz"{,.sig} murmur.tmpfilesd murmur.sysusers) -sha256sums=('31b199b33329be15b4c385d8a8922ecacd33c55a8e5a56930513937551c17272' +sha256sums=('28ba96277537376c7eee12a93832ba4a5909ec4833ab648d74de84b778d1275d' 'SKIP' '25bf2dbd7574459724b4621fb93c09484dc7520297fa1d0f247a19b592d8cb8e' 'ff58059e77eb73a5c9ad8eb4ad8d8d7c865f3ae1fb6cb236a729f742da95d83d') From cbc25d37c3543d0c03a548e37fdce4f81ac2ec67 Mon Sep 17 00:00:00 2001 From: Giovanni Harting <539@idlegandalf.com> Date: Tue, 18 Sep 2018 13:27:28 +0200 Subject: [PATCH 22/25] libprotobuf dump --- .SRCINFO | 2 +- PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 6888819..d48737e 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = murmur-snapshot-ice pkgdesc = The voice chat application server for Mumble (development snapshot) pkgver = 1.3.0_2868_g44b9004 - pkgrel = 1 + pkgrel = 2 url = https://wiki.mumble.info/wiki/ install = murmur.install arch = i686 diff --git a/PKGBUILD b/PKGBUILD index 5911ec4..0f1cd53 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,7 +7,7 @@ pkgname=murmur-snapshot-ice pkgver=1.3.0_2868_g44b9004 -pkgrel=1 +pkgrel=2 pkgdesc="The voice chat application server for Mumble (development snapshot)" arch=('i686' 'x86_64' 'armv7h') url="https://wiki.mumble.info/wiki/" From 78abedc80fe91f973d3c54abd1715864729a9242 Mon Sep 17 00:00:00 2001 From: Giovanni Harting <539@idlegandalf.com> Date: Wed, 13 Mar 2019 18:13:15 +0100 Subject: [PATCH 23/25] 1.3.0~2942~g755c290; disabled signature verification for now --- .SRCINFO | 13 ++++++------- PKGBUILD | 18 ++++++++++++------ 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index d48737e..a51bd8a 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = murmur-snapshot-ice pkgdesc = The voice chat application server for Mumble (development snapshot) - pkgver = 1.3.0_2868_g44b9004 - pkgrel = 2 + pkgver = 1.3.0_2942_g755c290 + pkgrel = 1 url = https://wiki.mumble.info/wiki/ install = murmur.install arch = i686 @@ -20,13 +20,12 @@ pkgbase = murmur-snapshot-ice conflicts = murmur-snapshot-noice options = emptydirs backup = etc/murmur.ini - source = https://mumble.info/snapshot/mumble-1.3.0~2868~g44b9004~snapshot.tar.gz - source = https://mumble.info/snapshot/mumble-1.3.0~2868~g44b9004~snapshot.tar.gz.sig + source = https://mumble.info/snapshot/mumble-1.3.0~2942~g755c290~snapshot.tar.gz + source = https://github.com/mumble-voip/mumble/commit/ce0ecff200dd6e57a13c67b189406318595b52fb.patch source = murmur.tmpfilesd source = murmur.sysusers - validpgpkeys = F3F5324A14AD0B32568F7839F0413B5CB858BD0E - sha256sums = 28ba96277537376c7eee12a93832ba4a5909ec4833ab648d74de84b778d1275d - sha256sums = SKIP + sha256sums = 209cc0680fcf90adc8d374a0f73a932c3a3dfa71611d2a78a3036121e67f78a2 + sha256sums = af078c71af9a2892254c7104b1f6a73d98b2df03927b74c08f64f6f6d6826cc3 sha256sums = 25bf2dbd7574459724b4621fb93c09484dc7520297fa1d0f247a19b592d8cb8e sha256sums = ff58059e77eb73a5c9ad8eb4ad8d8d7c865f3ae1fb6cb236a729f742da95d83d diff --git a/PKGBUILD b/PKGBUILD index 0f1cd53..90e94b5 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -6,8 +6,8 @@ # Contributor: Malte Rabenseifner pkgname=murmur-snapshot-ice -pkgver=1.3.0_2868_g44b9004 -pkgrel=2 +pkgver=1.3.0_2942_g755c290 +pkgrel=1 pkgdesc="The voice chat application server for Mumble (development snapshot)" arch=('i686' 'x86_64' 'armv7h') url="https://wiki.mumble.info/wiki/" @@ -19,16 +19,22 @@ conflicts=('murmur' 'murmur-static' 'murmur-ice' 'murmur-snapshot-noice') provides=('murmur') backup=("etc/murmur.ini") install=murmur.install -source=("https://mumble.info/snapshot/mumble-${pkgver//_/\~}~snapshot.tar.gz"{,.sig} +source=("https://mumble.info/snapshot/mumble-${pkgver//_/\~}~snapshot.tar.gz" + "https://github.com/mumble-voip/mumble/commit/ce0ecff200dd6e57a13c67b189406318595b52fb.patch" murmur.tmpfilesd murmur.sysusers) -sha256sums=('28ba96277537376c7eee12a93832ba4a5909ec4833ab648d74de84b778d1275d' - 'SKIP' +sha256sums=('209cc0680fcf90adc8d374a0f73a932c3a3dfa71611d2a78a3036121e67f78a2' + 'af078c71af9a2892254c7104b1f6a73d98b2df03927b74c08f64f6f6d6826cc3' '25bf2dbd7574459724b4621fb93c09484dc7520297fa1d0f247a19b592d8cb8e' 'ff58059e77eb73a5c9ad8eb4ad8d8d7c865f3ae1fb6cb236a729f742da95d83d') -validpgpkeys=('F3F5324A14AD0B32568F7839F0413B5CB858BD0E') +#validpgpkeys=('F3F5324A14AD0B32568F7839F0413B5CB858BD0E') options=('emptydirs') +prepare() { + cd $srcdir/mumble-${pkgver//_/\~}~snapshot + patch --forward --strip=1 --input="${srcdir}/ce0ecff200dd6e57a13c67b189406318595b52fb.patch" +} + build() { cd $srcdir/mumble-${pkgver//_/\~}~snapshot From dcbbdd442398cff48e59c51caff3ce1c8cd77666 Mon Sep 17 00:00:00 2001 From: Giovanni Harting <539@idlegandalf.com> Date: Wed, 20 Mar 2019 13:27:11 +0100 Subject: [PATCH 24/25] 1.3.0-rc1; enabled signature verification again --- .SRCINFO | 12 +++++++----- PKGBUILD | 24 ++++++++++-------------- 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index a51bd8a..014fced 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,8 @@ pkgbase = murmur-snapshot-ice pkgdesc = The voice chat application server for Mumble (development snapshot) - pkgver = 1.3.0_2942_g755c290 + pkgver = 1.3.0_rc1 pkgrel = 1 + epoch = 1 url = https://wiki.mumble.info/wiki/ install = murmur.install arch = i686 @@ -20,12 +21,13 @@ pkgbase = murmur-snapshot-ice conflicts = murmur-snapshot-noice options = emptydirs backup = etc/murmur.ini - source = https://mumble.info/snapshot/mumble-1.3.0~2942~g755c290~snapshot.tar.gz - source = https://github.com/mumble-voip/mumble/commit/ce0ecff200dd6e57a13c67b189406318595b52fb.patch + source = https://dl.mumble.info/mumble-1.3.0-rc1.tar.gz + source = https://dl.mumble.info/mumble-1.3.0-rc1.tar.gz.sig source = murmur.tmpfilesd source = murmur.sysusers - sha256sums = 209cc0680fcf90adc8d374a0f73a932c3a3dfa71611d2a78a3036121e67f78a2 - sha256sums = af078c71af9a2892254c7104b1f6a73d98b2df03927b74c08f64f6f6d6826cc3 + validpgpkeys = 56D0B23AE00B1EE9A8BAAC0F5B8CF87BB893449B + sha256sums = 6f447745e164cc9ddef33f85ba0a3fc52d235eae3bfca588f387c699fe9eca59 + sha256sums = SKIP sha256sums = 25bf2dbd7574459724b4621fb93c09484dc7520297fa1d0f247a19b592d8cb8e sha256sums = ff58059e77eb73a5c9ad8eb4ad8d8d7c865f3ae1fb6cb236a729f742da95d83d diff --git a/PKGBUILD b/PKGBUILD index 90e94b5..9bc7a3b 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -6,44 +6,40 @@ # Contributor: Malte Rabenseifner pkgname=murmur-snapshot-ice -pkgver=1.3.0_2942_g755c290 +pkgver=1.3.0_rc1 +_dirname=1.3.0 pkgrel=1 +epoch=1 pkgdesc="The voice chat application server for Mumble (development snapshot)" arch=('i686' 'x86_64' 'armv7h') url="https://wiki.mumble.info/wiki/" license=('BSD') depends=('protobuf' 'qt5-base' 'zeroc-ice') - makedepends=('boost' 'python') conflicts=('murmur' 'murmur-static' 'murmur-ice' 'murmur-snapshot-noice') provides=('murmur') backup=("etc/murmur.ini") install=murmur.install -source=("https://mumble.info/snapshot/mumble-${pkgver//_/\~}~snapshot.tar.gz" - "https://github.com/mumble-voip/mumble/commit/ce0ecff200dd6e57a13c67b189406318595b52fb.patch" +#source=("https://dl.mumble.info/mumble-${pkgver//_/\~}~snapshot.tar.gz"{,.sig} # git snapshots +source=("https://dl.mumble.info/mumble-${pkgver//_/-}.tar.gz"{,.sig} murmur.tmpfilesd murmur.sysusers) -sha256sums=('209cc0680fcf90adc8d374a0f73a932c3a3dfa71611d2a78a3036121e67f78a2' - 'af078c71af9a2892254c7104b1f6a73d98b2df03927b74c08f64f6f6d6826cc3' +sha256sums=('6f447745e164cc9ddef33f85ba0a3fc52d235eae3bfca588f387c699fe9eca59' + 'SKIP' '25bf2dbd7574459724b4621fb93c09484dc7520297fa1d0f247a19b592d8cb8e' 'ff58059e77eb73a5c9ad8eb4ad8d8d7c865f3ae1fb6cb236a729f742da95d83d') -#validpgpkeys=('F3F5324A14AD0B32568F7839F0413B5CB858BD0E') +validpgpkeys=('56D0B23AE00B1EE9A8BAAC0F5B8CF87BB893449B') options=('emptydirs') -prepare() { - cd $srcdir/mumble-${pkgver//_/\~}~snapshot - patch --forward --strip=1 --input="${srcdir}/ce0ecff200dd6e57a13c67b189406318595b52fb.patch" -} - build() { - cd $srcdir/mumble-${pkgver//_/\~}~snapshot + cd $srcdir/mumble-${_dirname} qmake-qt5 main.pro CONFIG+="no-client no-bonjour optimize" make release } package() { - cd $srcdir/mumble-${pkgver//_/\~}~snapshot + cd $srcdir/mumble-${_dirname} sed -e "1i# vi:ft=cfg" \ -e "s|database=|database=/var/lib/murmur/murmur.sqlite|" \ From c488010bc18e43d0e2a7c40f03219af9838e75cf Mon Sep 17 00:00:00 2001 From: Giovanni Harting <539@idlegandalf.com> Date: Thu, 27 Jun 2019 14:46:48 +0200 Subject: [PATCH 25/25] 1.3.0-rc2 --- .SRCINFO | 8 ++++---- PKGBUILD | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 014fced..87fdafc 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = murmur-snapshot-ice pkgdesc = The voice chat application server for Mumble (development snapshot) - pkgver = 1.3.0_rc1 + pkgver = 1.3.0_rc2 pkgrel = 1 epoch = 1 url = https://wiki.mumble.info/wiki/ @@ -21,12 +21,12 @@ pkgbase = murmur-snapshot-ice conflicts = murmur-snapshot-noice options = emptydirs backup = etc/murmur.ini - source = https://dl.mumble.info/mumble-1.3.0-rc1.tar.gz - source = https://dl.mumble.info/mumble-1.3.0-rc1.tar.gz.sig + source = https://dl.mumble.info/mumble-1.3.0-rc2.tar.gz + source = https://dl.mumble.info/mumble-1.3.0-rc2.tar.gz.sig source = murmur.tmpfilesd source = murmur.sysusers validpgpkeys = 56D0B23AE00B1EE9A8BAAC0F5B8CF87BB893449B - sha256sums = 6f447745e164cc9ddef33f85ba0a3fc52d235eae3bfca588f387c699fe9eca59 + sha256sums = 258643a73997dc192ec9cc1175a55082e432ae21e4283bef27ffa331e85a0380 sha256sums = SKIP sha256sums = 25bf2dbd7574459724b4621fb93c09484dc7520297fa1d0f247a19b592d8cb8e sha256sums = ff58059e77eb73a5c9ad8eb4ad8d8d7c865f3ae1fb6cb236a729f742da95d83d diff --git a/PKGBUILD b/PKGBUILD index 9bc7a3b..7b01fcf 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -6,7 +6,7 @@ # Contributor: Malte Rabenseifner pkgname=murmur-snapshot-ice -pkgver=1.3.0_rc1 +pkgver=1.3.0_rc2 _dirname=1.3.0 pkgrel=1 epoch=1 @@ -24,7 +24,7 @@ install=murmur.install source=("https://dl.mumble.info/mumble-${pkgver//_/-}.tar.gz"{,.sig} murmur.tmpfilesd murmur.sysusers) -sha256sums=('6f447745e164cc9ddef33f85ba0a3fc52d235eae3bfca588f387c699fe9eca59' +sha256sums=('258643a73997dc192ec9cc1175a55082e432ae21e4283bef27ffa331e85a0380' 'SKIP' '25bf2dbd7574459724b4621fb93c09484dc7520297fa1d0f247a19b592d8cb8e' 'ff58059e77eb73a5c9ad8eb4ad8d8d7c865f3ae1fb6cb236a729f742da95d83d')