Attachment #45252 for bug #69823

View | Details | Raw Unified | Return to bug 69823
Collapse All | Expand All





PORTNAME=	base
PORTVERSION=	${LICQ_VER}
PORTREVISION=	4
CATEGORIES=	net
PKGNAMESUFFIX=	${SOCKS_SUFFIX}${PKGNAMESUFFIX2}



.include <bsd.port.pre.mk>
.include "${PORTSDIR}/${LICQ_PORT}/Makefile.inc"

.if ${OSVERSION} >= 502122
BROKEN=		new gcc: cast to non-reference type
.endif

.include <bsd.port.post.mk>




--- src/socket.cpp.orig	Thu Jan  2 22:08:06 2003
+++ src/socket.cpp	Wed Jan  8 07:58:47 2003
@@ -13,6 +13,9 @@
 #include <netdb.h>
 #include <fcntl.h>
 #include <unistd.h>
+#ifdef __FreeBSD__
+#include <osreldate.h>
+#endif
 
 #ifdef HAVE_INET_ATON
 #include <arpa/inet.h>
@@ -427,7 +430,11 @@
     m_sRemoteAddr.sin_family = AF_INET;
 
     // if connect fails then call CloseConnection to clean up before returning
+#if defined(__FreeBSD__) && __FreeBSD_version < 400013
+    int sizeofSockaddr = sizeof(struct sockaddr);
+#else
     socklen_t sizeofSockaddr = sizeof(struct sockaddr);
+#endif
     if (connect(m_nDescriptor, (struct sockaddr *)&m_sRemoteAddr, sizeofSockaddr) < 0)
     {
       // errno has been set
--- src/socket.cpp.orig	Wed Jan 29 13:19:59 2003
+++ src/socket.cpp	Wed Jan 29 13:20:20 2003
@@ -42,7 +42,6 @@
 #ifdef USE_SOCKS5
 
 #define SOCKS
-#define INCLUDE_PROTOTYPES
 extern "C" {
 #include <socks.h>
 }




--- src/socket.cpp.orig	Mon Jun 16 19:09:46 2003
+++ src/socket.cpp	Fri Jul 30 20:17:55 2004
@@ -49,7 +49,6 @@
 #ifdef USE_SOCKS5
 
 #define SOCKS
-#define INCLUDE_PROTOTYPES
 extern "C" {
 #include <socks.h>
 }
@@ -1078,7 +1077,7 @@
 bool TCPSocket::SecureConnect()
 {
   pthread_mutex_init(&mutex_ssl, NULL);
-  m_pSSL = SSL_new(gSSL_CTX);
+  m_p_SSL = SSL_new(gSSL_CTX);
 #ifdef SSL_DEBUG
   m_pSSL->debug = 1;
 #endif
@@ -1111,7 +1110,7 @@
 {
   pthread_mutex_init(&mutex_ssl, NULL);
 
-  m_pSSL = SSL_new(gSSL_CTX);
+  m_p_SSL = SSL_new(gSSL_CTX);
   SSL_set_session(m_pSSL, NULL);
   SSL_set_fd(m_pSSL, m_nDescriptor);
   int i = SSL_accept(m_pSSL);

Line 0 Link Here

(-)licq/files/patch-src-user.cpp (+11 lines)
	1	--- src/user.cpp.orig Mon Jun 16 19:09:46 2003
	2	+++ src/user.cpp Fri Jul 30 20:10:16 2004
	3	@@ -3184,7 +3184,7 @@
	4	m_fConf.ReadBool("HideIP", m_bHideIp, false);
	5	m_fConf.ReadNum("RCG", m_nRandomChatGroup, ICQ_RANDOMxCHATxGROUP_NONE);
	6	m_fConf.ReadStr("AutoResponse", szTemp, "");
	7	- m_fConf.ReadNum("SSTime", (unsigned long)m_nSSTime, 0L);
	8	+ m_fConf.ReadNum("SSTime", (unsigned long&)m_nSSTime, 0L);
	9	m_fConf.ReadNum("SSCount", m_nSSCount, 0);
	10	SetAutoResponse(szTemp);
	11

Return to bug 69823

Lines 7-13 Link Here

(-)licq/Makefile (-5 / +1 lines)
7		7
8	PORTNAME= base	8	PORTNAME= base
9	PORTVERSION= ${LICQ_VER}	9	PORTVERSION= ${LICQ_VER}
10	PORTREVISION= 3	10	PORTREVISION= 4
11	CATEGORIES= net	11	CATEGORIES= net
12	PKGNAMESUFFIX= ${SOCKS_SUFFIX}${PKGNAMESUFFIX2}	12	PKGNAMESUFFIX= ${SOCKS_SUFFIX}${PKGNAMESUFFIX2}
13		13
Lines 59-67 Link Here
59		59
60	.include <bsd.port.pre.mk>	60	.include <bsd.port.pre.mk>
61	.include "${PORTSDIR}/${LICQ_PORT}/Makefile.inc"	61	.include "${PORTSDIR}/${LICQ_PORT}/Makefile.inc"
62
63	.if ${OSVERSION} >= 502122
64	BROKEN= new gcc: cast to non-reference type
65	.endif
66		62
67	.include <bsd.port.post.mk>	63	.include <bsd.port.post.mk>

Lines 1-34 Link Here

(-)licq/files/patch-socket.cpp (-34 lines)
1	--- src/socket.cpp.orig Thu Jan 2 22:08:06 2003
2	+++ src/socket.cpp Wed Jan 8 07:58:47 2003
3	@@ -13,6 +13,9 @@
4	#include <netdb.h>
5	#include <fcntl.h>
6	#include <unistd.h>
7	+#ifdef __FreeBSD__
8	+#include <osreldate.h>
9	+#endif
10
11	#ifdef HAVE_INET_ATON
12	#include <arpa/inet.h>
13	@@ -427,7 +430,11 @@
14	m_sRemoteAddr.sin_family = AF_INET;
15
16	// if connect fails then call CloseConnection to clean up before returning
17	+#if defined(__FreeBSD__) && __FreeBSD_version < 400013
18	+ int sizeofSockaddr = sizeof(struct sockaddr);
19	+#else
20	socklen_t sizeofSockaddr = sizeof(struct sockaddr);
21	+#endif
22	if (connect(m_nDescriptor, (struct sockaddr *)&m_sRemoteAddr, sizeofSockaddr) < 0)
23	{
24	// errno has been set
25	--- src/socket.cpp.orig Wed Jan 29 13:19:59 2003
26	+++ src/socket.cpp Wed Jan 29 13:20:20 2003
27	@@ -42,7 +42,6 @@
28	#ifdef USE_SOCKS5
29
30	#define SOCKS
31	-#define INCLUDE_PROTOTYPES
32	extern "C" {
33	#include <socks.h>
34	}

Line 0 Link Here

(-)licq/files/patch-src-socket.cpp (+28 lines)
	1	--- src/socket.cpp.orig Mon Jun 16 19:09:46 2003
	2	+++ src/socket.cpp Fri Jul 30 20:17:55 2004
	3	@@ -49,7 +49,6 @@
	4	#ifdef USE_SOCKS5
	5
	6	#define SOCKS
	7	-#define INCLUDE_PROTOTYPES
	8	extern "C" {
	9	#include <socks.h>
	10	}
	11	@@ -1078,7 +1077,7 @@
	12	bool TCPSocket::SecureConnect()
	13	{
	14	pthread_mutex_init(&mutex_ssl, NULL);
	15	- m_pSSL = SSL_new(gSSL_CTX);
	16	+ m_p_SSL = SSL_new(gSSL_CTX);
	17	#ifdef SSL_DEBUG
	18	m_pSSL->debug = 1;
	19	#endif
	20	@@ -1111,7 +1110,7 @@
	21	{
	22	pthread_mutex_init(&mutex_ssl, NULL);
	23
	24	- m_pSSL = SSL_new(gSSL_CTX);
	25	+ m_p_SSL = SSL_new(gSSL_CTX);
	26	SSL_set_session(m_pSSL, NULL);
	27	SSL_set_fd(m_pSSL, m_nDescriptor);
	28	int i = SSL_accept(m_pSSL);