--- Begin Message ---
Package: mumble
Version: 1.5.517-2.1
Severity: wishlist
Tags: patch
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Upstream released version 1.5.634, which is the first stable release:
https://www.mumble.info/blog/mumble-1.5.634/
I've had a go at updating the packaging for it and it looks like I
succeeded, so I'm attaching 2 patch sets for that.
To update:
1) apply the first patch set
2) run ``gbp import-orig --debian-branch debian --uscan --upstream-version
'1.5.634``
3) apply the second patch set
ad 1) source: https://salsa.debian.org/diederik/mumble/-/tree/package-update
These are numbered 0001-0011
ad 3) source: https://salsa.debian.org/diederik/mumble/-/tree/update-to-1.5.634
This is based/build upon the ``package-update`` branch.
These are numbered 1000-1005
And with that even the reprotest Salsa CI job succeeds \o/
It may also fix bug #1068504 as upstream had a commit which
changed/fixed the location of that file. That commit is referenced in
one of the commit messages, but as I only saw that bug when making this
one, I have not verified whether it actually fixes it and that bug is
also not closed in ``debian/changelog``.
Feel free to use what is useful :-)
HTH,
Diederik
- -- System Information:
Debian Release: trixie/sid
APT prefers unstable
APT policy: (500, 'unstable'), (500, 'testing'), (101, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 6.12+unreleased-amd64 (SMP w/16 CPU threads; PREEMPT)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8),
LANGUAGE=en_US:en
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
Versions of packages mumble depends on:
ii libasound2t64 1.2.12-1+b1
ii libavahi-compat-libdnssd1 0.8-15
ii libc6 2.40-4
ii libgcc-s1 14.2.0-8
ii libopus0 1.5.2-2
ii libpocofoundation100 1.13.0-6+b1
ii libpocoxml100 1.13.0-6+b1
ii libpocozip100 1.13.0-6+b1
ii libprotobuf32t64 3.21.12-10+b1
ii libqt5core5t64 5.15.15+dfsg-2
ii libqt5dbus5t64 5.15.15+dfsg-2
ii libqt5gui5t64 5.15.15+dfsg-2
ii libqt5network5t64 5.15.15+dfsg-2
ii libqt5sql5-sqlite 5.15.15+dfsg-2
ii libqt5sql5t64 5.15.15+dfsg-2
ii libqt5svg5 5.15.15-2
ii libqt5widgets5t64 5.15.15+dfsg-2
ii libqt5xml5t64 5.15.15+dfsg-2
ii libsndfile1 1.2.2-1+b3
ii libspeechd2 0.11.5-5.1
ii libssl3t64 3.3.2-2
ii libstdc++6 14.2.0-8
ii libx11-6 2:1.8.10-2
ii libxi6 2:1.8.2-1
ii lsb-release 12.1-1
mumble recommends no packages.
Versions of packages mumble suggests:
pn mumble-server <none>
pn speech-dispatcher <none>
- -- no debconf information
-----BEGIN PGP SIGNATURE-----
iHUEARYIAB0WIQT1sUPBYsyGmi4usy/XblvOeH7bbgUCZ1SKYwAKCRDXblvOeH7b
bqmAAP9clvMwJ3Wu0j999DL6uy6OH0jPz+yS2hY6WSjI6IwbwgD9Gt8+5MrLB47j
al2oLvP8P+EkV2nBPbiJS3fcnrTe4QQ=
=EKt2
-----END PGP SIGNATURE-----
>From bee5c36ff39b99be99efd66153189b4c651d226a Mon Sep 17 00:00:00 2001
From: Diederik de Haas <[email protected]>
Date: Tue, 26 Nov 2024 14:00:57 +0100
Subject: [PATCH 01/11] debian/rules: Stop parsing d/changelog
Lintian complained about manually parsing d/changelog instead of using
the functions in ``/usr/share/dpkg/pkg-info.mk`` for that.
To fix that, the following change would be needed:
-VERSION := $(shell dpkg-parsechangelog -l$(dir $(MAKEFILE))changelog | sed -ne
's/^Version: \(.*\)-.*/\1/p')
-MUMBLE_DEB_VERSION := $(shell dpkg-parsechangelog -l$(dir
$(MAKEFILE))changelog | sed -ne 's/^Version: \(.*\).*/\1/p')
+VERSION := $(DEB_VERSION_UPSTREAM)
+MUMBLE_DEB_VERSION := $(DEB_VERSION)
Next to including that Makefile.
But it turns out that VERSION and MUMBLE_DEB_VERSION are no longer used,
so remove those variables instead of modifying them.
Fixes-lintian-tag: debian-rules-parses-dpkg-parsechangelog
---
debian/extras/TODO | 17 -----------------
debian/rules | 2 --
2 files changed, 19 deletions(-)
diff --git a/debian/extras/TODO b/debian/extras/TODO
index 8e3f59e..da2a133 100644
--- a/debian/extras/TODO
+++ b/debian/extras/TODO
@@ -1,22 +1,5 @@
TODO list for Mumble
-- Switch debian/rules from parsing changelog to including
- /usr/share/dpkg/pkg-info.mk and using variables to get the package version
-
- I: mumble source: debian-rules-parses-dpkg-parsechangelog [debian/rules:15]
- N:
- N: The rules file appears to be parsing the output of dpkg-parsechangelog
to determine the current package version name, version, or
- N: timestamp, etc.
- N:
- N: Since dpkg 1.16.1, this could be replaced by including the
/usr/share/dpkg/pkg-info.mk Makefile library and using the
- N: DEB_{SOURCE,VERSION} or SOURCE_DATE_EPOCH variables.
- N:
- N: Using this library is not only cleaner and more efficient, it handles
many corner-cases such as binNMUs, epoch versions, etc.
- N:
- N: Visibility: info
- N: Show-Always: no
- N: Check: debian/rules
-
- Find a solution for hardening CPPFLAGS and CMake. :-( Currently seems broken.
I: mumble: hardening-no-fortify-functions
[usr/lib/x86_64-linux-gnu/mumble/plugins/libamongus.so]
diff --git a/debian/rules b/debian/rules
index f568db3..5ae657f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,8 +12,6 @@ export DEB_LDFLAGS_MAINT_STRIP = -r,now
MAKEFILE = $(firstword $(MAKEFILE_LIST))
SOURCE_DIR = $(dir $(MAKEFILE))..
-VERSION := $(shell dpkg-parsechangelog -l$(dir $(MAKEFILE))changelog | sed -ne
's/^Version: \(.*\)-.*/\1/p')
-MUMBLE_DEB_VERSION := $(shell dpkg-parsechangelog -l$(dir
$(MAKEFILE))changelog | sed -ne 's/^Version: \(.*\).*/\1/p')
# qtchooser will try to use qmake from qt4 even if it's not installed
export QT_SELECT=qt5
--
2.45.2
>From a2907d0fdb5583987a6e7ed668b180195c050c06 Mon Sep 17 00:00:00 2001
From: Diederik de Haas <[email protected]>
Date: Tue, 26 Nov 2024 14:05:57 +0100
Subject: [PATCH 02/11] debian/rules: Remove unused MAKEFILE and SOURCE_DIR
variables
The MAKEFILE variable was used to parse debian/changelog, but now that
doesn't happen anymore, that variable is no longer used.
The SOURCE_DIR variable was added on 2012-11-11 in commit
c6e289a60869 ("Imported Debian patch 1.2.3-349-g315b5f5-2.2")
but it has never been used.
---
debian/rules | 2 --
1 file changed, 2 deletions(-)
diff --git a/debian/rules b/debian/rules
index 5ae657f..cdf6702 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,8 +10,6 @@ export DEB_LDFLAGS_MAINT_STRIP = -r,now
# NOTE: there seems to be difficulties with build hardening for packages using
# CMake; see:
https://wiki.debian.org/Hardening#Notes_for_packages_using_CMake
-MAKEFILE = $(firstword $(MAKEFILE_LIST))
-SOURCE_DIR = $(dir $(MAKEFILE))..
# qtchooser will try to use qmake from qt4 even if it's not installed
export QT_SELECT=qt5
--
2.45.2
>From 77453779d232cb161f43ef8217a5eec024ac0908 Mon Sep 17 00:00:00 2001
From: Diederik de Haas <[email protected]>
Date: Mon, 2 Dec 2024 13:17:02 +0100
Subject: [PATCH 03/11] debian/rules: Sort configure params alphabetically
I noticed that ``-Dsymbols=ON`` and ``-Doverlay=ON`` were added twice,
so in order to minimize the chances of that happening again, sort the
configure parameters alphabetically and remove the duplicates.
---
debian/rules | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/debian/rules b/debian/rules
index cdf6702..28fbfd4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,11 +27,9 @@ override_dh_auto_configure:
dh_auto_configure -- \
-DBUILD_NUMBER=517 \
-DCMAKE_BUILD_TYPE=Release \
- -Dsymbols=ON \
- -Dupdate=OFF \
- -Doverlay=ON \
- -Doverlay-xcompile=OFF \
-Dbundle-qt-translations=OFF \
+ -Doverlay-xcompile=OFF \
+ -Doverlay=ON \
-Dsymbols=ON \
-Dtests=OFF \
-Dupdate=OFF \
--
2.45.2
>From 8b0f21c475d8fb76af9d1d46be1bbbc30ce89a71 Mon Sep 17 00:00:00 2001
From: Diederik de Haas <[email protected]>
Date: Wed, 4 Dec 2024 10:24:33 +0100
Subject: [PATCH 04/11] debian/rules: Switch to system libraries
The libspeexdsp-dev library was already a B-D and according to
upstream's cmake_options.md file the default is to use the bundled one.
So set that to 'OFF' to use the system library.
It also bundles nlohmann's json library, but that too can be switched to
the system library, so do that and add the needed library to the B-Ds.
Microsoft's GSL (Guidelines Support Library) can also be replaced by a
system library, so add libmsgsl-dev to the B-Ds as well.
Note that mumble references version 3.1.0 of the GSL library while at
this moment Debian Trixie has version 4.0.x. But I did find an issue
where version 4.0.x was used to compile and that didn't seem to cause a
problem, so we should be fine.
---
debian/control | 2 ++
debian/rules | 3 +++
2 files changed, 5 insertions(+)
diff --git a/debian/control b/debian/control
index a80d366..83d7c55 100644
--- a/debian/control
+++ b/debian/control
@@ -13,6 +13,7 @@ Build-Depends: debhelper (>= 13),
libcap-dev [linux-any],
libgl-dev,
libjack-jackd2-dev,
+ libmsgsl-dev,
libogg-dev,
libopus-dev,
libpoco-dev,
@@ -28,6 +29,7 @@ Build-Depends: debhelper (>= 13),
libssl-dev,
libxi-dev,
libzeroc-ice-dev,
+ nlohmann-json3-dev,
pkgconf,
po-debconf,
protobuf-compiler,
diff --git a/debian/rules b/debian/rules
index 28fbfd4..621ca75 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,6 +28,9 @@ override_dh_auto_configure:
-DBUILD_NUMBER=517 \
-DCMAKE_BUILD_TYPE=Release \
-Dbundle-qt-translations=OFF \
+ -Dbundled-gsl=OFF \
+ -Dbundled-json=OFF \
+ -Dbundled-speex=OFF \
-Doverlay-xcompile=OFF \
-Doverlay=ON \
-Dsymbols=ON \
--
2.45.2
>From 1fc28f2f7911cdaf5d8d8447f96a8c925faacce6 Mon Sep 17 00:00:00 2001
From: Diederik de Haas <[email protected]>
Date: Wed, 4 Dec 2024 10:38:30 +0100
Subject: [PATCH 05/11] debian/po/templates.pot: Several style fixes
When running ``debconf-updatepo`` the ``templates.pot`` file always got
modified, so make the following changes to prevent that:
1) replace the PACKAGE variable with the package name (mumble) and drop
the VERSION variable.
2) Add a line for 'Language'.
3) Reformat text so they don't exceed the 80 column marker as otherwise
``debconf-updatepo`` will reformat it.
These changes also make sure that POT-Creation-Date is no longer updated
to match the last build time.
ad 1) This is now in line with the 3 projects I compared it with:
console-setup, tzdata and grub2.
While at it, also change 'Murmur' to 'Mumble-server' to complete the
name change of the daemon; also in ``mumble-server.templates``.
---
debian/mumble-server.templates | 7 ++++---
debian/po/templates.pot | 12 +++++++-----
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/debian/mumble-server.templates b/debian/mumble-server.templates
index f033734..d008e8c 100644
--- a/debian/mumble-server.templates
+++ b/debian/mumble-server.templates
@@ -1,8 +1,8 @@
Template: mumble-server/password
Type: password
_Description: Password to set on SuperUser account:
- Murmur has a special account called "SuperUser" which bypasses all
- privilege checks.
+ Mumble-server (mumble-server) has a special account called "SuperUser"
+ which bypasses all privilege checks.
.
If you set a password here, the password for the "SuperUser" account will
be updated.
@@ -13,7 +13,8 @@ Template: mumble-server/start_daemon
Type: boolean
Default: true
_Description: Autostart mumble-server on server boot?
- Mumble-server (mumble-server) can start automatically when the server is
booted.
+ Mumble-server (mumble-server) can start automatically when the server is
+ booted.
Template: mumble-server/use_capabilities
Type: boolean
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index 8745ee1..2c4583c 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -1,17 +1,18 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the mumble package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: mumble\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2010-01-11 16:52+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -26,8 +27,8 @@ msgstr ""
#. Description
#: ../mumble-server.templates:1001
msgid ""
-"Murmur has a special account called \"SuperUser\" which bypasses all "
-"privilege checks."
+"Mumble-server (mumble-server) has a special account called \"SuperUser\" "
+"which bypasses all privilege checks."
msgstr ""
#. Type: password
@@ -54,7 +55,8 @@ msgstr ""
#. Description
#: ../mumble-server.templates:2001
msgid ""
-"Mumble-server (mumble-server) can start automatically when the server is
booted."
+"Mumble-server (mumble-server) can start automatically when the server is "
+"booted."
msgstr ""
#. Type: boolean
--
2.45.2
>From 7dc9267c7c49589a989f790435f5b8c94b37baf1 Mon Sep 17 00:00:00 2001
From: Diederik de Haas <[email protected]>
Date: Wed, 4 Dec 2024 10:55:54 +0100
Subject: [PATCH 06/11] debian/control: Update package description for Mumble
server
It was still mentioning the old name, Murmur, so update it to the new
name like it has been done in most places.
---
debian/control | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/debian/control b/debian/control
index 83d7c55..c028d40 100644
--- a/debian/control
+++ b/debian/control
@@ -67,7 +67,7 @@ Depends: ${shlibs:Depends},
libqt5sql5-sqlite,
sysvinit-utils (>= 2.96)
Description: Low latency encrypted VoIP server
- Murmur is the VoIP server component for Mumble. Murmur is installed
- in a system-wide fashion, but can also be run by individual users.
- Each murmur process supports multiple virtual servers, each with their
- own user base and channel list.
+ Mumble server is the VoIP server component for Mumble. Mumble server is
+ installed in a system-wide fashion, but can also be run by individual
+ users. Each mumble-server process supports multiple virtual servers,
+ each with their own user base and channel list.
--
2.45.2
>From 76ad73872b8c6eb4f5e92a3a42ed3b9735d7a198 Mon Sep 17 00:00:00 2001
From: Diederik de Haas <[email protected]>
Date: Wed, 4 Dec 2024 11:02:10 +0100
Subject: [PATCH 07/11] debian/control: Drop debhelper B-D
Having only debhelper-compat as Build-Depends is sufficient to get
debhelper, so drop debhelper itself from the B-Ds list.
While add it, sort the other entries alphabetically.
---
debian/control | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/debian/control b/debian/control
index c028d40..05d065c 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,7 @@ Priority: optional
Maintainer: Debian VoIP Team <[email protected]>
Uploaders: Christopher Knadle <[email protected]>
Rules-Requires-Root: no
-Build-Depends: debhelper (>= 13),
- debhelper-compat (= 13),
+Build-Depends: debhelper-compat (= 13),
cmake,
libasound2-dev,
libavahi-compat-libdnssd-dev,
@@ -20,8 +19,8 @@ Build-Depends: debhelper (>= 13),
libprotobuf-dev,
libprotoc-dev,
libpulse-dev,
- libqt5svg5-dev,
libqt5opengl5-dev,
+ libqt5svg5-dev,
libsndfile1-dev,
libspeechd-dev,
libspeex-dev,
--
2.45.2
>From c480bb7af809dc36e9689efd3407a68a158403d4 Mon Sep 17 00:00:00 2001
From: Diederik de Haas <[email protected]>
Date: Wed, 4 Dec 2024 11:15:20 +0100
Subject: [PATCH 08/11] debian/patches: Add patch to fix missing systemd
Documentation key
Import an upstream commit which added the Documentation field to the
mumble-server systemd unit file as reported by Lintian with the
systemd-service-file-missing-documentation-key issue.
Consequently remove the corresponding issue from the TODO list.
Fixes-lintian-tag: systemd-service-file-missing-documentation-key
Link: https://github.com/mumble-voip/mumble/pull/6637
Link: https://github.com/mumble-voip/mumble/pull/6645
---
debian/extras/TODO | 14 ----------
...Documentation-key-to-mumble-server-u.patch | 27 +++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 28 insertions(+), 14 deletions(-)
create mode 100644
debian/patches/96-DOCS-server-Add-Documentation-key-to-mumble-server-u.patch
diff --git a/debian/extras/TODO b/debian/extras/TODO
index da2a133..8a8f188 100644
--- a/debian/extras/TODO
+++ b/debian/extras/TODO
@@ -15,17 +15,3 @@ TODO list for Mumble
N: Visibility: info
N: Show-Always: no
N: Check: binaries/hardening
-
-- Add "Documentation Key" to the systemd service file
-
- I: mumble-server: systemd-service-file-missing-documentation-key
[usr/lib/systemd/system/mumble-server.service]
- N:
- N: The systemd service file does not contain a Documentation key.
- N:
- N: Documentation for systemd service files can be automatically viewed
using systemctl help servicename if this field is present.
- N:
- N: Please refer to the systemd.unit(5) manual page for details.
- N:
- N: Visibility: info
- N: Show-Always: no
- N: Check: systemd
diff --git
a/debian/patches/96-DOCS-server-Add-Documentation-key-to-mumble-server-u.patch
b/debian/patches/96-DOCS-server-Add-Documentation-key-to-mumble-server-u.patch
new file mode 100644
index 0000000..7cd9e69
--- /dev/null
+++
b/debian/patches/96-DOCS-server-Add-Documentation-key-to-mumble-server-u.patch
@@ -0,0 +1,27 @@
+From: Diederik de Haas <[email protected]>
+Date: Tue, 26 Nov 2024 13:50:39 +0100
+Subject: DOCS(server): Add Documentation key to mumble-server unit
+Origin: upstream,
https://github.com/mumble-voip/mumble/commit/b9ad89ed33062b10594111ca312d55d33e4ac329
+
+Make it easy to view the man page by documenting it in its service unit
+file. Then it can be viewed via `systemctl help mumble-server.service`.
+
+(cherry picked from commit 217d48eeff311ceff20676725cb9ee940554cd90)
+---
+ auxiliary_files/config_files/mumble-server.service.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/auxiliary_files/config_files/mumble-server.service.in
b/auxiliary_files/config_files/mumble-server.service.in
+index 0447a022e..852d1b61a 100644
+--- a/auxiliary_files/config_files/mumble-server.service.in
++++ b/auxiliary_files/config_files/mumble-server.service.in
+@@ -1,5 +1,6 @@
+ [Unit]
+ Description=Mumble server
++Documentation=man:mumble-server(1)
+ After=network.target
+ Wants=network-online.target
+
+--
+2.45.2
+
diff --git a/debian/patches/series b/debian/patches/series
index f14ad15..011fdf6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
45-add-pid-location-hint.diff
90-debianize-systemd-unit.diff
95-fix-reproducibility.diff
+96-DOCS-server-Add-Documentation-key-to-mumble-server-u.patch
--
2.45.2
>From 6075c8a8cd8e754fbc2ea5d68d7449fcc3c686fd Mon Sep 17 00:00:00 2001
From: Diederik de Haas <[email protected]>
Date: Wed, 4 Dec 2024 13:14:03 +0100
Subject: [PATCH 09/11] debian/upstream/signing-key.asc: update to upstream's
2024 key
On validation, one should now see something like this:
```
gpgv: Signature made do 16 mei 2024 15:38:03 CEST
gpgv: using EDDSA key 9B9ADC09AD09F76B10F87CBFCDB285AE2332CF8D
gpgv: Good signature from "Mumble Automatic Build Infrastructure 2024
<[email protected]>"
```
Link: https://github.com/mumble-voip/mumble-gpg-signatures/blob/master/gpg.txt
---
debian/upstream/signing-key.asc | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
index 40ed9d4..d265152 100644
--- a/debian/upstream/signing-key.asc
+++ b/debian/upstream/signing-key.asc
@@ -1,14 +1,14 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
-mDMEY7DR3hYJKwYBBAHaRw8BAQdA41ZNdehf8gazXKUb2MV28G+vwuhRn6amIZN2
-bEsRKhW0T011bWJsZSBBdXRvbWF0aWMgQnVpbGQgSW5mcmFzdHJ1Y3R1cmUgMjAy
-MyA8bXVtYmxlLWF1dG8tYnVpbGQtMjAyM0BtdW1ibGUuaW5mbz6IlgQTFggAPhYh
-BNoiO5YDqcfdRpEUPmn4Kv8UjcD/BQJjsNHeAhsDBQkB4oUABQsJCAcCBhUKCQgL
-AgQWAgMBAh4BAheAAAoJEGn4Kv8UjcD/FuMA/0MTw99n3cqNspeBvOkjzJQ6nTI5
-BjGKOLQ8vzoZgl0IAP9ewWiYCr7mOmpOmf/ENwOdB3IJo2xsPTxo0t1B9+TfDbg4
-BGOw0d4SCisGAQQBl1UBBQEBB0A/LUayu0DC2tZVBXSjvLJQCltQfKG9Yy5quqyx
-ylM6HwMBCAeIfgQYFggAJhYhBNoiO5YDqcfdRpEUPmn4Kv8UjcD/BQJjsNHeAhsM
-BQkB4oUAAAoJEGn4Kv8UjcD/o7AA/3DBsW4bF/UQhV6Q7OQZFv8jNPq5guONqXg6
-rtl9vMuHAP9z6XgEI/743mKgHjGwoomCkBJ5rcIJH++cMVVexM52Dg==
-=bpv4
+mDMEZZIESBYJKwYBBAHaRw8BAQdAR77F3kIVrpWNgbY5A9vZVxuG5SDJeIb0Y+MK
+82q34Te0T011bWJsZSBBdXRvbWF0aWMgQnVpbGQgSW5mcmFzdHJ1Y3R1cmUgMjAy
+NCA8bXVtYmxlLWF1dG8tYnVpbGQtMjAyNEBtdW1ibGUuaW5mbz6IlgQTFggAPhYh
+BJua3AmtCfdrEPh8v82yha4jMs+NBQJlkgRIAhsDBQkB49aABQsJCAcCBhUKCQgL
+AgQWAgMBAh4BAheAAAoJEM2yha4jMs+No70BANkaEEnA6sLOnQ1REwz8t+HJS/Uu
+4JrzaTfc9U8NTNsrAQD4rw9okTuZywzFc+NtGyMvUkmC3px6CktpS/kjaLwzDrg4
+BGWSBEgSCisGAQQBl1UBBQEBB0De/5Wgtd5j35eO98xf5Ct3yCKs5KVwZUfjeJ+p
+UT3+SQMBCAeIfgQYFggAJhYhBJua3AmtCfdrEPh8v82yha4jMs+NBQJlkgRIAhsM
+BQkB49aAAAoJEM2yha4jMs+NirgBAMAuRHOpRztcK9RrSXZKK9zzh4vLiMmxQx5U
+YY5hsqh8APoCHZ9Oy6uQ2OyIvpwGQyNOPKS1CCMO9DzY8oK08tOyBA==
+=csHG
-----END PGP PUBLIC KEY BLOCK-----
--
2.45.2
>From 38452222dcb314f6eeb73afd331e87372301fbe4 Mon Sep 17 00:00:00 2001
From: Diederik de Haas <[email protected]>
Date: Wed, 4 Dec 2024 13:22:13 +0100
Subject: [PATCH 10/11] debian/watch: Switch back to 'stable' downloads
Now that there's an official release in the 1.5.x series, let's switch
back to the 'stable' downloads.
While at it, also simplify the expression and let uscan do the package
name, version and archive extension mangling.
Also drop the repack/version mangling as Files-Excluded was dropped in
05b9644848cb ("debian/copyright: update for code and license changes for 1.5.x")
and therefor there is no longer a need to repack and what comes with it.
Lastly, make sure the last line of the `opts` also has a backslash,
otherwise uscan reports the following:
``uscan info: watch line only with opts="..." and no URL``
Which made the signature validation fail.
Thanks to 'emorrp1' on IRC for the hint!
Fixes-lintian-tag: debian-watch-could-verify-download
---
debian/watch | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/debian/watch b/debian/watch
index 64ccd34..3a93298 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,7 +1,3 @@
version=4
-opts="\
- repack, \
- repacksuffix=+dfsg, \
-
dversionmangle=s/(\da?)[\+\.\-~](?:dfsg|debian|ds|repack|repacked)\.?\d*$/$1/, \
- pgpsigurlmangle=s/$/.(?:sig|asc)/"
-https://dl.mumble.info/snapshot/mumble-(\d+\.\d+\.\d+)\.tar\.gz
+opts="pgpmode=auto" \
+https://dl.mumble.info/stable/@PACKAGE@@ANY_VERSION@@ARCHIVE_EXT@
--
2.45.2
>From 4ab80fc0dfa713f787e7696b04aa25ce92ec52b4 Mon Sep 17 00:00:00 2001
From: Diederik de Haas <[email protected]>
Date: Sat, 7 Dec 2024 12:42:29 +0100
Subject: [PATCH 11/11] debian/gbp.conf: Add 'sign-tags = True' to
configuration
The ``debian/README.source`` specifies to use the ``--sign-tags``
parameter to ``gbp import-orig``, but it's easier if it's already
defined in ``debian/gbp.conf`` so it's enabled automatically.
As ``pristine-tar = True`` was already defined in ``debian/gbp.conf``
also that parameter is not needed in the ``gbp import-orig`` invocation.
So remove both parameters from ``debian/README.source``.
Fixes-lintian-tag: orig-tarball-missing-upstream-signature
---
debian/README.source | 2 +-
debian/gbp.conf | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/debian/README.source b/debian/README.source
index b866a2d..43f8cf7 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -5,6 +5,6 @@ The git-buildpackage utility is used for importing upstream
sources. It is
recommended to start a new changelog entry prior to importing. The following is
an example used to import sources for version 1.3.0~rc2+dfsg.
- gbp import-orig --debian-branch debian --sign-tags --pristine-tar --uscan \
+ gbp import-orig --debian-branch debian --uscan \
--upstream-version '1.3.0~rc2+dfsg'
diff --git a/debian/gbp.conf b/debian/gbp.conf
index ab3e7ac..37ac1a1 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,4 +1,6 @@
[DEFAULT]
-pristine-tar = true
+pristine-tar = True
debian-branch=debian
+[buildpackage]
+sign-tags = True
--
2.45.2
>From 28e675e0913a9defae585ae696d035c92d9b937c Mon Sep 17 00:00:00 2001
From: Diederik de Haas <[email protected]>
Date: Sun, 1 Dec 2024 14:12:28 +0100
Subject: [PATCH 1000/1005] debian: New upstream release 1.5.634
Drop the reproducibility patch as that was backported from upstream and
is included in this release.
And update the build number in debian/rules.
---
debian/changelog | 10 ++++++++++
debian/patches/95-fix-reproducibility.diff | 18 ------------------
debian/patches/series | 1 -
debian/rules | 2 +-
4 files changed, 11 insertions(+), 20 deletions(-)
delete mode 100644 debian/patches/95-fix-reproducibility.diff
diff --git a/debian/changelog b/debian/changelog
index 8800625..e5ff2dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+mumble (1.5.634-0.1) UNRELEASED; urgency=medium
+
+ * New upstream release: https://www.mumble.info/blog/mumble-1.5.634/
+
+ * New upstream release 1.5.634
+ - debian/patches: Drop patches applied upstream
+ - debian/rules: Update build number
+
+ -- Diederik de Haas <[email protected]> Fri, 06 Dec 2024 20:23:35 +0100
+
mumble (1.5.517-2.1) unstable; urgency=medium
* Non-maintainer upload.
diff --git a/debian/patches/95-fix-reproducibility.diff
b/debian/patches/95-fix-reproducibility.diff
deleted file mode 100644
index 848761b..0000000
--- a/debian/patches/95-fix-reproducibility.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: To make the build reproducible, it's needed to set the timezone as
- otherwise the date could vary based on the timezone of the build server.
-Author: Chris Lamb <lamby at debian.org>
-Bug: https://bugs.debian.org/1060254
-Last-Update: 2024-02-10
-Origin: upstream,
https://github.com/mumble-voip/mumble/commit/af46c1a909a4a90955bb9a4b3c010f45ce80a986
-
---- a/auxiliary_files/CMakeLists.txt
-+++ b/auxiliary_files/CMakeLists.txt
-@@ -8,7 +8,7 @@
-
- if(NOT BUILD_RELEASE_DATE)
- # If BUILD_RELEASE_DATE has not been set, default to time of build
-- string(TIMESTAMP BUILD_RELEASE_DATE "%Y-%m-%d")
-+ string(TIMESTAMP BUILD_RELEASE_DATE "%Y-%m-%d" UTC)
- endif()
-
- if(overlay)
diff --git a/debian/patches/series b/debian/patches/series
index 011fdf6..0e66192 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,5 +3,4 @@
#44-add-speechd-header.diff
45-add-pid-location-hint.diff
90-debianize-systemd-unit.diff
-95-fix-reproducibility.diff
96-DOCS-server-Add-Documentation-key-to-mumble-server-u.patch
diff --git a/debian/rules b/debian/rules
index 621ca75..cd31b74 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,7 +25,7 @@ export DH_OPTIONS
override_dh_auto_configure:
dh_auto_configure -- \
- -DBUILD_NUMBER=517 \
+ -DBUILD_NUMBER=634 \
-DCMAKE_BUILD_TYPE=Release \
-Dbundle-qt-translations=OFF \
-Dbundled-gsl=OFF \
--
2.45.2
>From 424d8fd23bbbbf76ce438bfe4398c916e05f7fce Mon Sep 17 00:00:00 2001
From: Diederik de Haas <[email protected]>
Date: Sun, 1 Dec 2024 14:30:16 +0100
Subject: [PATCH 1001/1005] debian/mumble-server.install: Update file locations
The following commits caused the following changes:
ea988fe0c890 ("BUILD(cmake): Fix fallback install dir for sysusersdir")
Changed location from `/etc/sysconfig.d/` to `/etc/sysusers.d/`.
a437cd1b9e4a ("BUILD(cmake): Add install path for misc shared files (e.g. Ice
file)")
Changed location to ${MUMBLE_INSTALL_SERVER_SHAREDIR} for
`MumbleServer.ice`.
fbe59221735b ("MAINT: Remove system DBus config file")
removed the DBus config file as DBus support on the server has been
deprecated for a while.
Note that in the 'master' branch, the DBus RPC interface on the server
has been removed entirely in PR 6580, "Instead, users shall make use of
the ZeroC Ice interface as a means to do RPC."
Link: https://github.com/mumble-voip/mumble/pull/6580
---
debian/mumble-server.install | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/debian/mumble-server.install b/debian/mumble-server.install
index 135c566..b0d1e22 100644
--- a/debian/mumble-server.install
+++ b/debian/mumble-server.install
@@ -1,7 +1,6 @@
usr/bin/mumble-server
usr/bin/mumble-server-user-wrapper
etc/mumble/mumble-server.ini
-etc/mumble/MumbleServer.ice
+usr/share/mumble-server/MumbleServer.ice
etc/systemd/system/mumble-server.service usr/lib/systemd/system/
-etc/sysconfig.d/mumble-server.conf
-usr/share/dbus-1/system.d/mumble-server.conf
+etc/sysusers.d/mumble-server.conf
--
2.45.2
>From 58df331f8ce8edec5385fa7942e27d2a3a7e68bf Mon Sep 17 00:00:00 2001
From: Diederik de Haas <[email protected]>
Date: Sun, 1 Dec 2024 14:43:22 +0100
Subject: [PATCH 1002/1005] debian: Add systemd-tmpfiles support for Mumble
Server
Upstream added support for systemd-tmpfiles in
00369086c7de ("BUILD(cmake): Ensure ownership of installed INI file")
and
0f69b00ca85b ("BUILD(cmake): Use proper path in tmpfiles.d file")
So update mumble-server.install and 90-debianize-systemd-unit.diff
to deal with that.
---
debian/mumble-server.install | 1 +
debian/patches/90-debianize-systemd-unit.diff | 11 ++++++++++-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/debian/mumble-server.install b/debian/mumble-server.install
index b0d1e22..a17e49b 100644
--- a/debian/mumble-server.install
+++ b/debian/mumble-server.install
@@ -4,3 +4,4 @@ etc/mumble/mumble-server.ini
usr/share/mumble-server/MumbleServer.ice
etc/systemd/system/mumble-server.service usr/lib/systemd/system/
etc/sysusers.d/mumble-server.conf
+etc/tmpfiles.d/mumble-server.conf usr/lib/tmpfiles.d/
diff --git a/debian/patches/90-debianize-systemd-unit.diff
b/debian/patches/90-debianize-systemd-unit.diff
index 9ab15a0..1158d34 100644
--- a/debian/patches/90-debianize-systemd-unit.diff
+++ b/debian/patches/90-debianize-systemd-unit.diff
@@ -1,8 +1,9 @@
Description: Correct upstream systemd unit for Group, User, and mumble-server
sysuser
Author: Sven Hartge Sven Hartge <[email protected]>
Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1039271
-Last-Update: 2023-12-08
+Last-Update: 2024-12-01
+2024-12-01: Add patch for systemd-tmpfiles
--- a/auxiliary_files/config_files/mumble-server.service.in
+++ b/auxiliary_files/config_files/mumble-server.service.in
@@ -7,7 +7,7 @@
@@ -31,3 +32,11 @@ Last-Update: 2023-12-08
# Type # Name # ID # GECOS # Home # Shell
-u _mumble-server - "Mumble server user" - -
+u mumble-server - "Mumble server user" - -
+--- a/auxiliary_files/config_files/mumble-server.tmpfiles.in
++++ b/auxiliary_files/config_files/mumble-server.tmpfiles.in
+@@ -3,4 +3,4 @@
+ # special user used to execute the Mumble server when started via systemd
+
+ # Type # Path # Mode # User # Group
+-z @MUMBLE_INSTALL_ABS_SYSCONFDIR@/mumble-server.ini 0640 root
_mumble-server
++z @MUMBLE_INSTALL_ABS_SYSCONFDIR@/mumble-server.ini 0640 root
mumble-server
--
2.45.2
>From 4fb4a8d439cc6e4f66e431ccba57c3485486c150 Mon Sep 17 00:00:00 2001
From: Diederik de Haas <[email protected]>
Date: Sun, 1 Dec 2024 15:05:00 +0100
Subject: [PATCH 1003/1005] debian/copyright: Update for rnnoise-src ->
renamenoise change
Mumble started their own fork of RNNoise and changed to that in
84f759d99d6d ("FEAT(client): Add ReNameNoise as a replacement for RNNoise")
(backported to v1.5.x in 2ef93a0d7fdf) so update to the new location and
update the copyright statement as it applies to their fork.
Link: https://github.com/mumble-voip/ReNameNoise
Link: https://github.com/mumble-voip/rnnoise
---
debian/copyright | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/debian/copyright b/debian/copyright
index 8c64311..50d54be 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -79,8 +79,9 @@ Files: 3rdparty/qqbonjour/*
Copyright: 2007, Trenton Schulz
License: BSD-3-clause
-Files: 3rdparty/rnnoise-src/*
-Copyright: Copyright (c) 2017, Mozilla
+Files: 3rdparty/renamenoise/*
+Copyright: Copyright (c) 2024, The Mumble Developers
+ Copyright (c) 2017, Mozilla
Copyright (c) 2007-2017, Jean-Marc Valin
Copyright (c) 2005-2017, Xiph.Org Foundation
Copyright (c) 2003-2004, Mark Borgerding
--
2.45.2
>From 91a453d12e614fd9039d6e7bd533b7a6720d5abf Mon Sep 17 00:00:00 2001
From: Diederik de Haas <[email protected]>
Date: Sun, 1 Dec 2024 15:18:32 +0100
Subject: [PATCH 1004/1005] debian/control: Declare compliance with Policy
4.7.0 (no changes needed)
Fixes-lintian-tag: out-of-date-standards-version
---
debian/control | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/control b/debian/control
index 05d065c..e702af9 100644
--- a/debian/control
+++ b/debian/control
@@ -35,7 +35,7 @@ Build-Depends: debhelper-compat (= 13),
qtbase5-dev,
qttools5-dev,
qttools5-dev-tools
-Standards-Version: 4.6.2
+Standards-Version: 4.7.0
Vcs-Browser: https://salsa.debian.org/pkg-voip-team/mumble
Vcs-Git: https://salsa.debian.org/pkg-voip-team/mumble.git
Homepage: https://www.mumble.info
--
2.45.2
>From 9e91a7692304c1beb86a758c5d821c7412d527ac Mon Sep 17 00:00:00 2001
From: Diederik de Haas <[email protected]>
Date: Fri, 6 Dec 2024 17:29:45 +0100
Subject: [PATCH 1005/1005] debian/changelog: Document 1.5.634-0.1 release
This is upstreams first stable release in the 1.5.x series.
Link: https://www.mumble.info/blog/mumble-1.5.634/
---
debian/changelog | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index e5ff2dc..cd00032 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,20 @@ mumble (1.5.634-0.1) UNRELEASED; urgency=medium
* New upstream release 1.5.634
- debian/patches: Drop patches applied upstream
- debian/rules: Update build number
+ * debian/rules: Stop parsing d/changelog
+ * debian/rules: Remove unused MAKEFILE and SOURCE_DIR variables
+ * debian/rules: Sort configure params alphabetically
+ * debian/rules: Switch to system libraries
+ * debian/po/templates.pot: Several style fixes
+ * debian/control: Update package description for Mumble server
+ * debian/control: Drop debhelper B-D
+ * debian/patches: Add patch to fix missing systemd Documentation key
+ * debian/upstream/signing-key.asc: update to upstream's 2024 key
+ * debian/watch: Switch back to 'stable' downloads
+ * debian/mumble-server.install: Update file locations
+ * debian: Add systemd-tmpfiles support for Mumble Server
+ * debian/copyright: Update for rnnoise-src -> renamenoise change
+ * debian/control: Declare compliance with Policy 4.7.0 (no changes needed)
-- Diederik de Haas <[email protected]> Fri, 06 Dec 2024 20:23:35 +0100
--
2.45.2
--- End Message ---
pgp0QKAnph1xY.pgp
