Ver código fonte

seafile-server: fix libevent2 includes

Signed-off-by: Gergely Kiss <mail.gery@gmail.com>
Gergely Kiss 9 anos atrás
pai
commit
08142f27da

+ 1
- 1
net/seafile-server/Makefile Ver arquivo

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
9 9
 
10 10
 PKG_NAME:=seafile-server
11 11
 PKG_VERSION:=4.1.2
12
-PKG_RELEASE=$(PKG_SOURCE_VERSION)-3
12
+PKG_RELEASE=$(PKG_SOURCE_VERSION)-4
13 13
 PKG_LICENSE:=GPL-3.0
14 14
 
15 15
 PKG_SOURCE_PROTO:=git

+ 27
- 12
net/seafile-server/patches/060-libevent2-include-path.patch Ver arquivo

@@ -1,6 +1,6 @@
1 1
 diff -rupN seafile-server-4.1.2.orig/lib/net.c seafile-server-4.1.2/lib/net.c
2
---- seafile-server-4.1.2.orig/lib/net.c	2015-09-04 10:43:14.000000000 +0200
3
-+++ seafile-server-4.1.2/lib/net.c	2015-09-04 10:46:36.738363233 +0200
2
+--- seafile-server-4.1.2.orig/lib/net.c	2015-09-09 19:31:56.000000000 +0200
3
++++ seafile-server-4.1.2/lib/net.c	2015-09-14 20:20:30.906021296 +0200
4 4
 @@ -31,11 +31,7 @@
5 5
  
6 6
  #include <fcntl.h>
@@ -14,8 +14,8 @@ diff -rupN seafile-server-4.1.2.orig/lib/net.c seafile-server-4.1.2/lib/net.c
14 14
  #include "net.h"
15 15
  
16 16
 diff -rupN seafile-server-4.1.2.orig/lib/net.h seafile-server-4.1.2/lib/net.h
17
---- seafile-server-4.1.2.orig/lib/net.h	2015-09-04 10:43:14.000000000 +0200
18
-+++ seafile-server-4.1.2/lib/net.h	2015-09-04 10:46:42.595357284 +0200
17
+--- seafile-server-4.1.2.orig/lib/net.h	2015-09-09 19:31:56.000000000 +0200
18
++++ seafile-server-4.1.2/lib/net.h	2015-09-14 20:20:30.906021296 +0200
19 19
 @@ -19,11 +19,7 @@
20 20
      #include <netinet/tcp.h>
21 21
  #endif
@@ -29,8 +29,8 @@ diff -rupN seafile-server-4.1.2.orig/lib/net.h seafile-server-4.1.2/lib/net.h
29 29
  #ifdef WIN32
30 30
      #define ECONNREFUSED WSAECONNREFUSED
31 31
 diff -rupN seafile-server-4.1.2.orig/lib/utils.h seafile-server-4.1.2/lib/utils.h
32
---- seafile-server-4.1.2.orig/lib/utils.h	2015-09-04 10:43:14.000000000 +0200
33
-+++ seafile-server-4.1.2/lib/utils.h	2015-09-04 10:46:47.761352039 +0200
32
+--- seafile-server-4.1.2.orig/lib/utils.h	2015-09-09 19:31:56.000000000 +0200
33
++++ seafile-server-4.1.2/lib/utils.h	2015-09-14 20:20:30.907021326 +0200
34 34
 @@ -13,11 +13,7 @@
35 35
  #include <stdlib.h>
36 36
  #include <sys/stat.h>
@@ -44,8 +44,8 @@ diff -rupN seafile-server-4.1.2.orig/lib/utils.h seafile-server-4.1.2/lib/utils.
44 44
  #ifdef __linux__
45 45
  #include <endian.h>
46 46
 diff -rupN seafile-server-4.1.2.orig/server/access-file.c seafile-server-4.1.2/server/access-file.c
47
---- seafile-server-4.1.2.orig/server/access-file.c	2015-09-04 10:43:14.000000000 +0200
48
-+++ seafile-server-4.1.2/server/access-file.c	2015-09-04 10:46:05.514394990 +0200
47
+--- seafile-server-4.1.2.orig/server/access-file.c	2015-09-09 19:31:56.000000000 +0200
48
++++ seafile-server-4.1.2/server/access-file.c	2015-09-14 20:20:30.907021326 +0200
49 49
 @@ -3,13 +3,9 @@
50 50
  #define DEBUG_FLAG SEAFILE_DEBUG_HTTP
51 51
  #include "log.h"
@@ -61,8 +61,8 @@ diff -rupN seafile-server-4.1.2.orig/server/access-file.c seafile-server-4.1.2/s
61 61
  #include <evhtp.h>
62 62
  
63 63
 diff -rupN seafile-server-4.1.2.orig/server/http-server.c seafile-server-4.1.2/server/http-server.c
64
---- seafile-server-4.1.2.orig/server/http-server.c	2015-09-04 10:43:14.000000000 +0200
65
-+++ seafile-server-4.1.2/server/http-server.c	2015-09-04 10:46:15.905384414 +0200
64
+--- seafile-server-4.1.2.orig/server/http-server.c	2015-09-09 19:31:56.000000000 +0200
65
++++ seafile-server-4.1.2/server/http-server.c	2015-09-14 20:20:30.908021355 +0200
66 66
 @@ -6,11 +6,7 @@
67 67
  #include <locale.h>
68 68
  #include <sys/types.h>
@@ -75,9 +75,24 @@ diff -rupN seafile-server-4.1.2.orig/server/http-server.c seafile-server-4.1.2/s
75 75
  
76 76
  #include <evhtp.h>
77 77
  
78
+diff -rupN seafile-server-4.1.2.orig/server/listen-mgr.c seafile-server-4.1.2/server/listen-mgr.c
79
+--- seafile-server-4.1.2.orig/server/listen-mgr.c	2015-09-09 19:31:56.000000000 +0200
80
++++ seafile-server-4.1.2/server/listen-mgr.c	2015-09-14 20:23:15.614452334 +0200
81
+@@ -3,11 +3,9 @@
82
+ #include <event2/event.h>
83
+ #include <event2/listener.h>
84
+ 
85
+-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
86
+ #include <event2/bufferevent.h>
87
+ #include <event2/buffer_compat.h>
88
+ #include <event2/bufferevent_struct.h>
89
+-#endif
90
+ 
91
+ 
92
+ #include "seafile-session.h"
78 93
 diff -rupN seafile-server-4.1.2.orig/server/upload-file.c seafile-server-4.1.2/server/upload-file.c
79
---- seafile-server-4.1.2.orig/server/upload-file.c	2015-09-04 10:43:14.000000000 +0200
80
-+++ seafile-server-4.1.2/server/upload-file.c	2015-09-04 10:46:23.817376367 +0200
94
+--- seafile-server-4.1.2.orig/server/upload-file.c	2015-09-09 19:31:56.000000000 +0200
95
++++ seafile-server-4.1.2/server/upload-file.c	2015-09-14 20:20:30.909021385 +0200
81 96
 @@ -6,11 +6,7 @@
82 97
  #include <getopt.h>
83 98
  #include <fcntl.h>