Richard Gallamore 2019-06-10 01:25:07 +00:00
parent 71ec413eb2
commit 97a34f3e89
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=503869
12 changed files with 972 additions and 133 deletions

View file

@ -3,7 +3,6 @@
PORTNAME= ccnet-server
DISTVERSIONPREFIX= v
DISTVERSION= ${SEAFILE_VER}
PORTREVISION= 2
DISTVERSIONSUFFIX= -server
CATEGORIES= net-mgmt devel
@ -21,7 +20,7 @@ LIB_DEPENDS= libsearpc.so:devel/libsearpc \
libevent.so:devel/libevent \
libjansson.so:devel/jansson
USES= autoreconf libtool localbase mysql:client pathfix \
USES= autoreconf gnome libtool localbase mysql:client pathfix \
pgsql pkgconfig python:-2.7 shebangfix ssl
USE_GITHUB= yes
GH_ACCOUNT= haiwen

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1537117863
SHA256 (haiwen-ccnet-server-v6.3.4-server_GH0.tar.gz) = ab3d5bda728f87c71929a6247c9f74c5209b9b8e44bafa77db91e8de590ec6ef
SIZE (haiwen-ccnet-server-v6.3.4-server_GH0.tar.gz) = 217205
TIMESTAMP = 1559327658
SHA256 (haiwen-ccnet-server-v7.0.1-server_GH0.tar.gz) = 52d3824891daf0ba7361a46c290582e782ce8b8e5bd3964b80c5a0ced8c72ae7
SIZE (haiwen-ccnet-server-v7.0.1-server_GH0.tar.gz) = 218014

View file

@ -3,7 +3,6 @@
PORTNAME= seafile-server
DISTVERSIONPREFIX= v
DISTVERSION= ${SEAFILE_VER}
PORTREVISION= 2
DISTVERSIONSUFFIX= -server
CATEGORIES= net-mgmt
@ -29,7 +28,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
CONFLICTS= seafile-[0-9]*
USES= autoreconf compiler:c11 iconv libarchive libtool localbase mysql \
USES= autoreconf compiler:c11 gnome iconv libarchive libtool localbase mysql \
pathfix pgsql pkgconfig python:2.7 shebangfix sqlite ssl
USE_GITHUB= yes
GH_ACCOUNT= haiwen
@ -96,8 +95,8 @@ post-install:
${STAGEDIR}${PREFIX}/${SEAFILE_SERVER}/upgrade
${INSTALL_DATA} ${WRKSRC}/doc/seafile-tutorial.doc \
${STAGEDIR}${PREFIX}/${SEAFILE_SERVER}/seafile/share/doc/seafile/
(cd ${WRKSRC}/scripts/upgrade && \
${COPYTREE_SHARE} sql ${STAGEDIR}${PREFIX}/${SEAFILE_SERVER}/upgrade)
(cd ${WRKSRC}/scripts && \
${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

View file

@ -1,7 +1,7 @@
# $FreeBSD$
SEAFILE_VER=6.3.4
SEAHUB_VER=6.3.13
SEAFILE_VER=7.0.1
SEAHUB_VER=7.0.2
# Various vars used in most/all the Makefiles

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1537117864
SHA256 (haiwen-seafile-server-v6.3.4-server_GH0.tar.gz) = 1ba4c641bad8d7592fd2592827e81470c88b8e802707d2b1e6d551c16d0da100
SIZE (haiwen-seafile-server-v6.3.4-server_GH0.tar.gz) = 727480
TIMESTAMP = 1559327660
SHA256 (haiwen-seafile-server-v7.0.1-server_GH0.tar.gz) = 652607e3394e8fa944072637aed084d5eb70942a55e69fd44b4ef5ac596d847c
SIZE (haiwen-seafile-server-v7.0.1-server_GH0.tar.gz) = 747882

View file

@ -1,4 +1,4 @@
--- controller/seafile-controller.c.orig 2018-04-27 06:38:45 UTC
--- controller/seafile-controller.c.orig 2019-03-28 10:14:20 UTC
+++ controller/seafile-controller.c
@@ -17,6 +17,19 @@
#include "log.h"
@ -19,13 +19,13 @@
+
#define CHECK_PROCESS_INTERVAL 10 /* every 10 seconds */
SeafileController *ctl;
@@ -259,7 +272,20 @@ static void
#if defined(__sun)
@@ -265,7 +278,20 @@ static void
init_seafile_path ()
{
GError *error = NULL;
+#if defined(__linux__)
char *binary = g_file_read_link ("/proc/self/exe", &error);
char *binary = g_file_read_link (PROC_SELF_PATH, &error);
+#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__)
+ /*
+ * seafile.sh starts the process using abs path
@ -41,7 +41,7 @@
char *tmp = NULL;
if (error != NULL) {
seaf_warning ("failed to readlink: %s\n", error->message);
@@ -273,7 +299,9 @@ init_seafile_path ()
@@ -279,7 +305,9 @@ init_seafile_path ()
topdir = g_path_get_dirname (installpath);
@ -51,7 +51,7 @@
g_free (tmp);
}
@@ -415,12 +443,41 @@ need_restart (int which)
@@ -457,12 +485,41 @@ need_restart (int which)
return FALSE;
} else {
char buf[256];
@ -93,7 +93,7 @@
}
}
}
@@ -913,6 +970,9 @@ int main (int argc, char **argv)
@@ -980,6 +1037,9 @@ int main (int argc, char **argv)
exit (1);
}
@ -103,7 +103,7 @@
char *config_dir = DEFAULT_CONFIG_DIR;
char *central_config_dir = NULL;
char *seafile_dir = NULL;
@@ -949,7 +1009,7 @@ int main (int argc, char **argv)
@@ -1016,7 +1076,7 @@ int main (int argc, char **argv)
case 'f':
daemon_mode = 0;
break;

View file

@ -42,6 +42,13 @@ libdata/pkgconfig/libseafile.pc
%%SEAFILE_SERVER%%/setup-seafile.sh
%%SEAFILE_SERVER%%/sqlite2mysql.py
%%SEAFILE_SERVER%%/sqlite2mysql.sh
%%SEAFILE_SERVER%%/sql/mysql/ccnet.sql
%%SEAFILE_SERVER%%/sql/mysql/%%USERS%%.sql
%%SEAFILE_SERVER%%/sql/sqlite/config.sql
%%SEAFILE_SERVER%%/sql/sqlite/groupmgr.sql
%%SEAFILE_SERVER%%/sql/sqlite/org.sql
%%SEAFILE_SERVER%%/sql/sqlite/%%USERS%%.sql
%%SEAFILE_SERVER%%/sql/sqlite/user.sql
%%SEAFILE_SERVER%%/upgrade/add_collate.sh
%%SEAFILE_SERVER%%/upgrade/db_update_1.3_1.4.py
%%SEAFILE_SERVER%%/upgrade/db_update_helper.py
@ -101,6 +108,12 @@ libdata/pkgconfig/libseafile.pc
%%SEAFILE_SERVER%%/upgrade/sql/6.3.0/sqlite3/seafevents.sql
%%SEAFILE_SERVER%%/upgrade/sql/6.3.0/sqlite3/%%USERS%%.sql
%%SEAFILE_SERVER%%/upgrade/sql/6.3.0/sqlite3/seahub.sql
%%SEAFILE_SERVER%%/upgrade/sql/7.0.0/mysql/ccnet.sql
%%SEAFILE_SERVER%%/upgrade/sql/7.0.0/mysql/%%USERS%%.sql
%%SEAFILE_SERVER%%/upgrade/sql/7.0.0/mysql/seahub.sql
%%SEAFILE_SERVER%%/upgrade/sql/7.0.0/sqlite3/ccnet/usermgr.sql
%%SEAFILE_SERVER%%/upgrade/sql/7.0.0/sqlite3/%%USERS%%.sql
%%SEAFILE_SERVER%%/upgrade/sql/7.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
@ -123,4 +136,5 @@ libdata/pkgconfig/libseafile.pc
%%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
%%SEAFILE_SERVER%%/upgrade/upgrade_6.3_7.0.sh
@dir(%%USERS%%,%%GROUPS%%,755) %%HAIWENDIR%%

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1552690862
SHA256 (haiwen-seafdav-v6.3.13-pro_GH0.tar.gz) = a46767919e68e84d75591eba413629ade9240eadb24000a4e3f81461853d9c42
SIZE (haiwen-seafdav-v6.3.13-pro_GH0.tar.gz) = 2556426
TIMESTAMP = 1558051273
SHA256 (haiwen-seafdav-v7.0.2-pro_GH0.tar.gz) = e5682f8424e8e8bfcf816a25e607525a54713df3ef8e1679e14c230a6162e106
SIZE (haiwen-seafdav-v7.0.2-pro_GH0.tar.gz) = 2556408

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1552690865
SHA256 (haiwen-seafobj-v6.3.13-pro_GH0.tar.gz) = 58090cdf6bec663ff7b56b1d31ba2f934af00487fb17ea0d7ffb3b6858dde2f9
SIZE (haiwen-seafobj-v6.3.13-pro_GH0.tar.gz) = 10058140
TIMESTAMP = 1558051275
SHA256 (haiwen-seafobj-v7.0.2-pro_GH0.tar.gz) = 4ea822ed8c7cd2f2b28e7a46a18b9c98b5b242de812a2b8e453406ac32f8a3ef
SIZE (haiwen-seafobj-v7.0.2-pro_GH0.tar.gz) = 10058178

View file

@ -4,7 +4,6 @@ PORTNAME= seahub
DISTVERSIONPREFIX= v
DISTVERSION= ${SEAHUB_VER}
DISTVERSIONSUFFIX= -pro
PORTREVISION= 2
CATEGORIES= www
MAINTAINER= ultima@FreeBSD.org
@ -32,6 +31,7 @@ RUN_DEPENDS= bash:shells/bash \
${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.6.0:www/py-requests-oauthlib@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}social-auth-core>=1.7.0:security/py-social-auth-core@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}openpyxl>=0:textproc/py-openpyxl@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1560056509
SHA256 (haiwen-seahub-v6.3.13-pro_GH0.tar.gz) = ed5aea17d7b727a094b9702c222842aafd2e7a9fd019469fa7b167df3048c26d
SIZE (haiwen-seahub-v6.3.13-pro_GH0.tar.gz) = 26060069
TIMESTAMP = 1560059571
SHA256 (haiwen-seahub-v7.0.2-pro_GH0.tar.gz) = fb1509b56830edae330dfa61dfb2f01adba3579ae21caa27d54e330ab37513cb
SIZE (haiwen-seahub-v7.0.2-pro_GH0.tar.gz) = 28904855

File diff suppressed because it is too large Load diff