mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-24 04:33:24 +00:00
Code Issues Releases Activity

Update Seafile family to 6.3.1

Browse Source 
As of Seafile 6.3.0, django has been upgraded
to 1.11. Seafile's dependencies have also been
switched to match this change.

Reviewed by:	miwi
Differential Revision:	https://reviews.freebsd.org/D15718
This commit is contained in:
Richard Gallamore 2018-06-13 22:05:51 +00:00
parent 81ef7f54fd
commit bda951bb90
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=472346
17 changed files with 314 additions and 261 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net-mgmt/ccnet-server/distinfo
View File

@ -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

1
net-mgmt/seafile-server/Makefile
View File

@ -4,7 +4,6 @@ PORTNAME= seafile-server
DISTVERSIONPREFIX= v
DISTVERSION= ${SEAFILE_VER}
DISTVERSIONSUFFIX= -server
PORTREVISION= 1
CATEGORIES= net-mgmt
MAINTAINER= ultima@FreeBSD.org

4
net-mgmt/seafile-server/Makefile.include
View File

@ -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

6
net-mgmt/seafile-server/distinfo
View File

@ -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

19
net-mgmt/seafile-server/files/patch-controller_seafile-controller.c
View File

@ -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;

8
net-mgmt/seafile-server/pkg-plist
View File

@ -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%%

9
www/py-django-constance/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= django-constance
PORTVERSION= 2.2.0
PORTREVISION= 1
CATEGORIES= www python
MASTER_SITES= GH
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@ -13,10 +14,10 @@ COMMENT= Dynamic Django settings
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}redis>=0:databases/py-redis@${FLAVOR} \
${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${FLAVOR} \
${PYTHON_PKGNAMEPREFIX}django-picklefield>=0:www/py-django-picklefield@${FLAVOR} \
${PYTHON_PKGNAMEPREFIX}django18>=1.8:www/py-django18@${FLAVOR}
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}redis>=0:databases/py-redis@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}django-picklefield>=0:www/py-django-picklefield@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}django111>=1.8:www/py-django111@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils

3
www/py-django-jsonfield/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= jsonfield
PORTVERSION= 2.0.2
PORTREVISION= 1
CATEGORIES= www python
MASTER_SITES= GH
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}django-
@ -13,7 +14,7 @@ COMMENT= Reusable JSONField model for Django to store ad-hoc data
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR}
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=0:www/py-django111@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist

5
www/py-django-picklefield/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= django-picklefield
PORTVERSION= 1.0.0
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= www python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@ -13,7 +13,8 @@ COMMENT= Pickled object field for Django
LICENSE= MIT
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR}
# Reminder: www/seahub depends on django, changing django version may break seahub
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=0:www/py-django111@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils

5
www/py-django-post_office/Makefile
View File

@ -4,6 +4,7 @@
PORTNAME= django-post_office
DISTVERSIONPREFIX= v
DISTVERSION= 3.0.4
PORTREVISION= 1
CATEGORIES= www python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@ -13,8 +14,8 @@ COMMENT= Django app to monitor and send mail asynchronously
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django-jsonfield>=0:www/py-django-jsonfield@${FLAVOR} \
${PYTHON_PKGNAMEPREFIX}django18>=1.8:www/py-django18@${FLAVOR}
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django-jsonfield>=0:www/py-django-jsonfield@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}django111>=1.8:www/py-django111@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils

5
www/py-django-statici18n/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= django-statici18n
PORTVERSION= 1.7.0
PORTREVISION= 1
CATEGORIES= www python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@ -13,8 +14,8 @@ COMMENT= Helper for generating Javascript catalog to static files
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR} \
${PYTHON_PKGNAMEPREFIX}django-appconf>=0.6:www/py-django-appconf@${FLAVOR}
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=0:www/py-django111@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}django-appconf>=0.6:www/py-django-appconf@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils

6
www/py-seafdav/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1524462750
SHA256 (haiwen-seafdav-v6.2.12-pro_GH0.tar.gz) = 5e1d72b3d2f403f0d2345c4b8280a4f53e15dc3c17a59ba9517dd3fef66f07e7
SIZE (haiwen-seafdav-v6.2.12-pro_GH0.tar.gz) = 2554687
TIMESTAMP = 1526795437
SHA256 (haiwen-seafdav-v6.3.1-pro_GH0.tar.gz) = e4cc1b11ba8b550d331a8c41321745ea51db12ab297d9d7845f60acba8f41217
SIZE (haiwen-seafdav-v6.3.1-pro_GH0.tar.gz) = 2554677

6
www/py-seafobj/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1524462753
SHA256 (haiwen-seafobj-v6.2.12-pro_GH0.tar.gz) = fc238b86b67789bb7fcefc998f0ab3396cbefe9344ce0959ad2916bbc8aae948
SIZE (haiwen-seafobj-v6.2.12-pro_GH0.tar.gz) = 6656063
TIMESTAMP = 1526795439
SHA256 (haiwen-seafobj-v6.3.1-pro_GH0.tar.gz) = dc495a73d1ba97b410f9315b88cae58d4249c19c0b22c2f926e75b9b1e49535a
SIZE (haiwen-seafobj-v6.3.1-pro_GH0.tar.gz) = 10054683

3
www/py-seafobj/pkg-plist
View File

@ -31,6 +31,9 @@
%%SITEPACKAGEDIR%%/seafobj/commits.py
%%SITEPACKAGEDIR%%/seafobj/commits.pyc
%%SITEPACKAGEDIR%%/seafobj/commits.%%PYTHON_PYOEXTENSION%%
%%SITEPACKAGEDIR%%/seafobj/db.py
%%SITEPACKAGEDIR%%/seafobj/db.pyc
%%SITEPACKAGEDIR%%/seafobj/db.%%PYTHON_PYOEXTENSION%%
%%SITEPACKAGEDIR%%/seafobj/exceptions.py
%%SITEPACKAGEDIR%%/seafobj/exceptions.pyc
%%SITEPACKAGEDIR%%/seafobj/exceptions.%%PYTHON_PYOEXTENSION%%

7
www/seahub/Makefile
View File

@ -12,14 +12,15 @@ COMMENT= Web frontend for Seafile
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${PY_FLAVOR}
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=0:www/py-django111@${PY_FLAVOR}
RUN_DEPENDS= bash:shells/bash \
${LOCALBASE}/www/haiwen/seafile-server/seafile/bin/seaf-server:net-mgmt/seafile-server \
${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}django111>=0:www/py-django111@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}django-simple-captcha>=0:www/py-django-simple-captcha@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}django-statici18n>=0:www/py-django-statici18n@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}djangorestframework36>=0:www/py-djangorestframework36@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}djangorestframework>=0:www/py-djangorestframework@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}django_compressor>=0:www/py-django_compressor@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}django-formtools>=0:www/py-django-formtools@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}django-post_office>=0:www/py-django-post_office@${PY_FLAVOR} \

6
www/seahub/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1524462757
SHA256 (haiwen-seahub-v6.2.12-pro_GH0.tar.gz) = 18a336f2a34dfada48fb875ca5c63f5e35d48e8a0ddb497a9d1c6ca036591998
SIZE (haiwen-seahub-v6.2.12-pro_GH0.tar.gz) = 9474228
TIMESTAMP = 1528562671
SHA256 (haiwen-seahub-v6.3.1-pro_GH0.tar.gz) = 7f6f985c40251d0e39ec2ad72908adfcd623e14e7376208a2de807788beea089
SIZE (haiwen-seahub-v6.3.1-pro_GH0.tar.gz) = 9406660

476
www/seahub/pkg-plist
View File

File diff suppressed because it is too large Load Diff