7 files changed, 30 insertions, 15 deletions

diff --git a/net-mgmt/seafile-server/Makefile b/net-mgmt/seafile-server/Makefile
index 00e77b703131..680452860a05 100644
--- a/net-mgmt/seafile-server/Makefile
+++ b/net-mgmt/seafile-server/Makefile
@@ -4,7 +4,6 @@ PORTNAME=	seafile-server
 DISTVERSIONPREFIX=	v
 DISTVERSION=	${SEAFILE_VER}
 DISTVERSIONSUFFIX=	-server
-PORTREVISION=	1
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	ultima@FreeBSD.org
@@ -19,7 +18,6 @@ LIB_DEPENDS=	libsearpc.so:devel/libsearpc \
 		libzdb.so:databases/libzdb \
 		libcurl.so:ftp/curl \
 		libinotify.so:devel/libinotify \
-		libccnet.so:net-mgmt/ccnet-server \
 		libevent.so:devel/libevent \
 		libuuid.so:misc/e2fsprogs-libuuid \
 		libjansson.so:devel/jansson \
@@ -79,7 +77,7 @@ post-patch:
 	${REINPLACE_CMD} 's/python3\.[0-9]/${PYTHON_VERSION}/g; s/python3 /${PYTHON_VERSION} / ; \
 			s/PYTHON=python3/PYTHON=${PYTHON_VERSION}/' \
 		${WRKSRC}/controller/seafile-controller.c ${WRKSRC}/scripts/reset-admin.sh \
-		${WRKSRC}/scripts/upgrade/upgrade_7.0_7.1.sh \
+		${WRKSRC}/scripts/upgrade/upgrade_[7-9].[0-9]_[7-9].[0-9].sh \
 		${WRKSRC}/scripts/seahub.sh ${WRKSRC}/scripts/setup-seafile.sh \
 		${WRKSRC}/scripts/setup-seafile-mysql.sh \
 		${WRKSRC}/scripts/setup-seafile-mysql.py
@@ -127,7 +125,7 @@ post-install:
 		${COPYTREE_SHARE} "sql upgrade/sql" ${STAGEDIR}${PREFIX}/${SEAFILE_SERVER})
 
 makesum-all:
-.for PORT in net-mgmt/ccnet-server net-mgmt/seafile-server www/py-seafdav www/py-seafobj www/seahub
+.for PORT in net-mgmt/seafile-server www/py-seafdav www/py-seafobj www/seahub
 	${MAKE} -C "${PORTSDIR}/${PORT}" makesum
 .endfor
 
diff --git a/net-mgmt/seafile-server/Makefile.include b/net-mgmt/seafile-server/Makefile.include
index e9722b2cfbf0..e2405aee8a15 100644
--- a/net-mgmt/seafile-server/Makefile.include
+++ b/net-mgmt/seafile-server/Makefile.include
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
-SEAFILE_VER=7.1.5
-SEAHUB_VER=7.1.9
+SEAFILE_VER=	8.0.3
+SEAHUB_VER=	8.0.3
 
 
 # Various vars used in most/all the Makefiles
diff --git a/net-mgmt/seafile-server/distinfo b/net-mgmt/seafile-server/distinfo
index 3fc5e5197a59..06cdc60c4135 100644
--- a/net-mgmt/seafile-server/distinfo
+++ b/net-mgmt/seafile-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1602650816
-SHA256 (haiwen-seafile-server-v7.1.5-server_GH0.tar.gz) = 407a6243f754e366ce6754a2aa643574aa7742d4e81b7cc350dea348f3063707
-SIZE (haiwen-seafile-server-v7.1.5-server_GH0.tar.gz) = 685771
+TIMESTAMP = 1611596148
+SHA256 (haiwen-seafile-server-v8.0.3-server_GH0.tar.gz) = 0221bc4e66003761e4aa74c992a668895c4aec303c6fa59152376ab1846447f7
+SIZE (haiwen-seafile-server-v8.0.3-server_GH0.tar.gz) = 718074
diff --git a/net-mgmt/seafile-server/files/patch-server_Makefile.am b/net-mgmt/seafile-server/files/patch-server_Makefile.am
index b73f23bfced4..a48370d0613d 100644
--- a/net-mgmt/seafile-server/files/patch-server_Makefile.am
+++ b/net-mgmt/seafile-server/files/patch-server_Makefile.am
@@ -1,9 +1,9 @@
---- server/Makefile.am.orig	2020-02-09 00:56:37 UTC
+--- server/Makefile.am.orig	2021-01-23 07:40:16 UTC
 +++ server/Makefile.am
-@@ -73,7 +73,7 @@ seaf_server_SOURCES = \
+@@ -77,7 +77,7 @@ seaf_server_SOURCES = \
+ 	../common/block-tx-utils.c
  
- seaf_server_LDADD = @CCNET_LIBS@ \
- 	$(top_builddir)/lib/libseafile_common.la \
+ seaf_server_LDADD = $(top_builddir)/lib/libseafile_common.la \
 -	@GLIB2_LIBS@ @GOBJECT_LIBS@ @SSL_LIBS@ @LIB_RT@ @LIB_UUID@ -lsqlite3 @LIBEVENT_LIBS@ -levhtp \
 +	@ONIGURUMA_LIBS@ @GLIB2_LIBS@ @GOBJECT_LIBS@ @SSL_LIBS@ @LIB_RT@ @LIB_UUID@ -lsqlite3 @LIBEVENT_LIBS@ @LIBEVHTP_LIBS@ \
  	$(top_builddir)/common/cdc/libcdc.la \
diff --git a/net-mgmt/seafile-server/files/patch-server_seaf-server.c b/net-mgmt/seafile-server/files/patch-server_seaf-server.c
new file mode 100644
index 000000000000..b86e02ea5a72
--- /dev/null
+++ b/net-mgmt/seafile-server/files/patch-server_seaf-server.c
@@ -0,0 +1,11 @@
+--- server/seaf-server.c.orig	2021-01-31 19:59:11 UTC
++++ server/seaf-server.c
+@@ -4,6 +4,8 @@
+ 
+ #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+ #include <event2/event.h>
++#include <event2/event_compat.h>
++#include <event2/event_struct.h>
+ #else
+ #include <event.h>
+ #endif
diff --git a/net-mgmt/seafile-server/files/seafile.in b/net-mgmt/seafile-server/files/seafile.in
index cb44eec44c2d..4c395711fef6 100644
--- a/net-mgmt/seafile-server/files/seafile.in
+++ b/net-mgmt/seafile-server/files/seafile.in
@@ -109,7 +109,9 @@ seafile_start() {
 	check_required_before;
 	validate_already_running;
 	prepare_env;
-	test_config;
+# test_config broke in 8.0.x, commenting until this is fixed.
+# https://forum.seafile.com/t/seafile-controller-t-functionality-broken-on-8-x/13738
+#	test_config;
 
 	echo "Starting seafile server, please wait ..."
 
diff --git a/net-mgmt/seafile-server/pkg-plist b/net-mgmt/seafile-server/pkg-plist
index 5ba33287817c..cbebabbdc5f8 100644
--- a/net-mgmt/seafile-server/pkg-plist
+++ b/net-mgmt/seafile-server/pkg-plist
@@ -11,7 +11,6 @@ libdata/pkgconfig/libseafile.pc
 %%SEAFILE_SERVER%%/seafile/bin/seaf-fsck
 %%FUSE%%%%SEAFILE_SERVER%%/seafile/bin/seaf-fuse
 %%SEAFILE_SERVER%%/seafile/bin/seaf-server
-%%SEAFILE_SERVER%%/seafile/bin/seaf-server-init
 %%SEAFILE_SERVER%%/seafile/bin/seafile-controller
 %%SEAFILE_SERVER%%/seafile/bin/seafserv-gc
 %%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/seafile/__init__.py
@@ -111,6 +110,10 @@ libdata/pkgconfig/libseafile.pc
 %%SEAFILE_SERVER%%/upgrade/sql/7.0.0/sqlite3/seahub.sql
 %%SEAFILE_SERVER%%/upgrade/sql/7.1.0/mysql/seahub.sql
 %%SEAFILE_SERVER%%/upgrade/sql/7.1.0/sqlite3/seahub.sql
+%%SEAFILE_SERVER%%/upgrade/sql/8.0.0/mysql/seafevents.sql
+%%SEAFILE_SERVER%%/upgrade/sql/8.0.0/mysql/seahub.sql
+%%SEAFILE_SERVER%%/upgrade/sql/8.0.0/sqlite3/seafevents.sql
+%%SEAFILE_SERVER%%/upgrade/sql/8.0.0/sqlite3/seahub.sql
 %%SEAFILE_SERVER%%/upgrade/upgrade_1.2_1.3.sh
 %%SEAFILE_SERVER%%/upgrade/upgrade_1.3_1.4.sh
 %%SEAFILE_SERVER%%/upgrade/upgrade_1.4_1.5.sh
@@ -135,3 +138,4 @@ libdata/pkgconfig/libseafile.pc
 %%SEAFILE_SERVER%%/upgrade/upgrade_6.2_6.3.sh
 %%SEAFILE_SERVER%%/upgrade/upgrade_6.3_7.0.sh
 %%SEAFILE_SERVER%%/upgrade/upgrade_7.0_7.1.sh
+%%SEAFILE_SERVER%%/upgrade/upgrade_7.1_8.0.sh