Browse Source

seafile-ccnet: fix patch file to work correctly with libevent2 headers

Signed-off-by: Gergely Kiss <mail.gery@gmail.com>
Gergely Kiss 9 years ago
parent
commit
e03388255b
1 changed files with 91 additions and 30 deletions
  1. 91
    30
      net/seafile-ccnet/patches/010-libevent-include-path.patch

+ 91
- 30
net/seafile-ccnet/patches/010-libevent-include-path.patch View File

1
 diff -rupN seafile-ccnet-4.1.2.orig/include/ccnet/ccnet-client.h seafile-ccnet-4.1.2/include/ccnet/ccnet-client.h
1
 diff -rupN seafile-ccnet-4.1.2.orig/include/ccnet/ccnet-client.h seafile-ccnet-4.1.2/include/ccnet/ccnet-client.h
2
---- seafile-ccnet-4.1.2.orig/include/ccnet/ccnet-client.h	2015-09-03 21:43:37.000000000 +0200
3
-+++ seafile-ccnet-4.1.2/include/ccnet/ccnet-client.h	2015-09-04 10:21:05.578937942 +0200
2
+--- seafile-ccnet-4.1.2.orig/include/ccnet/ccnet-client.h	2015-09-09 18:49:35.000000000 +0200
3
++++ seafile-ccnet-4.1.2/include/ccnet/ccnet-client.h	2015-09-09 19:22:23.515461892 +0200
4
 @@ -10,11 +10,7 @@
4
 @@ -10,11 +10,7 @@
5
  #include <glib.h>
5
  #include <glib.h>
6
  #include <glib-object.h>
6
  #include <glib-object.h>
14
  #include "ccnet-session-base.h"
14
  #include "ccnet-session-base.h"
15
  
15
  
16
 diff -rupN seafile-ccnet-4.1.2.orig/include/ccnet/cevent.h seafile-ccnet-4.1.2/include/ccnet/cevent.h
16
 diff -rupN seafile-ccnet-4.1.2.orig/include/ccnet/cevent.h seafile-ccnet-4.1.2/include/ccnet/cevent.h
17
---- seafile-ccnet-4.1.2.orig/include/ccnet/cevent.h	2015-09-03 21:43:37.000000000 +0200
18
-+++ seafile-ccnet-4.1.2/include/ccnet/cevent.h	2015-09-04 10:21:10.498933107 +0200
17
+--- seafile-ccnet-4.1.2.orig/include/ccnet/cevent.h	2015-09-09 18:49:35.000000000 +0200
18
++++ seafile-ccnet-4.1.2/include/ccnet/cevent.h	2015-09-09 19:22:23.516461920 +0200
19
 @@ -6,13 +6,9 @@
19
 @@ -6,13 +6,9 @@
20
  #ifndef CEVENT_H
20
  #ifndef CEVENT_H
21
  #define CEVENT_H
21
  #define CEVENT_H
31
  #include <glib.h>
31
  #include <glib.h>
32
  
32
  
33
 diff -rupN seafile-ccnet-4.1.2.orig/lib/job-mgr.c seafile-ccnet-4.1.2/lib/job-mgr.c
33
 diff -rupN seafile-ccnet-4.1.2.orig/lib/job-mgr.c seafile-ccnet-4.1.2/lib/job-mgr.c
34
---- seafile-ccnet-4.1.2.orig/lib/job-mgr.c	2015-09-03 21:43:37.000000000 +0200
35
-+++ seafile-ccnet-4.1.2/lib/job-mgr.c	2015-09-04 10:19:49.323012920 +0200
34
+--- seafile-ccnet-4.1.2.orig/lib/job-mgr.c	2015-09-09 18:49:35.000000000 +0200
35
++++ seafile-ccnet-4.1.2/lib/job-mgr.c	2015-09-09 19:22:23.516461920 +0200
36
 @@ -1,11 +1,7 @@
36
 @@ -1,11 +1,7 @@
37
  /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
37
  /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
38
  
38
  
46
  #include <string.h>
46
  #include <string.h>
47
  #include <stdlib.h>
47
  #include <stdlib.h>
48
 diff -rupN seafile-ccnet-4.1.2.orig/lib/libccnet_utils.h seafile-ccnet-4.1.2/lib/libccnet_utils.h
48
 diff -rupN seafile-ccnet-4.1.2.orig/lib/libccnet_utils.h seafile-ccnet-4.1.2/lib/libccnet_utils.h
49
---- seafile-ccnet-4.1.2.orig/lib/libccnet_utils.h	2015-09-03 21:43:37.000000000 +0200
50
-+++ seafile-ccnet-4.1.2/lib/libccnet_utils.h	2015-09-04 10:20:00.003002414 +0200
49
+--- seafile-ccnet-4.1.2.orig/lib/libccnet_utils.h	2015-09-09 18:49:35.000000000 +0200
50
++++ seafile-ccnet-4.1.2/lib/libccnet_utils.h	2015-09-09 19:22:23.517461948 +0200
51
 @@ -15,11 +15,7 @@
51
 @@ -15,11 +15,7 @@
52
  #include <glib-object.h>
52
  #include <glib-object.h>
53
  #include <stdlib.h>
53
  #include <stdlib.h>
61
  #ifdef WIN32
61
  #ifdef WIN32
62
      #include <errno.h>
62
      #include <errno.h>
63
 diff -rupN seafile-ccnet-4.1.2.orig/lib/mainloop.c seafile-ccnet-4.1.2/lib/mainloop.c
63
 diff -rupN seafile-ccnet-4.1.2.orig/lib/mainloop.c seafile-ccnet-4.1.2/lib/mainloop.c
64
---- seafile-ccnet-4.1.2.orig/lib/mainloop.c	2015-09-03 21:43:37.000000000 +0200
65
-+++ seafile-ccnet-4.1.2/lib/mainloop.c	2015-09-04 10:20:10.355992232 +0200
64
+--- seafile-ccnet-4.1.2.orig/lib/mainloop.c	2015-09-09 18:49:35.000000000 +0200
65
++++ seafile-ccnet-4.1.2/lib/mainloop.c	2015-09-09 19:22:23.517461948 +0200
66
 @@ -3,13 +3,9 @@
66
 @@ -3,13 +3,9 @@
67
  #include "include.h"
67
  #include "include.h"
68
  #include <ccnet.h>
68
  #include <ccnet.h>
78
  static int
78
  static int
79
  cmdrsp_cb (const char *code, char *content, int clen, void *data)
79
  cmdrsp_cb (const char *code, char *content, int clen, void *data)
80
 diff -rupN seafile-ccnet-4.1.2.orig/lib/net.h seafile-ccnet-4.1.2/lib/net.h
80
 diff -rupN seafile-ccnet-4.1.2.orig/lib/net.h seafile-ccnet-4.1.2/lib/net.h
81
---- seafile-ccnet-4.1.2.orig/lib/net.h	2015-09-03 21:43:37.000000000 +0200
82
-+++ seafile-ccnet-4.1.2/lib/net.h	2015-09-04 10:20:22.951979845 +0200
81
+--- seafile-ccnet-4.1.2.orig/lib/net.h	2015-09-09 18:49:35.000000000 +0200
82
++++ seafile-ccnet-4.1.2/lib/net.h	2015-09-09 19:22:23.517461948 +0200
83
 @@ -19,11 +19,7 @@
83
 @@ -19,11 +19,7 @@
84
      #include <netinet/tcp.h>
84
      #include <netinet/tcp.h>
85
  #endif
85
  #endif
93
  #ifdef WIN32
93
  #ifdef WIN32
94
      #define ECONNREFUSED WSAECONNREFUSED
94
      #define ECONNREFUSED WSAECONNREFUSED
95
 diff -rupN seafile-ccnet-4.1.2.orig/lib/packet-io.h seafile-ccnet-4.1.2/lib/packet-io.h
95
 diff -rupN seafile-ccnet-4.1.2.orig/lib/packet-io.h seafile-ccnet-4.1.2/lib/packet-io.h
96
---- seafile-ccnet-4.1.2.orig/lib/packet-io.h	2015-09-03 21:43:37.000000000 +0200
97
-+++ seafile-ccnet-4.1.2/lib/packet-io.h	2015-09-04 10:20:31.827971118 +0200
96
+--- seafile-ccnet-4.1.2.orig/lib/packet-io.h	2015-09-09 18:49:35.000000000 +0200
97
++++ seafile-ccnet-4.1.2/lib/packet-io.h	2015-09-09 19:22:23.518461976 +0200
98
 @@ -5,11 +5,7 @@
98
 @@ -5,11 +5,7 @@
99
  
99
  
100
  #include <packet.h>
100
  #include <packet.h>
108
  struct buffer;
108
  struct buffer;
109
  
109
  
110
 diff -rupN seafile-ccnet-4.1.2.orig/lib/processor.c seafile-ccnet-4.1.2/lib/processor.c
110
 diff -rupN seafile-ccnet-4.1.2.orig/lib/processor.c seafile-ccnet-4.1.2/lib/processor.c
111
---- seafile-ccnet-4.1.2.orig/lib/processor.c	2015-09-03 21:43:37.000000000 +0200
112
-+++ seafile-ccnet-4.1.2/lib/processor.c	2015-09-04 10:20:53.395949916 +0200
111
+--- seafile-ccnet-4.1.2.orig/lib/processor.c	2015-09-09 18:49:35.000000000 +0200
112
++++ seafile-ccnet-4.1.2/lib/processor.c	2015-09-09 19:22:23.518461976 +0200
113
 @@ -4,11 +4,7 @@
113
 @@ -4,11 +4,7 @@
114
  
114
  
115
  #include <pthread.h>
115
  #include <pthread.h>
123
  #include "ccnet-client.h"
123
  #include "ccnet-client.h"
124
  #include "processor.h"
124
  #include "processor.h"
125
 diff -rupN seafile-ccnet-4.1.2.orig/lib/timer.c seafile-ccnet-4.1.2/lib/timer.c
125
 diff -rupN seafile-ccnet-4.1.2.orig/lib/timer.c seafile-ccnet-4.1.2/lib/timer.c
126
---- seafile-ccnet-4.1.2.orig/lib/timer.c	2015-09-03 21:43:37.000000000 +0200
127
-+++ seafile-ccnet-4.1.2/lib/timer.c	2015-09-04 10:20:38.571964488 +0200
126
+--- seafile-ccnet-4.1.2.orig/lib/timer.c	2015-09-09 18:49:35.000000000 +0200
127
++++ seafile-ccnet-4.1.2/lib/timer.c	2015-09-09 19:22:23.519462004 +0200
128
 @@ -1,12 +1,8 @@
128
 @@ -1,12 +1,8 @@
129
  /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
129
  /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
130
  
130
  
139
  #include <sys/time.h>
139
  #include <sys/time.h>
140
  
140
  
141
 diff -rupN seafile-ccnet-4.1.2.orig/lib/utils.h seafile-ccnet-4.1.2/lib/utils.h
141
 diff -rupN seafile-ccnet-4.1.2.orig/lib/utils.h seafile-ccnet-4.1.2/lib/utils.h
142
---- seafile-ccnet-4.1.2.orig/lib/utils.h	2015-09-03 21:43:37.000000000 +0200
143
-+++ seafile-ccnet-4.1.2/lib/utils.h	2015-09-04 10:20:45.578957600 +0200
142
+--- seafile-ccnet-4.1.2.orig/lib/utils.h	2015-09-09 18:49:35.000000000 +0200
143
++++ seafile-ccnet-4.1.2/lib/utils.h	2015-09-09 19:22:23.519462004 +0200
144
 @@ -11,11 +11,7 @@
144
 @@ -11,11 +11,7 @@
145
  #include <glib-object.h>
145
  #include <glib-object.h>
146
  #include <stdlib.h>
146
  #include <stdlib.h>
153
  
153
  
154
  #ifdef WIN32
154
  #ifdef WIN32
155
  #include <errno.h>
155
  #include <errno.h>
156
+diff -rupN seafile-ccnet-4.1.2.orig/net/cluster/server.c seafile-ccnet-4.1.2/net/cluster/server.c
157
+--- seafile-ccnet-4.1.2.orig/net/cluster/server.c	2015-09-09 18:49:35.000000000 +0200
158
++++ seafile-ccnet-4.1.2/net/cluster/server.c	2015-09-09 19:24:33.800125741 +0200
159
+@@ -6,11 +6,7 @@
160
+ #include <stdio.h>
161
+ #include <getopt.h>
162
+ 
163
+-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
164
+ #include <event2/dns.h>
165
+-#else
166
+-#include <evdns.h>
167
+-#endif
168
+ 
169
+ #include "inner-session.h"
170
+ #include "outer-session.h"
156
 diff -rupN seafile-ccnet-4.1.2.orig/net/common/connect-mgr.h seafile-ccnet-4.1.2/net/common/connect-mgr.h
171
 diff -rupN seafile-ccnet-4.1.2.orig/net/common/connect-mgr.h seafile-ccnet-4.1.2/net/common/connect-mgr.h
157
---- seafile-ccnet-4.1.2.orig/net/common/connect-mgr.h	2015-09-03 21:43:37.000000000 +0200
158
-+++ seafile-ccnet-4.1.2/net/common/connect-mgr.h	2015-09-04 10:21:20.266923508 +0200
172
+--- seafile-ccnet-4.1.2.orig/net/common/connect-mgr.h	2015-09-09 18:49:35.000000000 +0200
173
++++ seafile-ccnet-4.1.2/net/common/connect-mgr.h	2015-09-09 19:22:23.520462032 +0200
159
 @@ -3,11 +3,7 @@
174
 @@ -3,11 +3,7 @@
160
  #ifndef CCNET_CONNECTION_MANAGER
175
  #ifndef CCNET_CONNECTION_MANAGER
161
  #define CCNET_CONNECTION_MANAGER
176
  #define CCNET_CONNECTION_MANAGER
169
  #include "timer.h"
184
  #include "timer.h"
170
  
185
  
171
 diff -rupN seafile-ccnet-4.1.2.orig/net/common/packet-io.c seafile-ccnet-4.1.2/net/common/packet-io.c
186
 diff -rupN seafile-ccnet-4.1.2.orig/net/common/packet-io.c seafile-ccnet-4.1.2/net/common/packet-io.c
172
---- seafile-ccnet-4.1.2.orig/net/common/packet-io.c	2015-09-03 21:43:37.000000000 +0200
173
-+++ seafile-ccnet-4.1.2/net/common/packet-io.c	2015-09-04 10:21:28.691915231 +0200
187
+--- seafile-ccnet-4.1.2.orig/net/common/packet-io.c	2015-09-09 18:49:35.000000000 +0200
188
++++ seafile-ccnet-4.1.2/net/common/packet-io.c	2015-09-09 19:22:23.521462060 +0200
174
 @@ -13,13 +13,9 @@
189
 @@ -13,13 +13,9 @@
175
  
190
  
176
  #include <unistd.h>
191
  #include <unistd.h>
186
  #include <glib.h>
201
  #include <glib.h>
187
  #include <errno.h>
202
  #include <errno.h>
188
 diff -rupN seafile-ccnet-4.1.2.orig/net/common/packet-io.h seafile-ccnet-4.1.2/net/common/packet-io.h
203
 diff -rupN seafile-ccnet-4.1.2.orig/net/common/packet-io.h seafile-ccnet-4.1.2/net/common/packet-io.h
189
---- seafile-ccnet-4.1.2.orig/net/common/packet-io.h	2015-09-03 21:43:37.000000000 +0200
190
-+++ seafile-ccnet-4.1.2/net/common/packet-io.h	2015-09-04 10:21:51.130893188 +0200
204
+--- seafile-ccnet-4.1.2.orig/net/common/packet-io.h	2015-09-09 18:49:35.000000000 +0200
205
++++ seafile-ccnet-4.1.2/net/common/packet-io.h	2015-09-09 19:22:23.521462060 +0200
191
 @@ -5,13 +5,9 @@
206
 @@ -5,13 +5,9 @@
192
  
207
  
193
  #include "packet.h"
208
  #include "packet.h"
203
  /* struct evbuffer; */
218
  /* struct evbuffer; */
204
  /* for libevent2 */
219
  /* for libevent2 */
205
 diff -rupN seafile-ccnet-4.1.2.orig/net/common/peer.c seafile-ccnet-4.1.2/net/common/peer.c
220
 diff -rupN seafile-ccnet-4.1.2.orig/net/common/peer.c seafile-ccnet-4.1.2/net/common/peer.c
206
---- seafile-ccnet-4.1.2.orig/net/common/peer.c	2015-09-03 21:43:37.000000000 +0200
207
-+++ seafile-ccnet-4.1.2/net/common/peer.c	2015-09-04 10:22:00.506883980 +0200
221
+--- seafile-ccnet-4.1.2.orig/net/common/peer.c	2015-09-09 18:49:35.000000000 +0200
222
++++ seafile-ccnet-4.1.2/net/common/peer.c	2015-09-09 19:22:23.522462088 +0200
208
 @@ -2,14 +2,10 @@
223
 @@ -2,14 +2,10 @@
209
  
224
  
210
  #include "common.h"
225
  #include "common.h"
221
  #include <stdio.h>
236
  #include <stdio.h>
222
  #include <stdlib.h>
237
  #include <stdlib.h>
223
 diff -rupN seafile-ccnet-4.1.2.orig/net/common/session.h seafile-ccnet-4.1.2/net/common/session.h
238
 diff -rupN seafile-ccnet-4.1.2.orig/net/common/session.h seafile-ccnet-4.1.2/net/common/session.h
224
---- seafile-ccnet-4.1.2.orig/net/common/session.h	2015-09-03 21:43:37.000000000 +0200
225
-+++ seafile-ccnet-4.1.2/net/common/session.h	2015-09-04 10:22:13.114871598 +0200
239
+--- seafile-ccnet-4.1.2.orig/net/common/session.h	2015-09-09 18:49:35.000000000 +0200
240
++++ seafile-ccnet-4.1.2/net/common/session.h	2015-09-09 19:22:23.523462116 +0200
226
 @@ -3,13 +3,9 @@
241
 @@ -3,13 +3,9 @@
227
  #ifndef CCNET_SESSION_H
242
  #ifndef CCNET_SESSION_H
228
  #define CCNET_SESSION_H
243
  #define CCNET_SESSION_H
237
  
252
  
238
  #include <glib.h>
253
  #include <glib.h>
239
  #include <glib/gstdio.h>
254
  #include <glib/gstdio.h>
255
+diff -rupN seafile-ccnet-4.1.2.orig/net/daemon/ccnet-daemon.c seafile-ccnet-4.1.2/net/daemon/ccnet-daemon.c
256
+--- seafile-ccnet-4.1.2.orig/net/daemon/ccnet-daemon.c	2015-09-09 18:49:35.000000000 +0200
257
++++ seafile-ccnet-4.1.2/net/daemon/ccnet-daemon.c	2015-09-09 19:24:59.313846178 +0200
258
+@@ -6,12 +6,8 @@
259
+ #include <stdio.h>
260
+ #include <getopt.h>
261
+ 
262
+-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
263
+ #include <event2/dns.h>
264
+ #include <event2/dns_compat.h>
265
+-#else
266
+-#include <evdns.h>
267
+-#endif
268
+ 
269
+ #include "daemon-session.h"
270
+ #include "rpc-service.h"
271
+diff -rupN seafile-ccnet-4.1.2.orig/net/daemon/ccnet-test.c seafile-ccnet-4.1.2/net/daemon/ccnet-test.c
272
+--- seafile-ccnet-4.1.2.orig/net/daemon/ccnet-test.c	2015-09-09 18:49:35.000000000 +0200
273
++++ seafile-ccnet-4.1.2/net/daemon/ccnet-test.c	2015-09-09 19:24:45.089444412 +0200
274
+@@ -5,11 +5,7 @@
275
+ 
276
+ #include <stdio.h>
277
+ 
278
+-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
279
+ #include <event2/dns.h>
280
+-#else
281
+-#include <evdns.h>
282
+-#endif
283
+ 
284
+ #include "utils.h"
285
+ 
286
+diff -rupN seafile-ccnet-4.1.2.orig/net/server/ccnet-server.c seafile-ccnet-4.1.2/net/server/ccnet-server.c
287
+--- seafile-ccnet-4.1.2.orig/net/server/ccnet-server.c	2015-09-09 18:49:35.000000000 +0200
288
++++ seafile-ccnet-4.1.2/net/server/ccnet-server.c	2015-09-09 19:25:53.967392265 +0200
289
+@@ -6,11 +6,7 @@
290
+ #include <stdio.h>
291
+ #include <getopt.h>
292
+ 
293
+-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
294
+ #include <event2/dns.h>
295
+-#else
296
+-#include <evdns.h>
297
+-#endif
298
+ 
299
+ #include "server-session.h"
300
+ #include "user-mgr.h"