Hi! Here's an update to umurmur-0.2.13.
Something necessary, cause the one currently in our tree does not support Mumble protocol 1.2.4 nor the new Opus codec. ciao, David Index: Makefile =================================================================== RCS file: /cvs/ports/audio/umurmur/Makefile,v retrieving revision 1.8 diff -u -p -u -p -r1.8 Makefile --- Makefile 7 Aug 2013 21:31:18 -0000 1.8 +++ Makefile 1 Oct 2013 13:47:10 -0000 @@ -2,8 +2,7 @@ COMMENT = minimalistic Mumble server -DISTNAME = umurmur-0.2.10 -REVISION = 1 +DISTNAME = umurmur-0.2.13 CATEGORIES = audio HOMEPAGE = https://umurmur.googlecode.com/ Index: distinfo =================================================================== RCS file: /cvs/ports/audio/umurmur/distinfo,v retrieving revision 1.5 diff -u -p -u -p -r1.5 distinfo --- distinfo 12 Oct 2012 13:31:49 -0000 1.5 +++ distinfo 1 Oct 2013 13:47:10 -0000 @@ -1,2 +1,2 @@ -SHA256 (umurmur-0.2.10.tar.gz) = fk+WKgTypoO1+FVybAWcUE9rLuCf4pClokaNU7cEKTE= -SIZE (umurmur-0.2.10.tar.gz) = 161937 +SHA256 (umurmur-0.2.13.tar.gz) = rBWV+kfOa9HgcG3WCSk/dF1zpZrwCnoE3cD5riQ5l74= +SIZE (umurmur-0.2.13.tar.gz) = 167500 Index: patches/patch-src_client_c =================================================================== RCS file: /cvs/ports/audio/umurmur/patches/patch-src_client_c,v retrieving revision 1.4 diff -u -p -u -p -r1.4 patch-src_client_c --- patches/patch-src_client_c 12 Oct 2012 13:31:49 -0000 1.4 +++ patches/patch-src_client_c 1 Oct 2013 13:47:10 -0000 @@ -1,14 +1,6 @@ $OpenBSD: patch-src_client_c,v 1.4 2012/10/12 13:31:49 dcoppa Exp $ - -Fix unsafe client removal from list at timeout. -(upstream git commit ad3bc56f96b024ac31e8927f21d1f5e7b8f61b56) - -Reset timeout timer when receiving UDP data too: fix timeout when -using push-to-talk. Correct speling error. -(upstream git commit 6087b18a630eb32df682a7fd90d88408aa99c726) - ---- src/client.c.orig Sun Mar 18 20:26:26 2012 -+++ src/client.c Fri Oct 12 15:13:11 2012 +--- src/client.c.orig Sun Jun 9 20:56:17 2013 ++++ src/client.c Tue Oct 1 14:29:00 2013 @@ -28,6 +28,7 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. @@ -17,37 +9,16 @@ using push-to-talk. Correct speling erro #include <sys/poll.h> #include <sys/socket.h> #include <fcntl.h> -@@ -91,9 +92,9 @@ int Client_getfds(struct pollfd *pollfds) - - void Client_janitor() - { -- struct dlist *itr; -+ struct dlist *itr, *save; - int bwTop = maxBandwidth + maxBandwidth / 4; -- list_iterate(itr, &clients) { -+ list_iterate_safe(itr, save, &clients) { - client_t *c; - c = list_get_entry(itr, client_t, node); - Log_debug("Client %s BW available %d", c->username, c->availableBandwidth); -@@ -101,7 +102,7 @@ void Client_janitor() - if (c->availableBandwidth > bwTop) - c->availableBandwidth = bwTop; - -- if (Timer_isElapsed(&c->lastActivity, 1000000LL * INACTICITY_TIMEOUT)) { -+ if (Timer_isElapsed(&c->lastActivity, 1000000LL * INACTIVITY_TIMEOUT)) { - /* No activity from client - assume it is lost and close. */ - Log_info_client(c, "Timeout, closing."); - Client_free(c); -@@ -197,7 +198,7 @@ void Client_token_free(client_t *client) - void recheckCodecVersions() +@@ -201,7 +202,7 @@ void Client_token_free(client_t *client) + void recheckCodecVersions(client_t *connectingClient) { client_t *client_itr = NULL; - int max = 0, version, current_version; + int max = 0, version = 0, current_version = 0; + int users = 0, opus = 0; message_t *sendmsg; struct dlist codec_list, *itr, *save; - codec_t *codec_itr, *cd; -@@ -574,6 +575,7 @@ int Client_send_message_ver(client_t *client, message_ +@@ -613,6 +614,7 @@ int Client_send_message_ver(client_t *client, message_ return Client_send_message(client, msg); else Msg_free(msg); @@ -55,11 +26,12 @@ using push-to-talk. Correct speling erro } int Client_send_message(client_t *client, message_t *msg) -@@ -817,6 +819,7 @@ int Client_voiceMsg(client_t *client, uint8_t *data, i - client->availableBandwidth -= packetsize; - - Timer_restart(&client->idleTime); -+ Timer_restart(&client->lastActivity); - - counter = Pds_get_numval(pdi); /* step past session id */ - do { +@@ -680,7 +682,7 @@ void Client_textmessage(client_t *client, char *text) + sendmsg->payload.textMessage->message = message; + sendmsg->payload.textMessage->n_tree_id = 1; + sendmsg->payload.textMessage->tree_id = tree_id; +- strcpy(message, text); ++ strlcpy(message, text, strlen(text) + 1); + Client_send_message(client, sendmsg); + } + Index: patches/patch-src_client_h =================================================================== RCS file: patches/patch-src_client_h diff -N patches/patch-src_client_h --- patches/patch-src_client_h 12 Oct 2012 13:31:49 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,16 +0,0 @@ -$OpenBSD: patch-src_client_h,v 1.1 2012/10/12 13:31:49 dcoppa Exp $ - -Correct speling error. -(upstream git commit 6087b18a630eb32df682a7fd90d88408aa99c726) - ---- src/client.h.orig Fri Oct 12 15:15:18 2012 -+++ src/client.h Fri Oct 12 15:15:39 2012 -@@ -51,7 +51,7 @@ - - #define BUFSIZE 8192 - #define UDP_BUFSIZE 512 --#define INACTICITY_TIMEOUT 15 /* Seconds */ -+#define INACTIVITY_TIMEOUT 15 /* Seconds */ - #define MAX_CODECS 10 - #define MAX_TOKENSIZE 64 - #define MAX_TOKENS 32 Index: patches/patch-src_conf_c =================================================================== RCS file: /cvs/ports/audio/umurmur/patches/patch-src_conf_c,v retrieving revision 1.4 diff -u -p -u -p -r1.4 patch-src_conf_c --- patches/patch-src_conf_c 12 Apr 2012 10:03:19 -0000 1.4 +++ patches/patch-src_conf_c 1 Oct 2013 13:47:10 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-src_conf_c,v 1.4 2012/04/12 10:03:19 dcoppa Exp $ ---- src/conf.c.orig Sun Mar 18 20:26:26 2012 -+++ src/conf.c Thu Apr 12 11:36:49 2012 -@@ -88,23 +88,23 @@ const char *getStrConf(param_t param) +--- src/conf.c.orig Sun Jun 9 20:56:17 2013 ++++ src/conf.c Tue Oct 1 14:15:41 2013 +@@ -89,23 +89,23 @@ const char *getStrConf(param_t param) case CERTIFICATE: setting = config_lookup(&configuration, "certificate"); if (!setting) Index: patches/patch-src_messagehandler_c =================================================================== RCS file: /cvs/ports/audio/umurmur/patches/patch-src_messagehandler_c,v retrieving revision 1.3 diff -u -p -u -p -r1.3 patch-src_messagehandler_c --- patches/patch-src_messagehandler_c 12 Apr 2012 10:03:19 -0000 1.3 +++ patches/patch-src_messagehandler_c 1 Oct 2013 13:47:10 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-src_messagehandler_c,v 1.3 2012/04/12 10:03:19 dcoppa Exp $ ---- src/messagehandler.c.orig Sun Mar 18 20:26:26 2012 -+++ src/messagehandler.c Thu Apr 12 11:36:49 2012 -@@ -478,9 +478,9 @@ void Mh_handle_message(client_t *client, message_t *ms +--- src/messagehandler.c.orig Sun Jun 9 20:56:17 2013 ++++ src/messagehandler.c Tue Oct 1 14:15:41 2013 +@@ -492,9 +492,9 @@ void Mh_handle_message(client_t *client, message_t *ms sendmsg->payload.textMessage->n_tree_id = 1; sendmsg->payload.textMessage->tree_id = tree_id; if (client->recording) Index: patches/patch-src_ssl_c =================================================================== RCS file: patches/patch-src_ssl_c diff -N patches/patch-src_ssl_c --- patches/patch-src_ssl_c 12 Oct 2012 13:31:49 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,46 +0,0 @@ -$OpenBSD: patch-src_ssl_c,v 1.1 2012/10/12 13:31:49 dcoppa Exp $ - -Fix handling of long cipherstrings/lists with OpenSSL. -(upstream git commit 35d4608d0e044df48ee8cea13d3cbeafbb33535d) - ---- src/ssl.c.orig Fri Oct 12 15:17:40 2012 -+++ src/ssl.c Fri Oct 12 15:18:27 2012 -@@ -508,10 +508,10 @@ void SSLi_init(void) - { - const SSL_METHOD *method; - SSL *ssl; -- int i, offset = 0; -+ int i, offset = 0, cipherstringlen = 0; - STACK_OF(SSL_CIPHER) *cipherlist = NULL, *cipherlist_new = NULL; - SSL_CIPHER *cipher; -- char cipherstring[1024]; -+ char *cipherstring, tempstring[128]; - - SSL_library_init(); - OpenSSL_add_all_algorithms(); /* load & register all cryptos, etc. */ -@@ -546,9 +546,14 @@ void SSLi_init(void) - if (cipherlist_new) { - for ( i = 0; (cipher = sk_SSL_CIPHER_value(cipherlist_new, i)) != NULL; i++) { - Log_debug("%s", SSL_CIPHER_get_name(cipher)); -- offset += snprintf(cipherstring + offset, 1024 - offset, "%s:", SSL_CIPHER_get_name(cipher)); -+ cipherstringlen += strlen(SSL_CIPHER_get_name(cipher)) + 1; - } -- cipherstring[offset - 1] = '\0'; -+ cipherstring = malloc(cipherstringlen + 1); -+ if (cipherstring == NULL) -+ Log_fatal("Out of memory"); -+ for (i = 0; (cipher = sk_SSL_CIPHER_value(cipherlist_new, i)) != NULL; i++) { -+ offset += sprintf(cipherstring + offset, "%s:", SSL_CIPHER_get_name(cipher)); -+ } - } - - if (cipherlist_new) -@@ -559,6 +564,8 @@ void SSLi_init(void) - - if (SSL_CTX_set_cipher_list(context, cipherstring) == 0) - Log_fatal("Failed to set cipher list!"); -+ -+ free(cipherstring); - - SSL_CTX_set_verify(context, SSL_VERIFY_PEER|SSL_VERIFY_CLIENT_ONCE, - verify_callback); Index: patches/patch-umurmur_conf_example =================================================================== RCS file: /cvs/ports/audio/umurmur/patches/patch-umurmur_conf_example,v retrieving revision 1.3 diff -u -p -u -p -r1.3 patch-umurmur_conf_example --- patches/patch-umurmur_conf_example 12 Apr 2012 10:03:19 -0000 1.3 +++ patches/patch-umurmur_conf_example 1 Oct 2013 13:47:10 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-umurmur_conf_example,v 1.3 2012/04/12 10:03:19 dcoppa Exp $ ---- umurmur.conf.example.orig Sun Mar 18 20:26:26 2012 -+++ umurmur.conf.example Thu Apr 12 11:36:49 2012 +--- umurmur.conf.example.orig Sun Jun 9 20:56:17 2013 ++++ umurmur.conf.example Tue Oct 1 14:15:41 2013 @@ -1,7 +1,7 @@ max_bandwidth = 48000; welcometext = "Welcome to uMurmur!"; @@ -11,7 +11,7 @@ $OpenBSD: patch-umurmur_conf_example,v 1 password = ""; # admin_password = "test"; # Set to enable admin functionality. # ban_length = 0; # Length in seconds for a ban. Default is 0. 0 = forever. -@@ -16,9 +16,9 @@ max_users = 10; +@@ -17,9 +17,9 @@ max_users = 10; # username and groupname for privilege dropping. # Will attempt to switch user if set.
