aboutsummaryrefslogtreecommitdiff
path: root/net-mgmt
diff options
context:
space:
mode:
Diffstat (limited to 'net-mgmt')
-rw-r--r--net-mgmt/ccnet-server/distinfo6
-rw-r--r--net-mgmt/seafile-server/Makefile1
-rw-r--r--net-mgmt/seafile-server/Makefile.include4
-rw-r--r--net-mgmt/seafile-server/distinfo6
-rw-r--r--net-mgmt/seafile-server/files/patch-controller_seafile-controller.c19
-rw-r--r--net-mgmt/seafile-server/pkg-plist8
6 files changed, 26 insertions, 18 deletions
diff --git a/net-mgmt/ccnet-server/distinfo b/net-mgmt/ccnet-server/distinfo
index bfef4b105254..1c8f86a487c0 100644
--- a/net-mgmt/ccnet-server/distinfo
+++ b/net-mgmt/ccnet-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1517419066
-SHA256 (haiwen-ccnet-server-v6.2.5-server_GH0.tar.gz) = e7094278cf1ffdda852e18acb7d968200916c187517fc41284ec2f759aa8abeb
-SIZE (haiwen-ccnet-server-v6.2.5-server_GH0.tar.gz) = 212992
+TIMESTAMP = 1528566137
+SHA256 (haiwen-ccnet-server-v6.3.1-server_GH0.tar.gz) = 024e559b9eddbfdb766339027999decee1a1ea92a81c309d6f6e00046a60700a
+SIZE (haiwen-ccnet-server-v6.3.1-server_GH0.tar.gz) = 216370
diff --git a/net-mgmt/seafile-server/Makefile b/net-mgmt/seafile-server/Makefile
index d6c3bcd88a9e..4d2795767903 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
diff --git a/net-mgmt/seafile-server/Makefile.include b/net-mgmt/seafile-server/Makefile.include
index e825e8266eb1..8b173f3b9e05 100644
--- a/net-mgmt/seafile-server/Makefile.include
+++ b/net-mgmt/seafile-server/Makefile.include
@@ -1,7 +1,7 @@
# $FreeBSD$
-SEAFILE_VER=6.2.5
-SEAHUB_VER=6.2.12
+SEAFILE_VER=6.3.1
+SEAHUB_VER=6.3.1
# Various vars used in most/all the Makefiles
diff --git a/net-mgmt/seafile-server/distinfo b/net-mgmt/seafile-server/distinfo
index 0234771accd7..5969b6ac50ed 100644
--- a/net-mgmt/seafile-server/distinfo
+++ b/net-mgmt/seafile-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1517419067
-SHA256 (haiwen-seafile-server-v6.2.5-server_GH0.tar.gz) = 8cc17303b3b3949cfb4e914264f6446057bb2eee0b5e6e3a3399294ab566c0e0
-SIZE (haiwen-seafile-server-v6.2.5-server_GH0.tar.gz) = 711930
+TIMESTAMP = 1528566141
+SHA256 (haiwen-seafile-server-v6.3.1-server_GH0.tar.gz) = ccde67afe34baeea076e9bbfe98328d9328dadcafd915dc9f1ddbca3d2e0d9fe
+SIZE (haiwen-seafile-server-v6.3.1-server_GH0.tar.gz) = 721025
diff --git a/net-mgmt/seafile-server/files/patch-controller_seafile-controller.c b/net-mgmt/seafile-server/files/patch-controller_seafile-controller.c
index faf0d559b384..a5324526a59a 100644
--- a/net-mgmt/seafile-server/files/patch-controller_seafile-controller.c
+++ b/net-mgmt/seafile-server/files/patch-controller_seafile-controller.c
@@ -1,4 +1,4 @@
---- controller/seafile-controller.c.orig 2016-11-12 03:30:44 UTC
+--- controller/seafile-controller.c.orig 2018-04-27 06:38:45 UTC
+++ controller/seafile-controller.c
@@ -17,6 +17,19 @@
#include "log.h"
@@ -20,7 +20,7 @@
#define CHECK_PROCESS_INTERVAL 10 /* every 10 seconds */
SeafileController *ctl;
-@@ -244,7 +257,20 @@ static void
+@@ -259,7 +272,20 @@ static void
init_seafile_path ()
{
GError *error = NULL;
@@ -41,7 +41,7 @@
char *tmp = NULL;
if (error != NULL) {
seaf_warning ("failed to readlink: %s\n", error->message);
-@@ -258,7 +284,9 @@ init_seafile_path ()
+@@ -273,7 +299,9 @@ init_seafile_path ()
topdir = g_path_get_dirname (installpath);
@@ -51,7 +51,7 @@
g_free (tmp);
}
-@@ -400,11 +428,40 @@ need_restart (int which)
+@@ -415,12 +443,41 @@ need_restart (int which)
return FALSE;
} else {
char buf[256];
@@ -68,6 +68,7 @@
if (g_file_test (buf, G_FILE_TEST_IS_DIR)) {
return FALSE;
} else {
+ seaf_warning ("path /proc/%d doesn't exist, restart progress [%d]\n", pid, which);
return TRUE;
+ }
+
@@ -80,9 +81,9 @@
+#endif
+ size_t len = sizeof(struct kinfo_proc);
+ struct kinfo_proc kp;
-+ if (sysctl(mib, sizeof(mib)/sizeof(mib[0]), &kp, &len, NULL, 0) != -1 &&
-+ len == sizeof(struct kinfo_proc)) {
-+ return FALSE;
++ if (sysctl(mib, sizeof(mib)/sizeof(mib[0]), &kp, &len, NULL, 0) != -1 &&
++ len == sizeof(struct kinfo_proc)) {
++ return FALSE;
+ } else {
+ return TRUE;
+ }
@@ -92,7 +93,7 @@
}
}
}
-@@ -890,6 +947,9 @@ int main (int argc, char **argv)
+@@ -913,6 +970,9 @@ int main (int argc, char **argv)
exit (1);
}
@@ -102,7 +103,7 @@
char *config_dir = DEFAULT_CONFIG_DIR;
char *central_config_dir = NULL;
char *seafile_dir = NULL;
-@@ -926,7 +986,7 @@ int main (int argc, char **argv)
+@@ -949,7 +1009,7 @@ int main (int argc, char **argv)
case 'f':
daemon_mode = 0;
break;
diff --git a/net-mgmt/seafile-server/pkg-plist b/net-mgmt/seafile-server/pkg-plist
index 16c6f53fe6bd..b2dd6c615261 100644
--- a/net-mgmt/seafile-server/pkg-plist
+++ b/net-mgmt/seafile-server/pkg-plist
@@ -92,6 +92,13 @@ libdata/pkgconfig/libseafile.pc
%%SEAFILE_SERVER%%/upgrade/sql/6.2.0/mysql/seahub.sql
%%SEAFILE_SERVER%%/upgrade/sql/6.2.0/sqlite3/ccnet/usermgr.sql
%%SEAFILE_SERVER%%/upgrade/sql/6.2.0/sqlite3/seahub.sql
+%%SEAFILE_SERVER%%/upgrade/sql/6.3.0/mysql/ccnet.sql
+%%SEAFILE_SERVER%%/upgrade/sql/6.3.0/mysql/seafevents.sql
+%%SEAFILE_SERVER%%/upgrade/sql/6.3.0/mysql/%%USERS%%.sql
+%%SEAFILE_SERVER%%/upgrade/sql/6.3.0/mysql/seahub.sql
+%%SEAFILE_SERVER%%/upgrade/sql/6.3.0/sqlite3/ccnet/groupmgr.sql
+%%SEAFILE_SERVER%%/upgrade/sql/6.3.0/sqlite3/seafevents.sql
+%%SEAFILE_SERVER%%/upgrade/sql/6.3.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
@@ -113,4 +120,5 @@ libdata/pkgconfig/libseafile.pc
%%SEAFILE_SERVER%%/upgrade/upgrade_5.1_6.0.sh
%%SEAFILE_SERVER%%/upgrade/upgrade_6.0_6.1.sh
%%SEAFILE_SERVER%%/upgrade/upgrade_6.1_6.2.sh
+%%SEAFILE_SERVER%%/upgrade/upgrade_6.2_6.3.sh
@dir(%%USERS%%,%%GROUPS%%,755) %%HAIWENDIR%%
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-22 13:27:33 +0000