Date: Fri, 30 Jul 2004 21:32:17 +0200 From: Francois Tigeot <ftigeot@wolfpond.org> To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org Cc: Francois Tigeot <ftigeot@wolfpond.org> Subject: Re: ports/69823: [patch] unbreak net/licq with gcc-3.4 Message-ID: <20040730193217.GB55670@aoi.wolfpond.org> In-Reply-To: <200407301920.i6UJKPvQ070734@freefall.freebsd.org> References: <200407301918.i6UJI7Bj055665@aoi.wolfpond.org> <200407301920.i6UJKPvQ070734@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--Kj7319i9nmIyA2yE
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
On Fri, Jul 30, 2004 at 07:20:25PM +0000, FreeBSD-gnats-submit@FreeBSD.org wrote:
> Thank you very much for your problem report.
> It has the internal identification `ports/69823'.
> The individual assigned to look at your
> report is: freebsd-ports-bugs.
>
> >Category: ports
> >Responsible: freebsd-ports-bugs
> >Synopsis: [patch] unbreak net/licq with gcc-3.4
> >Arrival-Date: Fri Jul 30 19:20:24 GMT 2004
Forgot to attach the patch.
--
Francois Tigeot
--Kj7319i9nmIyA2yE
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="licq-gcc34.patch"
diff -urN licq.orig/Makefile licq/Makefile
--- licq.orig/Makefile Tue Jul 20 07:39:38 2004
+++ licq/Makefile Fri Jul 30 20:26:58 2004
@@ -7,7 +7,7 @@
PORTNAME= base
PORTVERSION= ${LICQ_VER}
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net
PKGNAMESUFFIX= ${SOCKS_SUFFIX}${PKGNAMESUFFIX2}
@@ -59,9 +59,5 @@
.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>
diff -urN licq.orig/files/patch-socket.cpp licq/files/patch-socket.cpp
--- licq.orig/files/patch-socket.cpp Fri Jan 31 05:48:15 2003
+++ licq/files/patch-socket.cpp Thu Jan 1 01:00:00 1970
@@ -1,34 +0,0 @@
---- 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>
- }
diff -urN licq.orig/files/patch-src-socket.cpp licq/files/patch-src-socket.cpp
--- licq.orig/files/patch-src-socket.cpp Thu Jan 1 01:00:00 1970
+++ licq/files/patch-src-socket.cpp Fri Jul 30 20:18:01 2004
@@ -0,0 +1,28 @@
+--- 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);
diff -urN licq.orig/files/patch-src-user.cpp licq/files/patch-src-user.cpp
--- licq.orig/files/patch-src-user.cpp Thu Jan 1 01:00:00 1970
+++ licq/files/patch-src-user.cpp Fri Jul 30 20:10:42 2004
@@ -0,0 +1,11 @@
+--- src/user.cpp.orig Mon Jun 16 19:09:46 2003
++++ src/user.cpp Fri Jul 30 20:10:16 2004
+@@ -3184,7 +3184,7 @@
+ m_fConf.ReadBool("HideIP", m_bHideIp, false);
+ m_fConf.ReadNum("RCG", m_nRandomChatGroup, ICQ_RANDOMxCHATxGROUP_NONE);
+ m_fConf.ReadStr("AutoResponse", szTemp, "");
+- m_fConf.ReadNum("SSTime", (unsigned long)m_nSSTime, 0L);
++ m_fConf.ReadNum("SSTime", (unsigned long&)m_nSSTime, 0L);
+ m_fConf.ReadNum("SSCount", m_nSSCount, 0);
+ SetAutoResponse(szTemp);
+
--Kj7319i9nmIyA2yE--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040730193217.GB55670>