seafile-server: fix libevent2 includes

Signed-off-by: Gergely Kiss <mail.gery@gmail.com>

2 files changed, 28 insertions, 13 deletions

diff --git a/net/seafile-server/Makefile b/net/seafile-server/Makefile
index ab6725713..ebc113285 100644
--- a/net/seafile-server/Makefile
+++ b/net/seafile-server/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=seafile-server
 PKG_VERSION:=4.1.2
-PKG_RELEASE=$(PKG_SOURCE_VERSION)-3
+PKG_RELEASE=$(PKG_SOURCE_VERSION)-4
 PKG_LICENSE:=GPL-3.0
 
 PKG_SOURCE_PROTO:=git
diff --git a/net/seafile-server/patches/060-libevent2-include-path.patch b/net/seafile-server/patches/060-libevent2-include-path.patch
index 2a7961772..958a13647 100644
--- a/net/seafile-server/patches/060-libevent2-include-path.patch
+++ b/net/seafile-server/patches/060-libevent2-include-path.patch
@@ -1,6 +1,6 @@
 diff -rupN seafile-server-4.1.2.orig/lib/net.c seafile-server-4.1.2/lib/net.c
---- seafile-server-4.1.2.orig/lib/net.c	2015-09-04 10:43:14.000000000 +0200
-+++ seafile-server-4.1.2/lib/net.c	2015-09-04 10:46:36.738363233 +0200
+--- seafile-server-4.1.2.orig/lib/net.c	2015-09-09 19:31:56.000000000 +0200
++++ seafile-server-4.1.2/lib/net.c	2015-09-14 20:20:30.906021296 +0200
 @@ -31,11 +31,7 @@
  
  #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
  #include "net.h"
  
 diff -rupN seafile-server-4.1.2.orig/lib/net.h seafile-server-4.1.2/lib/net.h
---- seafile-server-4.1.2.orig/lib/net.h	2015-09-04 10:43:14.000000000 +0200
-+++ seafile-server-4.1.2/lib/net.h	2015-09-04 10:46:42.595357284 +0200
+--- seafile-server-4.1.2.orig/lib/net.h	2015-09-09 19:31:56.000000000 +0200
++++ seafile-server-4.1.2/lib/net.h	2015-09-14 20:20:30.906021296 +0200
 @@ -19,11 +19,7 @@
      #include <netinet/tcp.h>
  #endif
@@ -29,8 +29,8 @@ diff -rupN seafile-server-4.1.2.orig/lib/net.h seafile-server-4.1.2/lib/net.h
  #ifdef WIN32
      #define ECONNREFUSED WSAECONNREFUSED
 diff -rupN seafile-server-4.1.2.orig/lib/utils.h seafile-server-4.1.2/lib/utils.h
---- seafile-server-4.1.2.orig/lib/utils.h	2015-09-04 10:43:14.000000000 +0200
-+++ seafile-server-4.1.2/lib/utils.h	2015-09-04 10:46:47.761352039 +0200
+--- seafile-server-4.1.2.orig/lib/utils.h	2015-09-09 19:31:56.000000000 +0200
++++ seafile-server-4.1.2/lib/utils.h	2015-09-14 20:20:30.907021326 +0200
 @@ -13,11 +13,7 @@
  #include <stdlib.h>
  #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.
  #ifdef __linux__
  #include <endian.h>
 diff -rupN seafile-server-4.1.2.orig/server/access-file.c seafile-server-4.1.2/server/access-file.c
---- seafile-server-4.1.2.orig/server/access-file.c	2015-09-04 10:43:14.000000000 +0200
-+++ seafile-server-4.1.2/server/access-file.c	2015-09-04 10:46:05.514394990 +0200
+--- seafile-server-4.1.2.orig/server/access-file.c	2015-09-09 19:31:56.000000000 +0200
++++ seafile-server-4.1.2/server/access-file.c	2015-09-14 20:20:30.907021326 +0200
 @@ -3,13 +3,9 @@
  #define DEBUG_FLAG SEAFILE_DEBUG_HTTP
  #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
  #include <evhtp.h>
  
 diff -rupN seafile-server-4.1.2.orig/server/http-server.c seafile-server-4.1.2/server/http-server.c
---- seafile-server-4.1.2.orig/server/http-server.c	2015-09-04 10:43:14.000000000 +0200
-+++ seafile-server-4.1.2/server/http-server.c	2015-09-04 10:46:15.905384414 +0200
+--- seafile-server-4.1.2.orig/server/http-server.c	2015-09-09 19:31:56.000000000 +0200
++++ seafile-server-4.1.2/server/http-server.c	2015-09-14 20:20:30.908021355 +0200
 @@ -6,11 +6,7 @@
  #include <locale.h>
  #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
  
  #include <evhtp.h>
  
+diff -rupN seafile-server-4.1.2.orig/server/listen-mgr.c seafile-server-4.1.2/server/listen-mgr.c
+--- seafile-server-4.1.2.orig/server/listen-mgr.c	2015-09-09 19:31:56.000000000 +0200
++++ seafile-server-4.1.2/server/listen-mgr.c	2015-09-14 20:23:15.614452334 +0200
+@@ -3,11 +3,9 @@
+ #include <event2/event.h>
+ #include <event2/listener.h>
+ 
+-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+ #include <event2/bufferevent.h>
+ #include <event2/buffer_compat.h>
+ #include <event2/bufferevent_struct.h>
+-#endif
+ 
+ 
+ #include "seafile-session.h"
 diff -rupN seafile-server-4.1.2.orig/server/upload-file.c seafile-server-4.1.2/server/upload-file.c
---- seafile-server-4.1.2.orig/server/upload-file.c	2015-09-04 10:43:14.000000000 +0200
-+++ seafile-server-4.1.2/server/upload-file.c	2015-09-04 10:46:23.817376367 +0200
+--- seafile-server-4.1.2.orig/server/upload-file.c	2015-09-09 19:31:56.000000000 +0200
++++ seafile-server-4.1.2/server/upload-file.c	2015-09-14 20:20:30.909021385 +0200
 @@ -6,11 +6,7 @@
  #include <getopt.h>
  #include <fcntl.h>