View | Details | Raw Unified | Return to bug 219444 | Differences between
and this patch

Collapse All | Expand All

(-)www/janus/Makefile (+42 lines)
Line 0 Link Here
1
# $FreeBSD$
2
3
PORTNAME=	janus
4
CATEGORIES=	www
5
DISTVERSION=	0.10.1
6
DISTVERSIONPREFIX= v
7
MAINTAINER=	jhixson@gmail.com
8
COMMENT=	WebRTC gateway
9
10
LICENSE=	GPLv3
11
12
BUILD_DEPENDS=	gengetopt>0:devel/gengetopt
13
LIB_DEPENDS=	libsrtp2.so:net/libsrtp2 \
14
	libjansson.so:devel/jansson \
15
	libnice.so:net-im/libnice \
16
	libmicrohttpd.so:www/libmicrohttpd \
17
	libwebsockets.so:net/libwebsockets \
18
	libcurl.so:ftp/curl \
19
	libopus.so:audio/opus \
20
	libsofia-sip-ua.so:net/sofia-sip \
21
	libogg.so:audio/libogg \
22
	libjansson.so:devel/jansson \
23
	libnice.so:net-im/libnice \
24
	libmicrohttpd.so:www/libmicrohttpd \
25
	libwebsockets.so:net/libwebsockets \
26
	libconfig.so:devel/libconfig
27
28
USES=	libtool pkgconfig autoreconf gmake localbase gnome ssl
29
USE_GNOME=	glib20
30
USE_GITHUB=	yes
31
GH_ACCOUNT=	meetecho
32
GH_PROJECT=	janus-gateway
33
USE_RC_SUBR=	janus
34
CONFIGURE_ARGS+=	--disable-mqtt \
35
	--disable-rabbitmq \
36
INSTALL_TARGET=install-strip
37
CFLAGS+=	-I${OPENSSLINC} -I${LOCALBASE}/include/nice
38
LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl -L${LOCALBASE} -lnice
39
GNU_CONFIGURE=	yes
40
USE_LDCONFIG=	yes
41
42
.include <bsd.port.mk>
(-)www/janus/distinfo (+3 lines)
Line 0 Link Here
1
TIMESTAMP = 1592326502
2
SHA256 (meetecho-janus-gateway-v0.10.1_GH0.tar.gz) = 731760e6911908bc523815809487e51320a738f3533f267d4beb83eaa725de85
3
SIZE (meetecho-janus-gateway-v0.10.1_GH0.tar.gz) = 6951415
(-)www/janus/files/janus.in (+28 lines)
Line 0 Link Here
1
#!/bin/sh
2
#
3
# $FreeBSD$
4
#
5
# PROVIDE: janus
6
# REQUIRE: NETWORKING syslogd
7
# BEFORE:  DAEMON
8
# KEYWORD: shutdown
9
10
# Add the following lines to /etc/rc.conf to enable janus:
11
# janus_enable="YES"
12
# janus_flags="<set as needed>"
13
14
. /etc/rc.subr
15
16
name=janus
17
rcvar=janus_enable
18
19
: ${janus_enable="NO"}
20
: ${janus_config_dir="%%PREFIX%%/etc/${name}"}
21
: ${janus_conf="${janus_config_dir}/$name.jcfg"}
22
23
required_files="${janus_conf}"
24
command="%%PREFIX%%/bin/janus"
25
command_args="-D -o -F ${janus_config_dir} -C ${janus_conf} -b -L /var/log/janus.log"
26
27
load_rc_config $name
28
run_rc_command "$1"
(-)www/janus/files/patch-configure.ac (+13 lines)
Line 0 Link Here
1
--- configure.ac.orig	2020-06-01 08:39:34 UTC
2
+++ configure.ac
3
@@ -341,10 +341,7 @@ PKG_CHECK_MODULES([JANUS],
4
                     glib-2.0 >= $glib_version
5
                     gio-2.0 >= $glib_version
6
                     libconfig
7
-                    nice
8
                     jansson >= $jansson_version
9
-                    libssl >= $ssl_version
10
-                    libcrypto
11
                     zlib
12
                   ])
13
 JANUS_MANUAL_LIBS="${JANUS_MANUAL_LIBS} -lm"
(-)www/janus/files/patch-janus.c (+10 lines)
Line 0 Link Here
1
--- janus.c.orig	2020-06-15 14:02:09 UTC
2
+++ janus.c
3
@@ -5154,6 +5154,7 @@ gint main(int argc, char *argv[])
4
 		if (!transport) {
5
 			JANUS_LOG(LOG_ERR, "\tCouldn't load transport plugin '%s': %s\n", transportent->d_name, dlerror());
6
 		} else {
7
+			dlerror();
8
 			create_t *create = (create_t*) dlsym(transport, "create");
9
 			const char *dlsym_error = dlerror();
10
 			if (dlsym_error) {
(-)www/janus/files/patch-plugins_janus__audiobridge.c (+11 lines)
Line 0 Link Here
1
--- plugins/janus_audiobridge.c.orig	2020-06-10 14:19:17 UTC
2
+++ plugins/janus_audiobridge.c
3
@@ -802,6 +802,8 @@ room-<unique room ID>: {
4
  */
5
 
6
 #include "plugin.h"
7
+#include <sys/socket.h>
8
+#include <netinet/in.h>
9
 
10
 #include <jansson.h>
11
 #include <opus/opus.h>
(-)www/janus/files/patch-rtcp.h (+11 lines)
Line 0 Link Here
1
--- rtcp.h.orig	2017-03-08 10:25:35 UTC
2
+++ rtcp.h
3
@@ -20,7 +20,7 @@
4
 #ifdef __MACH__
5
 #include <machine/endian.h>
6
 #else
7
-#include <endian.h>
8
+#include <sys/endian.h>
9
 #endif
10
 #include <inttypes.h>
11
 #include <string.h>
(-)www/janus/files/patch-rtp.h (+11 lines)
Line 0 Link Here
1
--- rtp.h.orig	2020-06-15 20:40:17 UTC
2
+++ rtp.h
3
@@ -14,7 +14,7 @@
4
 #define JANUS_RTP_H
5
 
6
 #include <arpa/inet.h>
7
-#ifdef __MACH__
8
+#if defined (__MACH__) || defined(__FreeBSD__)
9
 #include <machine/endian.h>
10
 #define __BYTE_ORDER BYTE_ORDER
11
 #define __BIG_ENDIAN BIG_ENDIAN
(-)www/janus/files/patch-text2pcap.c (+16 lines)
Line 0 Link Here
1
--- text2pcap.c.orig	2020-06-15 14:02:09 UTC
2
+++ text2pcap.c
3
@@ -41,8 +41,11 @@
4
 #define __BYTE_ORDER BYTE_ORDER
5
 #define __BIG_ENDIAN BIG_ENDIAN
6
 #define __LITTLE_ENDIAN LITTLE_ENDIAN
7
-#else
8
-#include <endian.h>
9
+#elif defined(__FreeBSD__)
10
+#include <sys/endian.h>
11
+#define __BYTE_ORDER BYTE_ORDER
12
+#define __BIG_ENDIAN BIG_ENDIAN
13
+#define __LITTLE_ENDIAN LITTLE_ENDIAN
14
 #endif
15
 
16
 #include "text2pcap.h"
(-)www/janus/files/patch-transports_janus__websockets.c (+48 lines)
Line 0 Link Here
1
--- transports/janus_websockets.c.orig	2020-06-01 08:39:34 UTC
2
+++ transports/janus_websockets.c
3
@@ -274,7 +274,7 @@ static const char *janus_websockets_reason_string(enum
4
 #if (LWS_LIBRARY_VERSION_MAJOR >= 4)
5
 static lws_retry_bo_t pingpong = { 0 };
6
 #endif
7
-
8
+struct in_addr addr;
9
 /* Helper method to return the interface associated with a local IP address */
10
 static char *janus_websockets_get_interface_name(const char *ip) {
11
 	struct ifaddrs *addrs = NULL, *iap = NULL;
12
@@ -553,13 +553,6 @@ int janus_websockets_init(janus_transport_callbacks *c
13
 		/* Force single-thread server */
14
 		wscinfo.count_threads = 1;
15
 
16
-		/* Create the base context */
17
-		wsc = lws_create_context(&wscinfo);
18
-		if(wsc == NULL) {
19
-			JANUS_LOG(LOG_ERR, "Error creating libwebsockets context...\n");
20
-			janus_config_destroy(config);
21
-			return -1;	/* No point in keeping the plugin loaded */
22
-		}
23
 
24
 		/* Setup the Janus API WebSockets server(s) */
25
 		item = janus_config_get(config, config_general, janus_config_type_item, "ws");
26
@@ -580,12 +573,22 @@ int janus_websockets_init(janus_transport_callbacks *c
27
 			item = janus_config_get(config, config_general, janus_config_type_item, "ws_ip");
28
 			if(item && item->value) {
29
 				ip = (char *)item->value;
30
+				if(inet_net_pton(AF_INET, ip, &addr, sizeof(addr))>0) {	
31
+				wscinfo.options |= LWS_SERVER_OPTION_DISABLE_IPV6;			
32
+				}
33
 				char *iface = janus_websockets_get_interface_name(ip);
34
 				if(iface == NULL) {
35
 					JANUS_LOG(LOG_WARN, "No interface associated with %s? Falling back to no interface...\n", ip);
36
 				}
37
 				ip = iface;
38
 			}
39
+		/* Create the base context */
40
+		wsc = lws_create_context(&wscinfo);
41
+		if(wsc == NULL) {
42
+			JANUS_LOG(LOG_ERR, "Error creating libwebsockets context...\n");
43
+			janus_config_destroy(config);
44
+			return -1;	/* No point in keeping the plugin loaded */
45
+		}
46
 			/* Prepare context */
47
 			struct lws_context_creation_info info;
48
 			memset(&info, 0, sizeof info);
(-)www/janus/pkg-descr (+4 lines)
Line 0 Link Here
1
Janus is an open source, general purpose, WebRTC gateway designed and
2
developed by Meetecho
3
4
WWW: https://github.com/meetecho/janus-gateway
(-)www/janus/pkg-plist (+143 lines)
Line 0 Link Here
1
bin/janus
2
bin/janus-cfgconv
3
@sample %%ETCDIR%%/janus.eventhandler.gelfevh.jcfg.sample
4
@sample %%ETCDIR%%/janus.eventhandler.sampleevh.jcfg.sample
5
@sample %%ETCDIR%%/janus.eventhandler.wsevh.jcfg.sample
6
@sample %%ETCDIR%%/janus.jcfg.sample
7
@sample %%ETCDIR%%/janus.plugin.audiobridge.jcfg.sample
8
@sample %%ETCDIR%%/janus.plugin.echotest.jcfg.sample
9
@sample %%ETCDIR%%/janus.plugin.nosip.jcfg.sample
10
@sample %%ETCDIR%%/janus.plugin.recordplay.jcfg.sample
11
@sample %%ETCDIR%%/janus.plugin.sip.jcfg.sample
12
@sample %%ETCDIR%%/janus.plugin.streaming.jcfg.sample
13
@sample %%ETCDIR%%/janus.plugin.textroom.jcfg.sample
14
@sample %%ETCDIR%%/janus.plugin.videocall.jcfg.sample
15
@sample %%ETCDIR%%/janus.plugin.videoroom.jcfg.sample
16
@sample %%ETCDIR%%/janus.plugin.voicemail.jcfg.sample
17
@sample %%ETCDIR%%/janus.transport.http.jcfg.sample
18
@sample %%ETCDIR%%/janus.transport.pfunix.jcfg.sample
19
@sample %%ETCDIR%%/janus.transport.websockets.jcfg.sample
20
include/janus/apierror.h
21
include/janus/config.h
22
include/janus/debug.h
23
include/janus/events/eventhandler.h
24
include/janus/ip-utils.h
25
include/janus/log.h
26
include/janus/loggers/logger.h
27
include/janus/mutex.h
28
include/janus/plugins/plugin.h
29
include/janus/record.h
30
include/janus/refcount.h
31
include/janus/rtcp.h
32
include/janus/rtp.h
33
include/janus/rtpsrtp.h
34
include/janus/sdp-utils.h
35
include/janus/text2pcap.h
36
include/janus/transports/transport.h
37
include/janus/utils.h
38
lib/janus/events/libjanus_gelfevh.so
39
lib/janus/events/libjanus_gelfevh.so.0
40
lib/janus/events/libjanus_gelfevh.so.0.0.0
41
lib/janus/events/libjanus_sampleevh.so
42
lib/janus/events/libjanus_sampleevh.so.0
43
lib/janus/events/libjanus_sampleevh.so.0.0.0
44
lib/janus/events/libjanus_wsevh.so
45
lib/janus/events/libjanus_wsevh.so.0
46
lib/janus/events/libjanus_wsevh.so.0.0.0
47
lib/janus/plugins/libjanus_audiobridge.so
48
lib/janus/plugins/libjanus_audiobridge.so.0
49
lib/janus/plugins/libjanus_audiobridge.so.0.0.0
50
lib/janus/plugins/libjanus_echotest.so
51
lib/janus/plugins/libjanus_echotest.so.0
52
lib/janus/plugins/libjanus_echotest.so.0.0.0
53
lib/janus/plugins/libjanus_nosip.so
54
lib/janus/plugins/libjanus_nosip.so.0
55
lib/janus/plugins/libjanus_nosip.so.0.0.0
56
lib/janus/plugins/libjanus_recordplay.so
57
lib/janus/plugins/libjanus_recordplay.so.0
58
lib/janus/plugins/libjanus_recordplay.so.0.0.0
59
lib/janus/plugins/libjanus_sip.so
60
lib/janus/plugins/libjanus_sip.so.0
61
lib/janus/plugins/libjanus_sip.so.0.0.0
62
lib/janus/plugins/libjanus_streaming.so
63
lib/janus/plugins/libjanus_streaming.so.0
64
lib/janus/plugins/libjanus_streaming.so.0.0.0
65
lib/janus/plugins/libjanus_textroom.so
66
lib/janus/plugins/libjanus_textroom.so.0
67
lib/janus/plugins/libjanus_textroom.so.0.0.0
68
lib/janus/plugins/libjanus_videocall.so
69
lib/janus/plugins/libjanus_videocall.so.0
70
lib/janus/plugins/libjanus_videocall.so.0.0.0
71
lib/janus/plugins/libjanus_videoroom.so
72
lib/janus/plugins/libjanus_videoroom.so.0
73
lib/janus/plugins/libjanus_videoroom.so.0.0.0
74
lib/janus/plugins/libjanus_voicemail.so
75
lib/janus/plugins/libjanus_voicemail.so.0
76
lib/janus/plugins/libjanus_voicemail.so.0.0.0
77
lib/janus/transports/libjanus_http.so
78
lib/janus/transports/libjanus_http.so.0
79
lib/janus/transports/libjanus_http.so.0.0.0
80
lib/janus/transports/libjanus_pfunix.so
81
lib/janus/transports/libjanus_pfunix.so.0
82
lib/janus/transports/libjanus_pfunix.so.0.0.0
83
lib/janus/transports/libjanus_websockets.so
84
lib/janus/transports/libjanus_websockets.so.0
85
lib/janus/transports/libjanus_websockets.so.0.0.0
86
man/man1/janus-cfgconv.1.gz
87
man/man1/janus.1.gz
88
share/doc/janus-gateway/README.md
89
%%DATADIR%%/demos/admin.html
90
%%DATADIR%%/demos/admin.js
91
%%DATADIR%%/demos/audiobridgetest.html
92
%%DATADIR%%/demos/audiobridgetest.js
93
%%DATADIR%%/demos/citeus.html
94
%%DATADIR%%/demos/css/demo.css
95
%%DATADIR%%/demos/demos.html
96
%%DATADIR%%/demos/devicetest.html
97
%%DATADIR%%/demos/devicetest.js
98
%%DATADIR%%/demos/docs/index.html
99
%%DATADIR%%/demos/echotest.html
100
%%DATADIR%%/demos/echotest.js
101
%%DATADIR%%/demos/favicon.ico
102
%%DATADIR%%/demos/footer.html
103
%%DATADIR%%/demos/index.html
104
%%DATADIR%%/demos/janus-logo.png
105
%%DATADIR%%/demos/janus.js
106
%%DATADIR%%/demos/meetecho-logo.png
107
%%DATADIR%%/demos/multiopus.html
108
%%DATADIR%%/demos/multiopus.js
109
%%DATADIR%%/demos/navbar.html
110
%%DATADIR%%/demos/nosiptest.html
111
%%DATADIR%%/demos/nosiptest.js
112
%%DATADIR%%/demos/recordplaytest.html
113
%%DATADIR%%/demos/recordplaytest.js
114
%%DATADIR%%/demos/screensharingtest.html
115
%%DATADIR%%/demos/screensharingtest.js
116
%%DATADIR%%/demos/siptest.html
117
%%DATADIR%%/demos/siptest.js
118
%%DATADIR%%/demos/streamingtest.html
119
%%DATADIR%%/demos/streamingtest.js
120
%%DATADIR%%/demos/support.html
121
%%DATADIR%%/demos/surround/ChID-BLITS-EBU.mp4
122
%%DATADIR%%/demos/surround/ChID-BLITS-EBU.txt
123
%%DATADIR%%/demos/textroomtest.html
124
%%DATADIR%%/demos/textroomtest.js
125
%%DATADIR%%/demos/up_arrow.png
126
%%DATADIR%%/demos/videocalltest.html
127
%%DATADIR%%/demos/videocalltest.js
128
%%DATADIR%%/demos/videoroomtest.html
129
%%DATADIR%%/demos/videoroomtest.js
130
%%DATADIR%%/demos/voicemailtest.html
131
%%DATADIR%%/demos/voicemailtest.js
132
%%DATADIR%%/demos/vp9svctest.html
133
%%DATADIR%%/demos/vp9svctest.js
134
%%DATADIR%%/javascript/janus.js
135
%%DATADIR%%/recordings/1234.nfo
136
%%DATADIR%%/recordings/rec-sample-audio.mjr
137
%%DATADIR%%/recordings/rec-sample-video.mjr
138
%%DATADIR%%/streams/music.mulaw
139
%%DATADIR%%/streams/radio.alaw
140
%%DATADIR%%/streams/test_gstreamer.sh
141
%%DATADIR%%/streams/test_gstreamer_1.sh
142
@dir %%DATADIR%%/duktape
143
@dir %%DATADIR%%/lua

Return to bug 219444