Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Samuli Suominen (drac)" <drac@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-libs/libcapsinetwork/files: libcapsinetwork-0.3.0-64bit.patch libcapsinetwork-0.3.0-gcc43.patch libcapsinetwork-0.3.0-parallel.patch
Date: Sun, 04 May 2008 09:57:45
Message-Id: E1JsayU-0000vu-CV@stork.gentoo.org
1 drac 08/05/04 09:57:42
2
3 Added: libcapsinetwork-0.3.0-64bit.patch
4 libcapsinetwork-0.3.0-gcc43.patch
5 libcapsinetwork-0.3.0-parallel.patch
6 Log:
7 Fix server busy loop with 64bit architectures. Fix parallel make. Fix building with GCC 4.3 wrt #218831, thanks to Peter Alfredsen. Also, run full eautoreconf to fix obscure compile failure where _init gets redefined.
8 (Portage version: 2.1.5_rc6)
9
10 Revision Changes Path
11 1.1 net-libs/libcapsinetwork/files/libcapsinetwork-0.3.0-64bit.patch
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/libcapsinetwork/files/libcapsinetwork-0.3.0-64bit.patch?rev=1.1&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/libcapsinetwork/files/libcapsinetwork-0.3.0-64bit.patch?rev=1.1&content-type=text/plain
15
16 Index: libcapsinetwork-0.3.0-64bit.patch
17 ===================================================================
18 --- libcapsinetwork-0.3.0.old/src/socket.cpp 2004-07-15 05:39:28.000000000 -0400
19 +++ libcapsinetwork-0.3.0/src/socket.cpp 2007-10-10 07:36:41.000000000 -0400
20 @@ -49,7 +49,7 @@
21 const bool Socket::hasReadLine()
22 {
23 static std::string newLine = "\r\n";
24 - unsigned int pos = m_ioBuf.find_first_of(newLine);
25 + std::string::size_type pos = m_ioBuf.find_first_of(newLine);
26
27 return (!(pos == std::string::npos));
28 }
29 @@ -57,7 +57,7 @@
30 const std::string Socket::readLine()
31 {
32 static std::string newLine = "\r\n";
33 - unsigned int pos = m_ioBuf.find_first_of(newLine);
34 + std::string::size_type pos = m_ioBuf.find_first_of(newLine);
35
36 if (pos != std::string::npos)
37 {
38
39
40
41 1.1 net-libs/libcapsinetwork/files/libcapsinetwork-0.3.0-gcc43.patch
42
43 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/libcapsinetwork/files/libcapsinetwork-0.3.0-gcc43.patch?rev=1.1&view=markup
44 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/libcapsinetwork/files/libcapsinetwork-0.3.0-gcc43.patch?rev=1.1&content-type=text/plain
45
46 Index: libcapsinetwork-0.3.0-gcc43.patch
47 ===================================================================
48 diff -urN libcapsinetwork-0.3.0.old/src/listener.cpp libcapsinetwork-0.3.0/src/listener.cpp
49 --- libcapsinetwork-0.3.0.old/src/listener.cpp 2008-01-08 18:10:17.000000000 -0500
50 +++ libcapsinetwork-0.3.0/src/listener.cpp 2008-01-08 18:15:51.000000000 -0500
51 @@ -31,6 +31,7 @@
52
53 #include <netdb.h>
54 #include <unistd.h>
55 +#include <stdlib.h>
56
57 #include "listener.h"
58 #include "listenport.h"
59 diff -urN libcapsinetwork-0.3.0.old/src/listenport.cpp libcapsinetwork-0.3.0/src/listenport.cpp
60 --- libcapsinetwork-0.3.0.old/src/listenport.cpp 2004-07-15 05:39:28.000000000 -0400
61 +++ libcapsinetwork-0.3.0/src/listenport.cpp 2008-01-08 18:15:51.000000000 -0500
62 @@ -30,6 +30,7 @@
63 #include <fcntl.h>
64 #include <netdb.h>
65 #include <unistd.h>
66 +#include <string.h>
67
68 #include "listenport.h"
69
70 diff -urN libcapsinetwork-0.3.0.old/src/server.cpp libcapsinetwork-0.3.0/src/server.cpp
71 --- libcapsinetwork-0.3.0.old/src/server.cpp 2008-01-08 18:10:17.000000000 -0500
72 +++ libcapsinetwork-0.3.0/src/server.cpp 2008-01-08 18:15:51.000000000 -0500
73 @@ -26,6 +26,7 @@
74
75 #include <string>
76 #include <stdio.h>
77 +#include <stdlib.h>
78
79 // In real applications, use the following include instead of the local.
80 // #include <libcapsinetwork/socket.h>
81 diff -urN libcapsinetwork-0.3.0.old/src/socket.cpp libcapsinetwork-0.3.0/src/socket.cpp
82 --- libcapsinetwork-0.3.0.old/src/socket.cpp 2008-01-08 18:10:17.000000000 -0500
83 +++ libcapsinetwork-0.3.0/src/socket.cpp 2008-01-08 18:15:13.000000000 -0500
84 @@ -25,6 +25,7 @@
85 #include <stdarg.h>
86 #include <stdio.h>
87 #include <unistd.h>
88 +#include <string.h>
89
90 #include "socket.h"
91
92
93
94
95 1.1 net-libs/libcapsinetwork/files/libcapsinetwork-0.3.0-parallel.patch
96
97 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/libcapsinetwork/files/libcapsinetwork-0.3.0-parallel.patch?rev=1.1&view=markup
98 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/libcapsinetwork/files/libcapsinetwork-0.3.0-parallel.patch?rev=1.1&content-type=text/plain
99
100 Index: libcapsinetwork-0.3.0-parallel.patch
101 ===================================================================
102 diff -urN libcapsinetwork-0.3.0.old/src/Makefile.am libcapsinetwork-0.3.0/src/Makefile.am
103 --- libcapsinetwork-0.3.0.old/src/Makefile.am 2004-07-15 05:39:28.000000000 -0400
104 +++ libcapsinetwork-0.3.0/src/Makefile.am 2007-10-10 07:09:59.000000000 -0400
105 @@ -8,7 +8,7 @@
106
107 noinst_PROGRAMS = exampleserver
108 exampleserver_SOURCES = server.cpp
109 -exampleserver_LDADD = -L. -lcapsinetwork
110 +exampleserver_LDADD = ./libcapsinetwork.la
111 exampleserverincdir = .
112
113 noinst_HEADERS = listenport.h server.h
114
115
116
117 --
118 gentoo-commits@l.g.o mailing list
Report Message
Find on MARC Find on Google Groups