Attachment 231229 Details for Bug 261395 – audio/murmur: update to 1.4.230

[patch] audio/murmur: update to 1.4.230

murmur.diff (text/plain), 4.97 KB, created by Vladimir Druzenko on 2022-01-21 21:39:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vladimir Druzenko

Created: 2022-01-21 21:39:57 UTC

Size: 4.97 KB

patch

obsolete

>diff -urN audio/murmur.orig/Makefile audio/murmur/Makefile
>--- audio/murmur.orig/Makefile
>+++ audio/murmur/Makefile
>@@ -1,8 +1,7 @@
> # Created by: Ayumi M <ayu@commun.jp>
> 
> PORTNAME=	murmur
>-PORTVERSION=	1.3.3
>-PORTREVISION=	2
>+DISTVERSION=	1.4.230
> CATEGORIES=	audio net
> 
> MAINTAINER=	feld@FreeBSD.org
>@@ -14,55 +13,51 @@
> BUILD_DEPENDS=	${LOCALBASE}/include/boost/function.hpp:devel/boost-libs
> LIB_DEPENDS=	libprotobuf.so:devel/protobuf
> 
>-USES=		compiler:c++11-lang qmake pkgconfig python:build qt:5 ssl
>+USES=		cmake compiler:c++11-lang pkgconfig python:build qt:5 ssl
> USE_CXXSTD=	c++11
> USE_QT=		buildtools_build core network sql xml
> 
> USE_GITHUB=	YES
>-GH_ACCOUNT=	mumble-voip
>-GH_PROJECT=	mumble
>+GH_TUPLE=	mumble-voip:mumble:v${DISTVERSION} \
>+		Krzmbrzl:FindPythonInterpreter:bb4d3ea:mumble_FindPythonInterpreter/3rdparty/FindPythonInterpreter
> 
>-CONFIG=		no-client
>-QMAKE_ARGS=	"CONFIG+=${CONFIG}"
>-QMAKE_ENV+=	"MUMBLE_PYTHON=${PYTHON_CMD}"
>+CMAKE_ON=	server
>+CMAKE_OFF=	client
> 
> USE_RC_SUBR=	murmur
> SUB_LIST+=	USERS="${USERS}" GROUPS="${GROUPS}"
> 
>-OPTIONS_DEFINE=		BONJOUR DBUS DOCS ICE
>+OPTIONS_DEFINE=		BONJOUR DBUS DOCS GRPC ICE
> OPTIONS_DEFAULT=	BONJOUR MYSQL SQLITE
> OPTIONS_MULTI=		SQL
>-OPTIONS_MULTI_SQL=	MYSQL SQLITE
>+OPTIONS_MULTI_SQL=	MYSQL PGSQL SQLITE
> 
> BONJOUR_DESC=		Bonjour Support
>-BONJOUR_VARS_OFF=	CONFIG+=no-bonjour
>+BONJOUR_CMAKE_BOOL=	zeroconf
> BONJOUR_LIB_DEPENDS=	libdns_sd.so:net/mDNSResponder
> 
>-DBUS_VARS_OFF=		CONFIG+=no-dbus
>+DBUS_CMAKE_BOOL=	dbus
> DBUS_USE=		QT=dbus
> 
>+GRPC_DESC=		Build support for gRPC
>+GRPC_CMAKE_BOOL=	grpc
>+GRPC_LIB_DEPENDS=	lib/libgrpc.so:devel/grpc
>+
> ICE_DESC=		Ice Support
>-ICE_VARS_OFF=		CONFIG+=no-ice
>+ICE_CMAKE_BOOL=		ice
> ICE_LIB_DEPENDS=	libIce.so:devel/ice
> 
>-MYSQL_VARS_OFF=		CONFIG+=no-sql-mysql
>-MYSQL_USE=		QT=sql-mysql
>+MYSQL_USE=		QT=sql-mysql_run
> 
>-SQLITE_VARS_OFF=	CONFIG+=no-sqlite3_run
>+PGSQL_USE=		QT=sql-pgsql_run
>+
> SQLITE_USE=		QT=sql-sqlite3_run
> 
> USERS=		murmur
> GROUPS=		murmur
> 
> .include <bsd.port.pre.mk>
>-# PCH is broken on GCC
>-.if ${CHOSEN_COMPILER_TYPE} == gcc
>-CONFIG+=	no-pch
>-.endif
> 
>-post-patch:
>-	@${ECHO_CMD} 'QMAKE_LFLAGS += -fstack-protector' >> ${WRKSRC}/src/murmur/murmur.pro
>-
> pre-install:
> 	${SED} -i '' -e 's|database=.*|database=/var/db/murmur/murmur.sqlite|' ${WRKSRC}/scripts/murmur.ini
> 	${SED} -i '' -e 's|#pidfile=.*|pidfile=/var/run/murmur/murmur.pid|' ${WRKSRC}/scripts/murmur.ini
>@@ -70,7 +65,7 @@
> 	${SED} -i '' -e 's|#host=.*|host=0.0.0.0|' ${WRKSRC}/scripts/murmur.ini
> 
> do-install:
>-	${INSTALL_PROGRAM} ${WRKSRC}/release/murmurd ${STAGEDIR}${PREFIX}/sbin
>+	${INSTALL_PROGRAM} ${WRKSRC}/../.build/mumble-server ${STAGEDIR}${PREFIX}/sbin/murmurd
> 	${INSTALL_DATA} ${WRKSRC}/scripts/murmur.ini ${STAGEDIR}${PREFIX}/etc/murmur.ini.sample
> 	${CP} ${WRKSRC}/man/murmurd.1 ${STAGEDIR}${PREFIX}/share/man/man1
> 
>diff -urN audio/murmur.orig/distinfo audio/murmur/distinfo
>--- audio/murmur.orig/distinfo
>+++ audio/murmur/distinfo
>@@ -1,3 +1,5 @@
>-TIMESTAMP = 1602262186
>-SHA256 (mumble-voip-mumble-1.3.3_GH0.tar.gz) = 53a555092a03af2e6025c641bb748f013e1cfa8f61899a686bed8690439f36c7
>-SIZE (mumble-voip-mumble-1.3.3_GH0.tar.gz) = 4895708
>+TIMESTAMP = 1642783207
>+SHA256 (mumble-voip-mumble-1.4.230-v1.4.230_GH0.tar.gz) = 0a6591568a2d63b7a6bb29a3b10e4289a34dfd75e33cb2143ae6c738b1e92983
>+SIZE (mumble-voip-mumble-1.4.230-v1.4.230_GH0.tar.gz) = 5804439
>+SHA256 (Krzmbrzl-FindPythonInterpreter-bb4d3ea_GH0.tar.gz) = 8439bfe7daeb478d8e8aa09b3c111c3dc360064144d181fc5dcfef950e8eaa05
>+SIZE (Krzmbrzl-FindPythonInterpreter-bb4d3ea_GH0.tar.gz) = 4817
>diff -urN audio/murmur.orig/files/patch-initialize-SSL audio/murmur/files/patch-initialize-SSL
>--- audio/murmur.orig/files/patch-initialize-SSL
>+++ audio/murmur/files/patch-initialize-SSL
>@@ -1,34 +0,0 @@
>-Description: the SSL library must be initialized, otherwise mumble and
>-   mumble-server both fail to find the available ciphers after a rebuild
>-   with openssl_1.0.2d-3.  The two calls used are based on:
>-     https://wiki.openssl.org/index.php/SSL/TLS_Client#Initialization
>-Author: Colomban Wendling <lists.ban@herbesfolles.org>
>-        Christohper Knadle <Chris.Knadle@coredump.us>
>-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=804363
>-Bug-Mumble: https://github.com/mumble-voip/mumble/issues/1876
>-Last-Updated: 2015-11-10
>-
>---- src/mumble/main.cpp.orig	2019-08-30 01:01:56 UTC
>-+++ src/mumble/main.cpp
>-@@ -132,6 +132,9 @@ int main(int argc, char **argv) {
>- 
>- 	os_init();
>- 
>-+	SSL_library_init();
>-+	SSL_load_error_strings();
>-+
>- 	bool bAllowMultiple = false;
>- 	bool suppressIdentity = false;
>- 	bool customJackClientName = false;
>---- src/murmur/main.cpp.orig	2019-08-30 01:01:56 UTC
>-+++ src/murmur/main.cpp
>-@@ -205,6 +205,9 @@ int main(int argc, char **argv) {
>- 	QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
>- #endif
>- 
>-+	SSL_library_init();
>-+	SSL_load_error_strings();
>-+
>- #ifdef Q_OS_WIN
>- 	// By default, windbus expects the path to dbus-daemon to be in PATH, and the path
>- 	// should contain bin\\, and the path to the config is hardcoded as ..\etc

Actions: View | Diff

Attachments on bug 261395: 231228 | 231229 | 243408 | 243409