cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to libnice-0.1.6.

Browse Source
This commit is contained in:
ajacoutot 2014-04-29 13:10:26 +00:00
parent ba1b302d96
commit ef1f2a84d9
11 changed files with 12 additions and 528 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/libnice/Makefile
View File

@ -1,12 +1,12 @@
# $OpenBSD: Makefile,v 1.26 2014/04/01 14:52:10 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.27 2014/04/29 13:10:26 ajacoutot Exp $
SHARED_ONLY = Yes
COMMENT = GLib ICE implementation
DISTNAME = libnice-0.1.5
REVISION = 1
SHARED_LIBS += nice 2.2 # 13.0
DISTNAME = libnice-0.1.6
SHARED_LIBS += nice 2.2 # 14.0
CATEGORIES = net

4
net/libnice/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (libnice-0.1.5.tar.gz) = CidDtpyPULjKhSQ6voG42ISyEEMPQTypS1W8/2L98Jc=
SIZE (libnice-0.1.5.tar.gz) = 819737
SHA256 (libnice-0.1.6.tar.gz) = 3jjjcJz12wnFjLmAGSQwPwioshHHFO0JYrgTI8yb2Sw=
SIZE (libnice-0.1.6.tar.gz) = 829225

210
net/libnice/patches/patch-agent_agent_c
View File

@ -1,210 +0,0 @@
$OpenBSD: patch-agent_agent_c,v 1.2 2014/03/12 07:53:00 jasper Exp $
https://bugs.freedesktop.org/show_bug.cgi?id=76059
warning: declaration of 'dup' shadows a global declaration
warning: declaration of 'socket' shadows a global declaration
--- agent/agent.c.orig Fri Mar 7 03:14:00 2014
+++ agent/agent.c Tue Mar 11 21:21:07 2014
@@ -1383,7 +1383,7 @@ pseudo_tcp_socket_closed (PseudoTcpSocket *sock, guint
static PseudoTcpWriteResult
-pseudo_tcp_socket_write_packet (PseudoTcpSocket *socket,
+pseudo_tcp_socket_write_packet (PseudoTcpSocket *psock,
const gchar *buffer, guint32 len, gpointer user_data)
{
Component *component = user_data;
@@ -1718,7 +1718,7 @@ agent_candidate_pair_priority (NiceAgent *agent, NiceC
static void
priv_add_new_candidate_discovery_stun (NiceAgent *agent,
- NiceSocket *socket, NiceAddress server,
+ NiceSocket *sock, NiceAddress server,
Stream *stream, guint component_id)
{
CandidateDiscovery *cdisco;
@@ -1729,7 +1729,7 @@ priv_add_new_candidate_discovery_stun (NiceAgent *agen
cdisco = g_slice_new0 (CandidateDiscovery);
cdisco->type = NICE_CANDIDATE_TYPE_SERVER_REFLEXIVE;
- cdisco->nicesock = socket;
+ cdisco->nicesock = sock;
cdisco->server = server;
cdisco->stream = stream;
cdisco->component = stream_find_component_by_id (stream, component_id);
@@ -1749,7 +1749,7 @@ priv_add_new_candidate_discovery_stun (NiceAgent *agen
static void
priv_add_new_candidate_discovery_turn (NiceAgent *agent,
- NiceSocket *socket, TurnServer *turn,
+ NiceSocket *sock, TurnServer *turn,
Stream *stream, guint component_id)
{
CandidateDiscovery *cdisco;
@@ -1763,7 +1763,7 @@ priv_add_new_candidate_discovery_turn (NiceAgent *agen
if (turn->type == NICE_RELAY_TYPE_TURN_UDP) {
if (agent->compatibility == NICE_COMPATIBILITY_GOOGLE) {
- NiceAddress addr = socket->addr;
+ NiceAddress addr = sock->addr;
NiceSocket *new_socket;
nice_address_set_port (&addr, 0);
@@ -1771,51 +1771,51 @@ priv_add_new_candidate_discovery_turn (NiceAgent *agen
if (new_socket) {
_priv_set_socket_tos (agent, new_socket, stream->tos);
component_attach_socket (component, new_socket);
- socket = new_socket;
+ sock = new_socket;
}
}
- cdisco->nicesock = socket;
+ cdisco->nicesock = sock;
} else {
NiceAddress proxy_server;
- socket = NULL;
+ sock = NULL;
if (agent->proxy_type != NICE_PROXY_TYPE_NONE &&
agent->proxy_ip != NULL &&
nice_address_set_from_string (&proxy_server, agent->proxy_ip)) {
nice_address_set_port (&proxy_server, agent->proxy_port);
- socket = nice_tcp_bsd_socket_new (agent->main_context, &proxy_server);
+ sock = nice_tcp_bsd_socket_new (agent->main_context, &proxy_server);
- if (socket) {
- _priv_set_socket_tos (agent, socket, stream->tos);
+ if (sock) {
+ _priv_set_socket_tos (agent, sock, stream->tos);
if (agent->proxy_type == NICE_PROXY_TYPE_SOCKS5) {
- socket = nice_socks5_socket_new (socket, &turn->server,
+ sock = nice_socks5_socket_new (sock, &turn->server,
agent->proxy_username, agent->proxy_password);
} else if (agent->proxy_type == NICE_PROXY_TYPE_HTTP){
- socket = nice_http_socket_new (socket, &turn->server,
+ sock = nice_http_socket_new (sock, &turn->server,
agent->proxy_username, agent->proxy_password);
} else {
- nice_socket_free (socket);
- socket = NULL;
+ nice_socket_free (sock);
+ sock = NULL;
}
}
}
- if (socket == NULL) {
- socket = nice_tcp_bsd_socket_new (agent->main_context, &turn->server);
+ if (sock == NULL) {
+ sock = nice_tcp_bsd_socket_new (agent->main_context, &turn->server);
- if (socket)
- _priv_set_socket_tos (agent, socket, stream->tos);
+ if (sock)
+ _priv_set_socket_tos (agent, sock, stream->tos);
}
/* The TURN server may be invalid or not listening */
- if (socket == NULL)
+ if (sock == NULL)
return;
if (turn->type == NICE_RELAY_TYPE_TURN_TLS &&
agent->compatibility == NICE_COMPATIBILITY_GOOGLE) {
- socket = nice_pseudossl_socket_new (socket);
+ sock = nice_pseudossl_socket_new (sock);
}
- cdisco->nicesock = nice_tcp_turn_socket_new (socket,
+ cdisco->nicesock = nice_tcp_turn_socket_new (sock,
agent_to_turn_socket_compatibility (agent));
component_attach_socket (component, cdisco->nicesock);
@@ -2154,9 +2154,9 @@ nice_agent_gather_candidates (
} else {
for (i = agent->local_addresses; i; i = i->next) {
NiceAddress *addr = i->data;
- NiceAddress *dup = nice_address_dup (addr);
+ NiceAddress *dupaddr = nice_address_dup (addr);
- local_addresses = g_slist_append (local_addresses, dup);
+ local_addresses = g_slist_append (local_addresses, dupaddr);
}
}
@@ -2403,13 +2403,13 @@ nice_agent_set_port_range (NiceAgent *agent, guint str
NICEAPI_EXPORT gboolean
nice_agent_add_local_address (NiceAgent *agent, NiceAddress *addr)
{
- NiceAddress *dup;
+ NiceAddress *dupaddr;
agent_lock();
- dup = nice_address_dup (addr);
- nice_address_set_port (dup, 0);
- agent->local_addresses = g_slist_append (agent->local_addresses, dup);
+ dupaddr = nice_address_dup (addr);
+ nice_address_set_port (dupaddr, 0);
+ agent->local_addresses = g_slist_append (agent->local_addresses, dupaddr);
agent_unlock_and_emit (agent);
return TRUE;
@@ -2689,7 +2689,7 @@ agent_recv_message_unlocked (
NiceAgent *agent,
Stream *stream,
Component *component,
- NiceSocket *socket,
+ NiceSocket *sock,
NiceInputMessage *message)
{
NiceAddress from;
@@ -2701,10 +2701,10 @@ agent_recv_message_unlocked (
message->from = &from;
}
- retval = nice_socket_recv_messages (socket, message, 1);
+ retval = nice_socket_recv_messages (sock, message, 1);
nice_debug ("%s: Received %d valid messages of length %" G_GSIZE_FORMAT
- " from base socket %p.", G_STRFUNC, retval, message->length, socket);
+ " from base socket %p.", G_STRFUNC, retval, message->length, sock);
if (retval == 0) {
retval = RECV_WOULD_BLOCK; /* EWOULDBLOCK */
@@ -2721,7 +2721,7 @@ agent_recv_message_unlocked (
gchar tmpbuf[INET6_ADDRSTRLEN];
nice_address_to_string (message->from, tmpbuf);
nice_debug ("Agent %p : Packet received on local socket %d from [%s]:%u (%" G_GSSIZE_FORMAT " octets).", agent,
- g_socket_get_fd (socket->fileno), tmpbuf,
+ g_socket_get_fd (sock->fileno), tmpbuf,
nice_address_get_port (message->from), message->length);
}
@@ -2741,7 +2741,7 @@ agent_recv_message_unlocked (
if (cand->type == NICE_CANDIDATE_TYPE_RELAYED &&
cand->stream_id == stream->id &&
cand->component_id == component->id) {
- nice_turn_socket_parse_recv_message (cand->sockptr, &socket, message);
+ nice_turn_socket_parse_recv_message (cand->sockptr, &sock, message);
}
}
}
@@ -2765,7 +2765,7 @@ agent_recv_message_unlocked (
if (stun_message_validate_buffer_length (big_buf, big_buf_len,
(agent->compatibility != NICE_COMPATIBILITY_OC2007 &&
agent->compatibility != NICE_COMPATIBILITY_OC2007R2)) == (gint) big_buf_len &&
- conn_check_handle_inbound_stun (agent, stream, component, socket,
+ conn_check_handle_inbound_stun (agent, stream, component, sock,
message->from, (gchar *) big_buf, big_buf_len)) {
/* Handled STUN message. */
nice_debug ("%s: Valid STUN packet received.", G_STRFUNC);
@@ -3736,7 +3736,7 @@ nice_agent_dispose (GObject *object)
}
gboolean
-component_io_cb (GSocket *socket, GIOCondition condition, gpointer user_data)
+component_io_cb (GSocket *sock, GIOCondition condition, gpointer user_data)
{
SocketSource *socket_source = user_data;
Component *component;

58
net/libnice/patches/patch-agent_component_c
View File

@ -1,58 +0,0 @@
$OpenBSD: patch-agent_component_c,v 1.2 2014/03/12 07:53:00 jasper Exp $
https://bugs.freedesktop.org/show_bug.cgi?id=76059
warning: declaration of 'socket' shadows a global declaration
--- agent/component.c.orig Tue Mar 11 19:39:42 2014
+++ agent/component.c Tue Mar 11 19:40:28 2014
@@ -431,13 +431,13 @@ _find_socket_source (gconstpointer a, gconstpointer b)
/* This takes ownership of the socket.
* It creates and attaches a source to the component’s context. */
void
-component_attach_socket (Component *component, NiceSocket *socket)
+component_attach_socket (Component *component, NiceSocket *sock)
{
GSList *l;
SocketSource *socket_source;
g_assert (component != NULL);
- g_assert (socket != NULL);
+ g_assert (sock != NULL);
g_assert (component->ctx != NULL);
@@ -454,13 +454,13 @@ component_attach_socket (Component *component, NiceSoc
* or discovery failure, which are both unrecoverable states.
*
* An empty socket_sources corresponds to age 0. */
- l = g_slist_find_custom (component->socket_sources, socket,
+ l = g_slist_find_custom (component->socket_sources, sock,
_find_socket_source);
if (l != NULL) {
socket_source = l->data;
} else {
socket_source = g_slice_new0 (SocketSource);
- socket_source->socket = socket;
+ socket_source->socket = sock;
socket_source->component = component;
component->socket_sources =
g_slist_prepend (component->socket_sources, socket_source);
@@ -501,15 +501,15 @@ component_reattach_all_sockets (Component *component)
* If the @socket doesn’t exist in this @component, do nothing.
*/
void
-component_detach_socket (Component *component, NiceSocket *socket)
+component_detach_socket (Component *component, NiceSocket *sock)
{
GSList *l;
SocketSource *socket_source;
- nice_debug ("Detach socket %p.", socket);
+ nice_debug ("Detach socket %p.", sock);
/* Find the SocketSource for the socket. */
- l = g_slist_find_custom (component->socket_sources, socket,
+ l = g_slist_find_custom (component->socket_sources, sock,
_find_socket_source);
if (l == NULL)
return;

148
net/libnice/patches/patch-agent_conncheck_c
View File

@ -1,148 +0,0 @@
$OpenBSD: patch-agent_conncheck_c,v 1.2 2014/03/12 07:53:00 jasper Exp $
https://bugs.freedesktop.org/show_bug.cgi?id=76059
warning: declaration of 'socket' shadows a global declaration
--- agent/conncheck.c.orig Fri Mar 7 02:21:05 2014
+++ agent/conncheck.c Tue Mar 11 21:22:32 2014
@@ -1903,7 +1903,7 @@ static gboolean priv_schedule_triggered_check (NiceAge
*
* @pre (rcand == NULL || nice_address_equal(rcand->addr, toaddr) == TRUE)
*/
-static void priv_reply_to_conn_check (NiceAgent *agent, Stream *stream, Component *component, NiceCandidate *rcand, const NiceAddress *toaddr, NiceSocket *socket, size_t rbuf_len, uint8_t *rbuf, gboolean use_candidate)
+static void priv_reply_to_conn_check (NiceAgent *agent, Stream *stream, Component *component, NiceCandidate *rcand, const NiceAddress *toaddr, NiceSocket *sock, size_t rbuf_len, uint8_t *rbuf, gboolean use_candidate)
{
g_assert (rcand == NULL || nice_address_equal(&rcand->addr, toaddr) == TRUE);
@@ -1913,17 +1913,17 @@ static void priv_reply_to_conn_check (NiceAgent *agent
nice_debug ("Agent %p : STUN-CC RESP to '%s:%u', socket=%u, len=%u, cand=%p (c-id:%u), use-cand=%d.", agent,
tmpbuf,
nice_address_get_port (toaddr),
- g_socket_get_fd(socket->fileno),
+ g_socket_get_fd(sock->fileno),
(unsigned)rbuf_len,
rcand, component->id,
(int)use_candidate);
}
- nice_socket_send (socket, toaddr, rbuf_len, (const gchar*)rbuf);
+ nice_socket_send (sock, toaddr, rbuf_len, (const gchar*)rbuf);
if (rcand) {
/* note: upon successful check, make the reserve check immediately */
- priv_schedule_triggered_check (agent, stream, component, socket, rcand, use_candidate);
+ priv_schedule_triggered_check (agent, stream, component, sock, rcand, use_candidate);
if (use_candidate)
priv_mark_pair_nominated (agent, stream, component, rcand);
@@ -1939,7 +1939,7 @@ static void priv_reply_to_conn_check (NiceAgent *agent
* @return non-zero on error, zero on success
*/
static int priv_store_pending_check (NiceAgent *agent, Component *component,
- const NiceAddress *from, NiceSocket *socket, uint8_t *username,
+ const NiceAddress *from, NiceSocket *sock, uint8_t *username,
uint16_t username_len, uint32_t priority, gboolean use_candidate)
{
IncomingCheck *icheck;
@@ -1955,7 +1955,7 @@ static int priv_store_pending_check (NiceAgent *agent,
icheck = g_slice_new0 (IncomingCheck);
component->incoming_checks = g_slist_append (component->incoming_checks, icheck);
icheck->from = *from;
- icheck->local_socket = socket;
+ icheck->local_socket = sock;
icheck->priority = priority;
icheck->use_candidate = use_candidate;
icheck->username_len = username_len;
@@ -2720,7 +2720,7 @@ static bool conncheck_stun_validater (StunAgent *agent
* @return XXX (what FALSE means exactly?)
*/
gboolean conn_check_handle_inbound_stun (NiceAgent *agent, Stream *stream,
- Component *component, NiceSocket *socket, const NiceAddress *from,
+ Component *component, NiceSocket *sock, const NiceAddress *from,
gchar *buf, guint len)
{
union {
@@ -2768,7 +2768,7 @@ gboolean conn_check_handle_inbound_stun (NiceAgent *ag
for (i = agent->discovery_list; i; i = i->next) {
CandidateDiscovery *d = i->data;
if (d->stream == stream && d->component == component &&
- d->nicesock == socket) {
+ d->nicesock == sock) {
valid = stun_agent_validate (&d->stun_agent, &req,
(uint8_t *) buf, len, conncheck_stun_validater, &validater_data);
@@ -2786,9 +2786,9 @@ gboolean conn_check_handle_inbound_stun (NiceAgent *ag
for (i = agent->refresh_list; i; i = i->next) {
CandidateRefresh *r = i->data;
nice_debug ("Comparing %p to %p, %p to %p and %p and %p to %p", r->stream,
- stream, r->component, component, r->nicesock, r->relay_socket, socket);
+ stream, r->component, component, r->nicesock, r->relay_socket, sock);
if (r->stream == stream && r->component == component &&
- (r->nicesock == socket || r->relay_socket == socket)) {
+ (r->nicesock == sock || r->relay_socket == sock)) {
valid = stun_agent_validate (&r->stun_agent, &req,
(uint8_t *) buf, len, conncheck_stun_validater, &validater_data);
nice_debug ("Validating gave %d", valid);
@@ -2819,7 +2819,7 @@ gboolean conn_check_handle_inbound_stun (NiceAgent *ag
rbuf_len = stun_agent_build_unknown_attributes_error (&agent->stun_agent,
&msg, rbuf, rbuf_len, &req);
if (rbuf_len != 0)
- nice_socket_send (socket, from, rbuf_len, (const gchar*)rbuf);
+ nice_socket_send (sock, from, rbuf_len, (const gchar*)rbuf);
}
return TRUE;
}
@@ -2832,7 +2832,7 @@ gboolean conn_check_handle_inbound_stun (NiceAgent *ag
rbuf_len = stun_agent_finish_message (&agent->stun_agent, &msg, NULL, 0);
if (rbuf_len > 0 && agent->compatibility != NICE_COMPATIBILITY_MSN &&
agent->compatibility != NICE_COMPATIBILITY_OC2007)
- nice_socket_send (socket, from, rbuf_len, (const gchar*)rbuf);
+ nice_socket_send (sock, from, rbuf_len, (const gchar*)rbuf);
}
return TRUE;
}
@@ -2843,7 +2843,7 @@ gboolean conn_check_handle_inbound_stun (NiceAgent *ag
rbuf_len = stun_agent_finish_message (&agent->stun_agent, &msg, NULL, 0);
if (rbuf_len > 0 && agent->compatibility != NICE_COMPATIBILITY_MSN &&
agent->compatibility != NICE_COMPATIBILITY_OC2007)
- nice_socket_send (socket, from, rbuf_len, (const gchar*)rbuf);
+ nice_socket_send (sock, from, rbuf_len, (const gchar*)rbuf);
}
return TRUE;
}
@@ -2981,7 +2981,7 @@ gboolean conn_check_handle_inbound_stun (NiceAgent *ag
nice_debug ("Agent %p : No matching remote candidate for incoming check ->"
"peer-reflexive candidate.", agent);
remote_candidate = discovery_learn_remote_peer_reflexive_candidate (
- agent, stream, component, priority, from, socket,
+ agent, stream, component, priority, from, sock,
local_candidate,
remote_candidate2 ? remote_candidate2 : remote_candidate);
if(remote_candidate)
@@ -2989,7 +2989,7 @@ gboolean conn_check_handle_inbound_stun (NiceAgent *ag
}
priv_reply_to_conn_check (agent, stream, component, remote_candidate,
- from, socket, rbuf_len, rbuf, use_candidate);
+ from, sock, rbuf_len, rbuf, use_candidate);
if (component->remote_candidates == NULL) {
/* case: We've got a valid binding request to a local candidate
@@ -2999,7 +2999,7 @@ gboolean conn_check_handle_inbound_stun (NiceAgent *ag
* we get information about the remote candidates */
/* step: send a reply immediately but postpone other processing */
- priv_store_pending_check (agent, component, from, socket,
+ priv_store_pending_check (agent, component, from, sock,
username, username_len, priority, use_candidate);
}
} else {
@@ -3016,7 +3016,7 @@ gboolean conn_check_handle_inbound_stun (NiceAgent *ag
/* step: let's try to match the response to an existing check context */
if (trans_found != TRUE)
trans_found = priv_map_reply_to_conn_check_request (agent, stream,
- component, socket, from, local_candidate, remote_candidate, &req);
+ component, sock, from, local_candidate, remote_candidate, &req);
/* step: let's try to match the response to an existing discovery */
if (trans_found != TRUE)

19
net/libnice/patches/patch-agent_inputstream_c
View File

@ -1,19 +0,0 @@
$OpenBSD: patch-agent_inputstream_c,v 1.2 2014/03/12 07:53:00 jasper Exp $
https://bugs.freedesktop.org/show_bug.cgi?id=76059
warning: declaration of 'socket' shadows a global declaration
--- agent/inputstream.c.orig Tue Mar 11 21:17:29 2014
+++ agent/inputstream.c Tue Mar 11 21:17:49 2014
@@ -360,9 +360,9 @@ nice_input_stream_is_readable (GPollableInputStream *s
/* Check whether any of the component’s FDs are pollable. */
for (i = component->socket_sources; i != NULL; i = i->next) {
SocketSource *socket_source = i->data;
- NiceSocket *socket = socket_source->socket;
+ NiceSocket *sock = socket_source->socket;
- if (g_socket_condition_check (socket->fileno, G_IO_IN) != 0) {
+ if (g_socket_condition_check (sock->fileno, G_IO_IN) != 0) {
retval = TRUE;
break;
}

19
net/libnice/patches/patch-agent_outputstream_c
View File

@ -1,19 +0,0 @@
$OpenBSD: patch-agent_outputstream_c,v 1.2 2014/03/12 07:53:00 jasper Exp $
https://bugs.freedesktop.org/show_bug.cgi?id=76059
warning: declaration of 'socket' shadows a global declaration
--- agent/outputstream.c.orig Tue Mar 11 21:17:34 2014
+++ agent/outputstream.c Tue Mar 11 21:18:03 2014
@@ -495,9 +495,9 @@ nice_output_stream_is_writable (GPollableOutputStream
/* Check whether any of the component’s FDs are pollable. */
for (i = component->socket_sources; i != NULL; i = i->next) {
SocketSource *socket_source = i->data;
- NiceSocket *socket = socket_source->socket;
+ NiceSocket *sock = socket_source->socket;
- if (g_socket_condition_check (socket->fileno, G_IO_OUT) != 0) {
+ if (g_socket_condition_check (sock->fileno, G_IO_OUT) != 0) {
retval = TRUE;
break;
}

38
net/libnice/patches/patch-agent_pseudotcp_c
View File

@ -1,38 +0,0 @@
$OpenBSD: patch-agent_pseudotcp_c,v 1.4 2014/03/12 07:53:00 jasper Exp $
https://bugs.freedesktop.org/show_bug.cgi?id=76059
warning: declaration of 'read' shadows a global declaration
--- agent/pseudotcp.c.orig Tue Mar 11 21:14:32 2014
+++ agent/pseudotcp.c Tue Mar 11 21:17:11 2014
@@ -974,7 +974,7 @@ gint
pseudo_tcp_socket_recv(PseudoTcpSocket *self, char * buffer, size_t len)
{
PseudoTcpSocketPrivate *priv = self->priv;
- gsize read;
+ gsize fifo_read;
gsize available_space;
if (priv->state != TCP_ESTABLISHED) {
@@ -985,10 +985,10 @@ pseudo_tcp_socket_recv(PseudoTcpSocket *self, char * b
if (len == 0)
return 0;
- read = pseudo_tcp_fifo_read (&priv->rbuf, (guint8 *) buffer, len);
+ fifo_read = pseudo_tcp_fifo_read (&priv->rbuf, (guint8 *) buffer, len);
// If there's no data in |m_rbuf|.
- if (read == 0) {
+ if (fifo_read == 0) {
priv->bReadEnable = TRUE;
priv->error = EWOULDBLOCK;
return -1;
@@ -1008,7 +1008,7 @@ pseudo_tcp_socket_recv(PseudoTcpSocket *self, char * b
}
}
- return read;
+ return fifo_read;
}
gint

8
net/libnice/patches/patch-configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.1 2014/03/09 22:21:23 ajacoutot Exp $
--- configure.orig Fri Mar 7 10:59:38 2014
+++ configure Fri Mar 7 11:00:00 2014
@@ -14057,7 +14057,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$
$OpenBSD: patch-configure,v 1.2 2014/04/29 13:10:26 ajacoutot Exp $
--- configure.orig Tue Apr 29 03:10:57 2014
+++ configure Tue Apr 29 14:57:51 2014
@@ -14076,7 +14076,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$
CFLAGS="$save_CFLAGS"
if test "X$flag_ok" = Xyes ; then

25
net/libnice/patches/patch-socket_tcp-turn_c
View File

@ -1,25 +0,0 @@
$OpenBSD: patch-socket_tcp-turn_c,v 1.2 2014/03/12 07:53:00 jasper Exp $
https://bugs.freedesktop.org/show_bug.cgi?id=76059
warning: declaration of 'socket' shadows a global declaration
--- socket/tcp-turn.c.orig Tue Mar 11 19:38:45 2014
+++ socket/tcp-turn.c Tue Mar 11 19:39:25 2014
@@ -196,7 +196,7 @@ socket_recv_message (NiceSocket *sock, NiceInputMessag
}
static gint
-socket_recv_messages (NiceSocket *socket,
+socket_recv_messages (NiceSocket *sock,
NiceInputMessage *recv_messages, guint n_recv_messages)
{
guint i;
@@ -205,7 +205,7 @@ socket_recv_messages (NiceSocket *socket,
for (i = 0; i < n_recv_messages; i++) {
gssize len;
- len = socket_recv_message (socket, &recv_messages[i]);
+ len = socket_recv_message (sock, &recv_messages[i]);
recv_messages[i].length = MAX (len, 0);
if (len < 0)

3
net/libnice/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.8 2014/04/01 14:52:10 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.9 2014/04/29 13:10:26 ajacoutot Exp $
@bin bin/stunbdc
@bin bin/stund
include/nice/
@ -47,6 +47,7 @@ share/gtk-doc/html/libnice/ix07.html
share/gtk-doc/html/libnice/ix08.html
share/gtk-doc/html/libnice/ix09.html
share/gtk-doc/html/libnice/ix10.html
share/gtk-doc/html/libnice/ix11.html
share/gtk-doc/html/libnice/left.png
share/gtk-doc/html/libnice/libnice-Bind.html
share/gtk-doc/html/libnice/libnice-Debug-messages.html