- Add a patch to fix network-related functionality

PR:		144575 ([1]), 138786 ([2])
Submitted by:	Ganael Laplanche <ganael.laplanche@martymac.com> [1],
		Martin Laabs <spamtrap@martinlaabs.de> [2]
Patch by:	Ganael Laplanche <ganael.laplanche@martymac.com>
This commit is contained in:
Dmitry Marakasov 2010-03-15 14:35:32 +00:00
parent 68ea0c50f0
commit 3ea5acac29
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=251081
3 changed files with 49 additions and 1 deletions

View File

@ -7,7 +7,7 @@
PORTNAME= plib
PORTVERSION= 1.8.5
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= x11-toolkits
MASTER_SITES= http://plib.sourceforge.net/dist/

View File

@ -0,0 +1,21 @@
--- src/net/netSocket.cxx.orig 2008-03-11 05:06:20.000000000 +0300
+++ src/net/netSocket.cxx 2010-03-09 18:53:58.000000000 +0300
@@ -38,6 +38,7 @@
#include <unistd.h>
#include <netdb.h>
#include <fcntl.h>
+#include <stddef.h>
#else
@@ -64,8 +65,10 @@
void netAddress::set ( const char* host, int port )
{
+ int dummy[(sizeof(netAddress) == sizeof(sockaddr_in))*2-1]; // Compile time assert
memset(this, 0, sizeof(netAddress));
+ sin_len = sizeof(netAddress);
sin_family = AF_INET ;
sin_port = htons (port);

View File

@ -0,0 +1,27 @@
--- src/net/netSocket.h.orig 2008-03-11 05:06:20.000000000 +0300
+++ src/net/netSocket.h 2010-03-09 18:16:55.000000000 +0300
@@ -41,6 +41,8 @@
#define NET_SOCKET_H
#include "ul.h"
+#include <sys/types.h>
+#include <sys/socket.h>
#include <errno.h>
/*
@@ -49,10 +51,11 @@
class netAddress
{
/* DANGER!!! This MUST match 'struct sockaddr_in' exactly! */
- short sin_family ;
- unsigned short sin_port ;
- unsigned int sin_addr ;
- char sin_zero [ 8 ] ;
+ int8_t sin_len;
+ sa_family_t sin_family;
+ in_port_t sin_port;
+ in_addr_t sin_addr;
+ char sin_zero[8];
public:
netAddress () {}