Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package mumble for openSUSE:Factory checked
in at 2024-04-25 20:48:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mumble (Old)
and /work/SRC/openSUSE:Factory/.mumble.new.1880 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mumble"
Thu Apr 25 20:48:11 2024 rev:7 rq:1169949 version:1.5.629
Changes:
--------
--- /work/SRC/openSUSE:Factory/mumble/mumble.changes 2024-04-21
20:27:57.247403110 +0200
+++ /work/SRC/openSUSE:Factory/.mumble.new.1880/mumble.changes 2024-04-25
20:48:19.532192504 +0200
@@ -1,0 +2,13 @@
+Tue Apr 23 23:11:54 UTC 2024 - Andreas Stieger <andreas.stie...@gmx.de>
+
+- Address licensedigger concerns:
+ * drop qttranslations from tarball, adjust licenses.patch
+ * The OCB design is in the public domain
+ add mumble-1.5.629-The-OCB-design-is-in-the-public-domain.patch
+ * drop unneeded installer files from tarball
+ * unbundle audio back-end headers from tarball:
+ pulseadio, jack, portadio, pipewire
+ add mumble-1.5.629-unbundle-audio-backends.patch
+- change from tarball to obscpio and build-time service
+
+-------------------------------------------------------------------
Old:
----
mumble-1.5.629.tar.xz
New:
----
_servicedata
mumble-1.5.629-The-OCB-design-is-in-the-public-domain.patch
mumble-1.5.629-unbundle-audio-backends.patch
mumble-1.5.629.obscpio
BETA DEBUG BEGIN:
New: * The OCB design is in the public domain
add mumble-1.5.629-The-OCB-design-is-in-the-public-domain.patch
* drop unneeded installer files from tarball
New: pulseadio, jack, portadio, pipewire
add mumble-1.5.629-unbundle-audio-backends.patch
- change from tarball to obscpio and build-time service
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mumble.spec ++++++
--- /var/tmp/diff_new_pack.JyhkUU/_old 2024-04-25 20:48:21.124250963 +0200
+++ /var/tmp/diff_new_pack.JyhkUU/_new 2024-04-25 20:48:21.128251110 +0200
@@ -24,14 +24,10 @@
Version: 1.5.629
Release: 0
Summary: Voice Communication Client for Gamers
-# Most files are BSD-3-Clause, celt also contains BSD-2-Clause files.
+# Most files are BSD-3-Clause
# 3rdparty/arc4random/LICENSE: MIT
-# 3rdparty/jack: LGPL-2.1-or-later
-# 3rdparty/pipewire: MIT
-# 3rdparty/portaudio: MIT
-# 3rdparty/pulseaudio: LGPL-2.1-or-later
# 3rdparty/SPSCQueue: MIT
-License: BSD-2-Clause AND BSD-3-Clause AND MIT AND LGPL-2.1-or-later
+License: BSD-2-Clause AND BSD-3-Clause AND MIT
Group: Productivity/Multimedia/Sound/Utilities
URL: https://www.mumble.info/
Source: %{name}-%{version}.tar.xz
@@ -39,10 +35,11 @@
# PATCH-FIX-UPSTREAM fix-64bit-only-plugins.patch -- Requires 64bit memory
alignment ( https://github.com/mumble-voip/mumble/issues/5849 )
Patch0: fix-64bit-only-plugins.patch
Patch2: mumble-cxx17.patch
-# Removes licenses that are unbundled, or not used
+# Patches related to dependency unbundling
Patch100: licenses.patch
-# Make mumble build without statically linked tracy
Patch101: mumble-unbundle-tracy.patch
+Patch102: mumble-1.5.629-The-OCB-design-is-in-the-public-domain.patch
+Patch103: mumble-1.5.629-unbundle-audio-backends.patch
BuildRequires: c++_compiler
BuildRequires: cmake >= 3.20
BuildRequires: libboost_headers-devel
@@ -63,11 +60,15 @@
BuildRequires: pkgconfig(alsa)
BuildRequires: pkgconfig(avahi-compat-libdns_sd)
BuildRequires: pkgconfig(gl)
+BuildRequires: pkgconfig(jack)
BuildRequires: pkgconfig(libcrypto)
BuildRequires: pkgconfig(libpcre2-posix)
+BuildRequires: pkgconfig(libpipewire-0.3)
+BuildRequires: pkgconfig(libpulse)
BuildRequires: pkgconfig(libssl)
BuildRequires: pkgconfig(nlohmann_json)
BuildRequires: pkgconfig(opus)
+BuildRequires: pkgconfig(portaudio-2.0)
BuildRequires: pkgconfig(speech-dispatcher)
BuildRequires: pkgconfig(speexdsp)
BuildRequires: pkgconfig(xext)
@@ -144,6 +145,7 @@
-Dbundled-renamenoise:BOOL=ON \
-Dbundled-speex:BOOL=OFF \
-Dqtspeech:BOOL=ON \
+ -Dbundle-qt-translations:BOOL=OFF \
%if 0%{?suse_version} > 1600
-DCMAKE_SHARED_LINKER_FLAGS="-lGL" \
%endif
++++++ _service ++++++
--- /var/tmp/diff_new_pack.JyhkUU/_old 2024-04-25 20:48:21.160252285 +0200
+++ /var/tmp/diff_new_pack.JyhkUU/_new 2024-04-25 20:48:21.180253019 +0200
@@ -10,21 +10,27 @@
<param name="versionrewrite-replacement">\1</param>
</service>
<service name="set_version" mode="manual"/>
- <service name="tar" mode="manual">
+ <service name="tar" mode="buildtime">
<!-- throw away a number of unused, bundled libs -->
<param name="exclude">3rdparty/GL</param>
<param name="exclude">3rdparty/gsl</param>
+ <param name="exclude">3rdparty/jack</param>
<param name="exclude">3rdparty/march-override-*</param>
<param name="exclude">3rdparty/minhook</param>
<param name="exclude">3rdparty/nlohmann_json</param>
+ <param name="exclude">3rdparty/pipewire</param>
+ <param name="exclude">3rdparty/portaudio</param>
+ <param name="exclude">3rdparty/pulseaudio</param>
<param name="exclude">3rdparty/speexdsp-build</param>
<param name="exclude">3rdparty/speexdsp</param>
<param name="exclude">3rdparty/tracy</param>
<param name="exclude">3rdparty/xinputcheck*</param>
+ <param name="exclude">installer</param>
+ <param name="exclude">src/mumble/qttranslations</param>
<!-- and the licence texts, see license.patch -->
<param name="exclude">3rdPartyLicenses</param>
</service>
- <service name="recompress" mode="manual">
+ <service name="recompress" mode="buildtime">
<param name="file">*.tar</param>
<param name="compression">xz</param>
</service>
++++++ _servicedata ++++++
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/mumble-voip/mumble.git</param>
<param
name="changesrevision">e2b376b66eae551c4e2bad172598e0e7b917fd4d</param>
</service>
</servicedata>
++++++ licenses.patch ++++++
--- /var/tmp/diff_new_pack.JyhkUU/_old 2024-04-25 20:48:21.228254782 +0200
+++ /var/tmp/diff_new_pack.JyhkUU/_new 2024-04-25 20:48:21.232254929 +0200
@@ -2,7 +2,7 @@
===================================================================
--- mumble-1.5.629.orig/scripts/generate_license_header.py
+++ mumble-1.5.629/scripts/generate_license_header.py
-@@ -22,49 +22,12 @@ repoRoot = os.path.normpath(os.path.join
+@@ -22,49 +22,10 @@ repoRoot = os.path.normpath(os.path.join
# List of (3rdparty) licenses [<variableName>, <pathToLicenseFile>,
<DisplayName>, <URL>, (<define-guard>)?]
licenses = [
["licenseMumble", "LICENSE", "Mumble", "https://www.mumble.info/";],
@@ -14,8 +14,8 @@
- ["licenseFLAC", "3rdPartyLicenses/libflac_license.txt", "libFLAC",
"http://flac.sourceforge.net/";],
- ["licenseMachOverride", "3rdPartyLicenses/mach_override_license.txt",
"mach_override", "https://github.com/rentzsch/mach_star";, "Q_OS_MAC"],
- ["licenseMinHook", "3rdparty/minhook/LICENSE.txt", "MinHook",
"https://github.com/TsudaKageyu/minhook";, "Q_OS_WIN64"],
- ["licenseQtTranslations", "src/mumble/qttranslations/LICENSE",
- "Additional Qt translations",
"https://www.virtualbox.org/ticket/2018";, "USING_BUNDLED_QT_TRANSLATIONS"],
+- ["licenseQtTranslations", "src/mumble/qttranslations/LICENSE",
+- "Additional Qt translations",
"https://www.virtualbox.org/ticket/2018";, "USING_BUNDLED_QT_TRANSLATIONS"],
- ["licenseEmojiOne", "3rdPartyLicenses/cc_by_sa_40_legalcode.txt", "Emoji
One artwork", "http://emojione.com/";],
- ["licenseXInputCheck", "3rdparty/xinputcheck-src/COPYING.txt",
"XInputCheck (SDL_IsXInput function)", "https://www.libsdl.org/";],
+ ["licenseEmojiOne", "icons/flags/LICENSE.md", "Emoji One artwork",
"http://emojione.com/";],
++++++ mumble-1.5.629-The-OCB-design-is-in-the-public-domain.patch ++++++
>From 731684061ea6c90cd047941e4bc957a6b9c119b4 Mon Sep 17 00:00:00 2001
From: Andreas Stieger <andreas.stie...@gmx.de>
Date: Tue, 23 Apr 2024 17:51:24 +0200
Subject: [PATCH] MAINT: The OCB design is in the public domain
The inventor dedicated the design to the public domain, all patents
lapsed intentionally. Comments only, no code change.
Fixes #6403
---
src/crypto/CryptStateOCB2.cpp | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/crypto/CryptStateOCB2.cpp b/src/crypto/CryptStateOCB2.cpp
index e5866b01c..16259d9df 100644
--- a/src/crypto/CryptStateOCB2.cpp
+++ b/src/crypto/CryptStateOCB2.cpp
@@ -5,11 +5,9 @@
/*
* This code implements OCB-AES128.
- * In the US, OCB is covered by patents. The inventor has given a license
- * to all programs distributed under the GPL.
- * Mumble is BSD (revised) licensed, meaning you can use the code in a
- * closed-source program. If you do, you'll have to either replace
- * OCB with something else or get yourself a license.
+ * The algorithm design was dedicated to the public domain.
+ * https://www.cs.ucdavis.edu/~rogaway/ocb/license.htm
+ * https://www.cs.ucdavis.edu/~rogaway/ocb/ocb-faq.htm
*/
#include <QtCore/QtGlobal>
--
2.44.0
++++++ mumble-1.5.629-unbundle-audio-backends.patch ++++++
Index: mumble-1.5.629/src/mumble/CMakeLists.txt
===================================================================
--- mumble-1.5.629.orig/src/mumble/CMakeLists.txt
+++ mumble-1.5.629/src/mumble/CMakeLists.txt
@@ -1027,7 +1027,6 @@ if(jackaudio)
)
target_compile_definitions(mumble_client_object_lib PUBLIC
"USE_JACKAUDIO")
- target_include_directories(mumble_client_object_lib SYSTEM PUBLIC
"${3RDPARTY_DIR}/jack")
endif()
if(oss)
@@ -1049,7 +1048,8 @@ if(pipewire)
)
target_compile_definitions(mumble_client_object_lib PUBLIC
"USE_PIPEWIRE")
- target_include_directories(mumble_client_object_lib SYSTEM PUBLIC
"${3RDPARTY_DIR}/pipewire")
+ target_include_directories(mumble_client_object_lib SYSTEM PUBLIC
"/usr/include/pipewire-0.3")
+ target_include_directories(mumble_client_object_lib SYSTEM PUBLIC
"/usr/include/spa-0.2")
endif()
if(portaudio)
@@ -1060,7 +1060,6 @@ if(portaudio)
)
target_compile_definitions(mumble_client_object_lib PUBLIC
"USE_PORTAUDIO")
- target_include_directories(mumble_client_object_lib SYSTEM PUBLIC
"${3RDPARTY_DIR}/portaudio")
endif()
if(pulseaudio)
@@ -1071,7 +1070,6 @@ if(pulseaudio)
)
target_compile_definitions(mumble_client_object_lib PUBLIC
"USE_PULSEAUDIO")
- target_include_directories(mumble_client_object_lib SYSTEM PUBLIC
"${3RDPARTY_DIR}/pulseaudio")
endif()
if(wasapi)
