Update to umurmur-0.2.8

From maintainer Jonathon Sisson, with tweaks by me
This commit is contained in:
dcoppa 2011-10-30 16:05:35 +00:00
parent ad23739c9b
commit d3e40e14e0
10 changed files with 44 additions and 43 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.2 2011/07/08 09:09:43 dcoppa Exp $
# $OpenBSD: Makefile,v 1.3 2011/10/30 16:05:35 dcoppa Exp $
COMMENT = minimalistic Mumble server
DISTNAME = umurmur-0.2.7
DISTNAME = umurmur-0.2.8
CATEGORIES = audio
@ -23,8 +23,7 @@ WANTLIB = c config crypto protobuf-c ssl
LIB_DEPENDS = devel/libconfig \
devel/protobuf-c
CONFIGURE_STYLE = autoconf
AUTOCONF_VERSION = 2.63
CONFIGURE_STYLE = gnu
CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS = --with-ssl=openssl

View File

@ -1,5 +1,5 @@
MD5 (umurmur-0.2.7.tar.gz) = lH0mVz3Pom0nTLL3xWtqFw==
RMD160 (umurmur-0.2.7.tar.gz) = wGxsb/lMvKXB299+qzAYPkduPXQ=
SHA1 (umurmur-0.2.7.tar.gz) = 9gL1JXpSyppoEqvF7guqR9XKTDc=
SHA256 (umurmur-0.2.7.tar.gz) = TQ7gjZHSePnuGtknXG3WvrOqQZTwd/X/oQU9/9TMJ10=
SIZE (umurmur-0.2.7.tar.gz) = 157348
MD5 (umurmur-0.2.8.tar.gz) = Z63Khh3NRpWAZggeV7Fd5Q==
RMD160 (umurmur-0.2.8.tar.gz) = p/XwAt73ArKCAGflGobjU4a7mJU=
SHA1 (umurmur-0.2.8.tar.gz) = Tkl2Y9BhLvsbYfYWY6jUwn6Qd38=
SHA256 (umurmur-0.2.8.tar.gz) = YsQ9ovBxJZd8+AJKB3XtaXEBgWw/qPNjRXgJAarwhzY=
SIZE (umurmur-0.2.8.tar.gz) = 155357

View File

@ -22,8 +22,7 @@
umurmurd - minimalistic Mumble server
.SH "SYNOPSIS"
.HP \w'\fBumurmurd\fR\ 'u
\fBumurmurd\fR [\fI-dh\fR] [\fI-p <pidfile>\fR] [\fI-c <conf file>\fR]
[\fI-a <address>\fR] [\fI-b <port>\fR]
\fBumurmurd\fR [\fI-dh\fR] [\fI-p <pidfile>\fR] [\fI-t\fR] [\fI-c <conf file>\fR] [\fI-a <address>\fR] [\fI-b <port>\fR]
.SH "DESCRIPTION"
.\" umurmurd: description of
.PP
@ -46,6 +45,7 @@ Highlights:
\-d \- Do not daemonize
\-p <pidfile> \- Write PID to this file
\-c <conf file> \- Specify configuration file
\-t \- Test configuration
\-a <address> \- Bind to IP address
\-b <port> \- Bind to port
\-h \- Print help summary

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-configure_ac,v 1.1 2011/07/08 09:09:43 dcoppa Exp $
--- configure.ac.orig Thu Jul 7 13:34:33 2011
+++ configure.ac Thu Jul 7 13:35:14 2011
@@ -58,7 +58,7 @@ AS_IF([test "x$with_ssl" == xopenssl], [
# Checks for header files.
AC_FUNC_ALLOCA
-AC_CHECK_HEADERS([arpa/inet.h fcntl.h inttypes.h limits.h malloc.h netinet/in.h stddef.h stdint.h stdlib.h string.h sys/socket.h sys/time.h syslog.h unistd.h], [], [AC_MSG_ERROR([missing a required header])])
+AC_CHECK_HEADERS([arpa/inet.h fcntl.h inttypes.h limits.h netinet/in.h stddef.h stdint.h stdlib.h string.h sys/socket.h sys/time.h syslog.h unistd.h], [], [AC_MSG_ERROR([missing a required header])])
# Checks for typedefs, structures, and compiler characteristics.
AC_HEADER_STDBOOL

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_channel_c,v 1.1.1.1 2011/04/03 12:04:47 dcoppa Exp $
--- src/channel.c.orig Wed Mar 30 09:47:47 2011
+++ src/channel.c Wed Mar 30 09:48:49 2011
@@ -187,7 +187,7 @@ void Chan_init()
$OpenBSD: patch-src_channel_c,v 1.2 2011/10/30 16:05:35 dcoppa Exp $
--- src/channel.c.orig Tue Oct 11 12:44:58 2011
+++ src/channel.c Sun Oct 30 16:33:19 2011
@@ -192,7 +192,7 @@ void Chan_init()
/* Channel links */
for (i = 0; ; i++) {

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_client_c,v 1.1.1.1 2011/04/03 12:04:47 dcoppa Exp $
--- src/client.c.orig Sat Dec 18 15:31:01 2010
+++ src/client.c Wed Mar 30 09:44:03 2011
$OpenBSD: patch-src_client_c,v 1.2 2011/10/30 16:05:35 dcoppa Exp $
--- src/client.c.orig Tue Oct 11 12:44:58 2011
+++ src/client.c Sun Oct 30 16:33:19 2011
@@ -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.
@ -9,7 +9,7 @@ $OpenBSD: patch-src_client_c,v 1.1.1.1 2011/04/03 12:04:47 dcoppa Exp $
#include <sys/poll.h>
#include <sys/socket.h>
#include <fcntl.h>
@@ -149,7 +150,7 @@ codec_t *Client_codec_iterate(client_t *client, codec_
@@ -195,7 +196,7 @@ void Client_token_free(client_t *client)
void recheckCodecVersions()
{
client_t *client_itr = NULL;
@ -18,7 +18,7 @@ $OpenBSD: patch-src_client_c,v 1.1.1.1 2011/04/03 12:04:47 dcoppa Exp $
message_t *sendmsg;
struct dlist codec_list, *itr, *save;
codec_t *codec_itr, *cd;
@@ -512,6 +513,7 @@ int Client_send_message_ver(client_t *client, message_
@@ -560,6 +561,7 @@ int Client_send_message_ver(client_t *client, message_
return Client_send_message(client, msg);
else
Msg_free(msg);

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_conf_c,v 1.2 2011/07/08 09:09:43 dcoppa Exp $
--- src/conf.c.orig Mon Apr 18 20:19:33 2011
+++ src/conf.c Thu Jul 7 13:24:25 2011
@@ -72,23 +72,23 @@ const char *getStrConf(param_t param)
$OpenBSD: patch-src_conf_c,v 1.3 2011/10/30 16:05:35 dcoppa Exp $
--- src/conf.c.orig Tue Oct 11 12:44:58 2011
+++ src/conf.c Sun Oct 30 16:33:19 2011
@@ -87,23 +87,23 @@ const char *getStrConf(param_t param)
case CERTIFICATE:
setting = config_lookup(&configuration, "certificate");
if (!setting)

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-src_main_c,v 1.1 2011/10/30 16:05:35 dcoppa Exp $
--- src/main.c.orig Sun Oct 30 16:38:20 2011
+++ src/main.c Sun Oct 30 16:39:18 2011
@@ -235,8 +235,9 @@ int main(int argc, char **argv)
{
bool_t nodaemon = false;
#ifdef _POSIX_PRIORITY_SCHEDULING
- bool_t realtime = false, testconfig = false;
+ bool_t realtime = false;
#endif
+ bool_t testconfig = false;
char *conffile = NULL, *pidfile = NULL;
int c;
struct utsname utsbuf;

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_messagehandler_c,v 1.1.1.1 2011/04/03 12:04:47 dcoppa Exp $
--- src/messagehandler.c.orig Wed Mar 30 09:17:41 2011
+++ src/messagehandler.c Wed Mar 30 09:20:51 2011
@@ -396,9 +396,9 @@ void Mh_handle_message(client_t *client, message_t *ms
$OpenBSD: patch-src_messagehandler_c,v 1.2 2011/10/30 16:05:35 dcoppa Exp $
--- src/messagehandler.c.orig Tue Oct 11 12:44:58 2011
+++ src/messagehandler.c Sun Oct 30 16:33:19 2011
@@ -425,9 +425,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)

View File

@ -1,14 +1,14 @@
@comment $OpenBSD: PLIST,v 1.2 2011/07/08 09:09:43 dcoppa Exp $
@comment $OpenBSD: PLIST,v 1.3 2011/10/30 16:05:35 dcoppa Exp $
@newgroup _umurmur:671
@newuser _umurmur:671:_umurmur:daemon:uMurmur Account:/nonexistent:/sbin/nologin
@bin bin/umurmurd
@man man/man1/umurmurd.1
@man man/man1/umurmur.conf.1
@man man/man1/umurmurd.1
share/examples/umurmur/
share/examples/umurmur/umurmur.conf
@mode 770
@owner _umurmur
@group _umurmur
@mode 770
@sample ${SYSCONFDIR}/umurmur/
@mode 660
@sample ${SYSCONFDIR}/umurmur/umurmur.conf