Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

seafile-server: fix libevent2 includes

Browse source 
Signed-off-by: Gergely Kiss <mail.gery@gmail.com>
This commit is contained in:
Gergely Kiss 2015-09-14 20:24:48 +02:00
parent 4cb27e76ff
commit 08142f27da
2 changed files with 28 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/seafile-server/Makefile
View file

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

39
net/seafile-server/patches/060-libevent2-include-path.patch
View file

@ -1,6 +1,6 @@
diff -rupN seafile-server-4.1.2.orig/lib/net.c seafile-server-4.1.2/lib/net.c 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.orig/lib/net.c 2015-09-09 19:31:56.000000000 +0200
+++ seafile-server-4.1.2/lib/net.c 2015-09-04 10:46:36.738363233 +0200 +++ seafile-server-4.1.2/lib/net.c 2015-09-14 20:20:30.906021296 +0200
@@ -31,11 +31,7 @@ @@ -31,11 +31,7 @@
#include <fcntl.h> #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" #include "net.h"
diff -rupN seafile-server-4.1.2.orig/lib/net.h seafile-server-4.1.2/lib/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.orig/lib/net.h 2015-09-09 19:31:56.000000000 +0200
+++ seafile-server-4.1.2/lib/net.h 2015-09-04 10:46:42.595357284 +0200 +++ seafile-server-4.1.2/lib/net.h 2015-09-14 20:20:30.906021296 +0200
@@ -19,11 +19,7 @@ @@ -19,11 +19,7 @@
#include <netinet/tcp.h> #include <netinet/tcp.h>
#endif #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 #ifdef WIN32
#define ECONNREFUSED WSAECONNREFUSED #define ECONNREFUSED WSAECONNREFUSED
diff -rupN seafile-server-4.1.2.orig/lib/utils.h seafile-server-4.1.2/lib/utils.h 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.orig/lib/utils.h 2015-09-09 19:31:56.000000000 +0200
+++ seafile-server-4.1.2/lib/utils.h 2015-09-04 10:46:47.761352039 +0200 +++ seafile-server-4.1.2/lib/utils.h 2015-09-14 20:20:30.907021326 +0200
@@ -13,11 +13,7 @@ @@ -13,11 +13,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <sys/stat.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__ #ifdef __linux__
#include <endian.h> #include <endian.h>
diff -rupN seafile-server-4.1.2.orig/server/access-file.c seafile-server-4.1.2/server/access-file.c 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.orig/server/access-file.c 2015-09-09 19:31:56.000000000 +0200
+++ seafile-server-4.1.2/server/access-file.c 2015-09-04 10:46:05.514394990 +0200 +++ seafile-server-4.1.2/server/access-file.c 2015-09-14 20:20:30.907021326 +0200
@@ -3,13 +3,9 @@ @@ -3,13 +3,9 @@
#define DEBUG_FLAG SEAFILE_DEBUG_HTTP #define DEBUG_FLAG SEAFILE_DEBUG_HTTP
#include "log.h" #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> #include <evhtp.h>
diff -rupN seafile-server-4.1.2.orig/server/http-server.c seafile-server-4.1.2/server/http-server.c 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.orig/server/http-server.c 2015-09-09 19:31:56.000000000 +0200
+++ seafile-server-4.1.2/server/http-server.c 2015-09-04 10:46:15.905384414 +0200 +++ seafile-server-4.1.2/server/http-server.c 2015-09-14 20:20:30.908021355 +0200
@@ -6,11 +6,7 @@ @@ -6,11 +6,7 @@
#include <locale.h> #include <locale.h>
#include <sys/types.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> #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 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.orig/server/upload-file.c 2015-09-09 19:31:56.000000000 +0200
+++ seafile-server-4.1.2/server/upload-file.c 2015-09-04 10:46:23.817376367 +0200 +++ seafile-server-4.1.2/server/upload-file.c 2015-09-14 20:20:30.909021385 +0200
@@ -6,11 +6,7 @@ @@ -6,11 +6,7 @@
#include <getopt.h> #include <getopt.h>
#include <fcntl.h> #include <fcntl.h>