mirror of
https://github.com/novatiq/packages.git
synced 2026-04-30 15:38:40 +01:00
seafile: import version 5.1.1 and its dependencies
Signed-off-by: Gergely Kiss <mail.gery@gmail.com>
This commit is contained in:
Gergely Kiss
committed by
Etienne CHAMPETIER
Etienne CHAMPETIER
parent
39e937fae7
commit
437621931a
@@ -1,40 +1,77 @@
|
||||
diff -rupN seafile-3.1.7-server.orig/scripts/seaf-gc.sh seafile-3.1.7-server/scripts/seaf-gc.sh
|
||||
--- seafile-3.1.7-server.orig/scripts/seaf-gc.sh 2014-10-16 05:30:04.000000000 +0200
|
||||
+++ seafile-3.1.7-server/scripts/seaf-gc.sh 2014-12-13 00:51:12.919136978 +0100
|
||||
@@ -6,11 +6,10 @@ SCRIPT=$(readlink -f "$0")
|
||||
INSTALLPATH=$(dirname "${SCRIPT}")
|
||||
diff -rupN seafile-server-5.1.1.orig/scripts/seaf-fsck.sh seafile-server-5.1.1/scripts/seaf-fsck.sh
|
||||
--- seafile-server-5.1.1.orig/scripts/seaf-fsck.sh 2016-04-21 11:05:26.000000000 +0200
|
||||
+++ seafile-server-5.1.1/scripts/seaf-fsck.sh 2016-04-22 09:10:13.075581325 +0200
|
||||
@@ -7,7 +7,7 @@ INSTALLPATH=$(dirname "${SCRIPT}")
|
||||
TOPDIR=$(dirname "${INSTALLPATH}")
|
||||
default_ccnet_conf_dir=${TOPDIR}/ccnet
|
||||
default_conf_dir=${TOPDIR}/conf
|
||||
-seaf_fsck=${INSTALLPATH}/seafile/bin/seaf-fsck
|
||||
+seaf_fsck=/usr/bin/seaf-fsck
|
||||
|
||||
export PATH=${INSTALLPATH}/seafile/bin:$PATH
|
||||
export SEAFILE_LD_LIBRARY_PATH=${INSTALLPATH}/seafile/lib/:${INSTALLPATH}/seafile/lib64:${LD_LIBRARY_PATH}
|
||||
diff -rupN seafile-server-5.1.1.orig/scripts/seaf-gc.sh seafile-server-5.1.1/scripts/seaf-gc.sh
|
||||
--- seafile-server-5.1.1.orig/scripts/seaf-gc.sh 2016-04-21 11:05:26.000000000 +0200
|
||||
+++ seafile-server-5.1.1/scripts/seaf-gc.sh 2016-04-22 09:10:27.211581999 +0200
|
||||
@@ -7,7 +7,7 @@ INSTALLPATH=$(dirname "${SCRIPT}")
|
||||
TOPDIR=$(dirname "${INSTALLPATH}")
|
||||
default_ccnet_conf_dir=${TOPDIR}/ccnet
|
||||
default_conf_dir=${TOPDIR}/conf
|
||||
-seaf_gc=${INSTALLPATH}/seafile/bin/seafserv-gc
|
||||
+seaf_gc=/usr/bin/seafserv-gc
|
||||
seaf_gc_opts=""
|
||||
|
||||
-export PATH=${INSTALLPATH}/seafile/bin:$PATH
|
||||
-export SEAFILE_LD_LIBRARY_PATH=${INSTALLPATH}/seafile/lib/:${INSTALLPATH}/seafile/lib64:${LD_LIBRARY_PATH}
|
||||
+export PYTHONPATH="/usr/share/seafile/seafile-server/seahub/thirdpart:$PYTHONPATH"
|
||||
export PATH=${INSTALLPATH}/seafile/bin:$PATH
|
||||
diff -rupN seafile-server-5.1.1.orig/scripts/setup-seafile-mysql.sh seafile-server-5.1.1/scripts/setup-seafile-mysql.sh
|
||||
--- seafile-server-5.1.1.orig/scripts/setup-seafile-mysql.sh 2016-04-21 11:05:26.000000000 +0200
|
||||
+++ seafile-server-5.1.1/scripts/setup-seafile-mysql.sh 2016-04-22 09:11:50.083585953 +0200
|
||||
@@ -40,15 +40,10 @@ function check_python_executable() {
|
||||
function check_python_module () {
|
||||
module=$1
|
||||
name=$2
|
||||
- hint=$3
|
||||
printf " Checking python module: ${name} ... "
|
||||
if ! $PYTHON -c "import ${module}" 2>/dev/null 1>&2; then
|
||||
echo
|
||||
printf "\033[33m ${name} \033[m is not installed, Please install it first.\n"
|
||||
- if [[ "${hint}" != "" ]]; then
|
||||
- printf "${hint}"
|
||||
- echo
|
||||
- fi
|
||||
err_and_quit;
|
||||
fi
|
||||
echo -e "Done."
|
||||
@@ -70,14 +65,10 @@ function check_python () {
|
||||
if [[ $PYTHON == "python2.6" ]]; then
|
||||
py26="2.6"
|
||||
fi
|
||||
- hint="\nOn Debian/Ubntu: apt-get install python-setuptools\nOn CentOS/RHEL: yum install python${py26}-distribute"
|
||||
- check_python_module pkg_resources setuptools "${hint}"
|
||||
-
|
||||
- hint="\nOn Debian/Ubntu: apt-get install python-imaging\nOn CentOS/RHEL: yum install python${py26}-imaging"
|
||||
- check_python_module PIL python-imaging "${hint}"
|
||||
|
||||
script_name=$0
|
||||
function usage () {
|
||||
@@ -78,9 +77,7 @@ function run_seaf_gc () {
|
||||
|
||||
echo "Starting seafserv-gc, please wait ..."
|
||||
|
||||
- LD_LIBRARY_PATH=$SEAFILE_LD_LIBRARY_PATH ${seaf_gc} \
|
||||
- -c "${default_ccnet_conf_dir}" -d "${seafile_data_dir}" \
|
||||
- ${seaf_gc_opts}
|
||||
+ ${seaf_gc} -c "${default_ccnet_conf_dir}" -d "${seafile_data_dir}" ${seaf_gc_opts}
|
||||
|
||||
echo "seafserv-gc run done"
|
||||
- hint='\nOn Debian/Ubuntu:\n\nsudo apt-get install python-mysqldb\n\nOn CentOS/RHEL:\n\nsudo yum install MySQL-python'
|
||||
- check_python_module MySQLdb python-mysqldb "${hint}"
|
||||
+ check_python_module pkg_resources setuptools
|
||||
+ check_python_module PIL python-imaging
|
||||
+ check_python_module MySQLdb python-mysqldb
|
||||
fi
|
||||
echo
|
||||
diff -rupN seafile-3.1.7-server.orig/scripts/setup-seafile-mysql.sh seafile-3.1.7-server/scripts/setup-seafile-mysql.sh
|
||||
--- seafile-3.1.7-server.orig/scripts/setup-seafile-mysql.sh 2014-10-16 05:30:04.000000000 +0200
|
||||
+++ seafile-3.1.7-server/scripts/setup-seafile-mysql.sh 2014-12-13 00:51:49.242172631 +0100
|
||||
@@ -9,6 +9,8 @@ set -e
|
||||
SCRIPT=$(readlink -f "$0")
|
||||
INSTALLPATH=$(dirname "${SCRIPT}")
|
||||
}
|
||||
@@ -85,5 +76,6 @@ function check_python () {
|
||||
check_python;
|
||||
|
||||
export PYTHON=$PYTHON
|
||||
+export PYTHONPATH="/usr/share/seafile/seafile-server/seahub/thirdpart:$PYTHONPATH"
|
||||
+
|
||||
cd "$INSTALLPATH"
|
||||
|
||||
python_script=setup-seafile-mysql.py
|
||||
exec $PYTHON "$python_script"
|
||||
diff -rupN seafile-server-5.1.1.orig/scripts/sqlite2mysql.sh seafile-server-5.1.1/scripts/sqlite2mysql.sh
|
||||
--- seafile-server-5.1.1.orig/scripts/sqlite2mysql.sh 2016-04-21 11:05:26.000000000 +0200
|
||||
+++ seafile-server-5.1.1/scripts/sqlite2mysql.sh 2016-04-22 09:02:22.047558854 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/bin/sh
|
||||
+#!/bin/bash
|
||||
#
|
||||
# This shell script and corresponding sqlite2mysql.py are used to
|
||||
# migrate Seafile data from SQLite to MySQL.
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
diff -rupN seafile-3.1.7-server.orig/controller/seafile-controller.c seafile-3.1.7-server/controller/seafile-controller.c
|
||||
--- seafile-3.1.7-server.orig/controller/seafile-controller.c 2014-10-16 05:30:04.000000000 +0200
|
||||
+++ seafile-3.1.7-server/controller/seafile-controller.c 2014-11-28 16:50:24.053674057 +0100
|
||||
diff -rupN seafile-server-5.1.1.orig/controller/seafile-controller.c seafile-server-5.1.1/controller/seafile-controller.c
|
||||
--- seafile-server-5.1.1.orig/controller/seafile-controller.c 2016-04-19 15:44:32.000000000 +0200
|
||||
+++ seafile-server-5.1.1/controller/seafile-controller.c 2016-04-19 16:23:05.785000218 +0200
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
SeafileController *ctl;
|
||||
@@ -10,7 +10,7 @@ diff -rupN seafile-3.1.7-server.orig/controller/seafile-controller.c seafile-3.1
|
||||
|
||||
char *bin_dir = NULL;
|
||||
char *installpath = NULL;
|
||||
@@ -614,9 +614,9 @@ stop_ccnet_server ()
|
||||
@@ -575,9 +575,9 @@ stop_ccnet_server ()
|
||||
static void
|
||||
init_pidfile_path (SeafileController *ctl)
|
||||
{
|
||||
|
||||
@@ -1,62 +1,55 @@
|
||||
diff -rupN seafile-3.1.7-server.orig/tools/seafile-admin seafile-3.1.7-server/tools/seafile-admin
|
||||
--- seafile-3.1.7-server.orig/tools/seafile-admin 2014-10-16 05:30:04.000000000 +0200
|
||||
+++ seafile-3.1.7-server/tools/seafile-admin 2014-12-22 21:52:25.929781054 +0100
|
||||
@@ -416,13 +416,13 @@ def create_gunicorn_conf():
|
||||
content = '''\
|
||||
import os
|
||||
daemon = True
|
||||
-workers = 3
|
||||
+workers = 1
|
||||
+threads = 3
|
||||
diff -rupN seafile-server-5.1.1.orig/tools/seafile-admin seafile-server-5.1.1/tools/seafile-admin
|
||||
--- seafile-server-5.1.1.orig/tools/seafile-admin 2016-04-19 15:44:33.000000000 +0200
|
||||
+++ seafile-server-5.1.1/tools/seafile-admin 2016-04-26 10:55:11.826798430 +0200
|
||||
@@ -449,9 +449,12 @@ workers = 3
|
||||
|
||||
# Logging
|
||||
runtime_dir = os.path.dirname(__file__)
|
||||
-pidfile = os.path.join(runtime_dir, 'seahub.pid')
|
||||
+pidfile = '/var/run/seafile/seahub.pid'
|
||||
errorlog = os.path.join(runtime_dir, 'error.log')
|
||||
-accesslog = os.path.join(runtime_dir, 'access.log')
|
||||
accesslog = os.path.join(runtime_dir, 'access.log')
|
||||
+
|
||||
+# for file upload, we need a longer timeout value (default is only 30s, too short)
|
||||
+timeout = 1200
|
||||
'''
|
||||
|
||||
try:
|
||||
with open(confpath, 'w') as fp:
|
||||
@@ -607,6 +607,7 @@ def start_seahub_gunicorn():
|
||||
'gunicorn_django',
|
||||
'-c', conf[CONF_SEAHUB_CONF],
|
||||
'-b', '0.0.0.0:%s' % conf[CONF_SEAHUB_PORT],
|
||||
+ '-t', '120',
|
||||
]
|
||||
@@ -526,6 +529,7 @@ def check_django_version():
|
||||
|
||||
info('Starting seahub...')
|
||||
@@ -625,6 +626,7 @@ def start_seahub_fastcgi():
|
||||
'pidfile=%(pidfile)s',
|
||||
'outlog=%(outlog)s',
|
||||
'errlog=%(errlog)s',
|
||||
+ 'method=threaded',
|
||||
]
|
||||
|
||||
cmdline = ' '.join(argv) % \
|
||||
@@ -693,7 +695,7 @@ def check_layout(args):
|
||||
conf[CONF_SEAFILE_DIR] = seafile_data_dir
|
||||
conf[CONF_SEAHUB_DIR] = seahub_dir
|
||||
conf[CONF_SEAHUB_CONF] = seahub_conf
|
||||
- conf[CONF_SEAHUB_PIDFILE] = os.path.join(runtime_dir, 'seahub.pid')
|
||||
+ conf[CONF_SEAHUB_PIDFILE] = '/var/run/seafile/seahub.pid'
|
||||
conf[CONF_SEAHUB_OUTLOG] = os.path.join(runtime_dir, 'access.log')
|
||||
conf[CONF_SEAHUB_ERRLOG] = os.path.join(runtime_dir, 'error.log')
|
||||
def check_python_module(import_name, package_name=None, silent=False):
|
||||
+ os.environ.setdefault("DJANGO_SETTINGS_MODULE", "seahub.settings")
|
||||
package_name = package_name or import_name
|
||||
if not silent:
|
||||
info('checking %s' % package_name)
|
||||
@@ -785,7 +789,7 @@ def check_layout(args):
|
||||
conf[CONF_SEAFILE_DIR] = seafile_data_dir
|
||||
conf[CONF_SEAHUB_DIR] = seahub_dir
|
||||
conf[CONF_SEAHUB_CONF] = seahub_conf
|
||||
- conf[CONF_SEAHUB_PIDFILE] = os.path.join(runtime_dir, 'seahub.pid')
|
||||
+ conf[CONF_SEAHUB_PIDFILE] = '/var/run/seafile/seahub.pid'
|
||||
conf[CONF_SEAHUB_OUTLOG] = os.path.join(runtime_dir, 'access.log')
|
||||
conf[CONF_SEAHUB_ERRLOG] = os.path.join(runtime_dir, 'error.log')
|
||||
|
||||
@@ -738,10 +740,9 @@ def setup_seafile(args):
|
||||
@@ -836,10 +840,13 @@ def setup_seafile(args):
|
||||
print '-----------------------------------------------------------------'
|
||||
print '-----------------------------------------------------------------'
|
||||
print
|
||||
- print 'To start/stop seafile server:'
|
||||
+ print 'To start, stop or restart seafile server, please run as root:'
|
||||
+ print 'To start, stop or restart seafile:'
|
||||
+ print
|
||||
+ print highlight(' # /etc/init.d/seafile { start | stop | restart }')
|
||||
print
|
||||
- print highlight(' $ cd %s' % cwd)
|
||||
- print highlight(' $ %s { start | stop }' % SCRIPT_NAME)
|
||||
+ print highlight(' # /etc/init.d/seafile { start | stop | restart }')
|
||||
+ print 'To start, stop or restart seahub:'
|
||||
+ print
|
||||
+ print highlight(' # /etc/init.d/seahub { start | stop | restart }')
|
||||
print
|
||||
print 'If you have any problem, refer to\n'
|
||||
print
|
||||
@@ -802,8 +803,7 @@ def start_seafile(args):
|
||||
@@ -903,8 +910,7 @@ def start_seafile(args):
|
||||
def stop_seafile(dummy):
|
||||
info('Stopping seafile server')
|
||||
pkill('seafile-controller')
|
||||
|
||||
@@ -1,17 +0,0 @@
|
||||
diff -rupN seafile-server-4.1.2.orig/server/Makefile.am seafile-server-4.1.2/server/Makefile.am
|
||||
--- seafile-server-4.1.2.orig/server/Makefile.am 2015-05-02 11:04:11.000000000 +0200
|
||||
+++ seafile-server-4.1.2/server/Makefile.am 2015-06-14 01:28:55.924834806 +0200
|
||||
@@ -4,6 +4,7 @@ AM_CFLAGS = -DPKGDATADIR=\"$(pkgdatadir)
|
||||
-DPACKAGE_DATA_DIR=\""$(pkgdatadir)"\" \
|
||||
-DSEAFILE_SERVER \
|
||||
-DFULL_FEATURE \
|
||||
+ -I$(STAGING_DIR)/usr/include/libevhtp-1.1 \
|
||||
-I$(top_srcdir)/include \
|
||||
-I$(top_srcdir)/lib \
|
||||
-I$(top_builddir)/lib \
|
||||
@@ -122,4 +123,4 @@ seaf_server_LDADD = @CCNET_LIBS@ \
|
||||
@SEARPC_LIBS@ @JANSSON_LIBS@ @ZDB_LIBS@ @CURL_LIBS@ ${LIB_WS32} @ZLIB_LIBS@ \
|
||||
@LIBARCHIVE_LIBS@
|
||||
|
||||
-seaf_server_LDFLAGS = @STATIC_COMPILE@ @SERVER_PKG_RPATH@
|
||||
+seaf_server_LDFLAGS = @STATIC_COMPILE@ @SERVER_PKG_RPATH@ -L$(STAGING_DIR)/usr/lib/libevhtp-1.1
|
||||
@@ -0,0 +1,43 @@
|
||||
diff -rupN seafile-server-5.1.1.orig/lib/Makefile.am seafile-server-5.1.1/lib/Makefile.am
|
||||
--- seafile-server-5.1.1.orig/lib/Makefile.am 2016-04-21 11:05:26.000000000 +0200
|
||||
+++ seafile-server-5.1.1/lib/Makefile.am 2016-04-22 10:09:41.567751561 +0200
|
||||
@@ -1,3 +1,5 @@
|
||||
+include $(TOPDIR)/rules.mk
|
||||
+
|
||||
pcfiles = libseafile.pc
|
||||
pkgconfig_DATA = $(pcfiles)
|
||||
pkgconfigdir = $(libdir)/pkgconfig
|
||||
@@ -35,7 +37,7 @@ seafile-rpc-wrapper.c: seafile-object.h
|
||||
|
||||
seafile-object.h: ${seafile_object_define}
|
||||
rm -f $@
|
||||
- valac --pkg posix ${seafile_object_define} -C -H seafile-object.h
|
||||
+ "$(STAGING_DIR_HOST)/bin/valac" --pkg posix ${seafile_object_define} -C -H seafile-object.h
|
||||
|
||||
DISTCLEANFILES = ${searpc_gen}
|
||||
|
||||
@@ -64,7 +66,7 @@ rpc_table.stamp: ${top_srcdir}/lib/rpc_t
|
||||
@rm -f rpc_table.tmp
|
||||
@touch rpc_table.tmp
|
||||
@echo "[libsearpc]: generating rpc header files"
|
||||
- @PYTHON@ `which searpc-codegen.py` ${top_srcdir}/lib/rpc_table.py
|
||||
+ @PYTHON@ "$(STAGING_DIR)/usr/bin/searpc-codegen.py" ${top_srcdir}/lib/rpc_table.py
|
||||
@echo "[libsearpc]: done"
|
||||
@mv -f rpc_table.tmp $@
|
||||
|
||||
@@ -74,7 +76,7 @@ vala.stamp: ${seafile_object_define}
|
||||
rm -f ${seafile_object_gen}
|
||||
@rm -f vala.tmp
|
||||
@touch vala.tmp
|
||||
- valac -C --pkg posix $^
|
||||
+ "$(STAGING_DIR_HOST)/bin/valac" -C --pkg posix $^
|
||||
@mv -f vala.tmp $@
|
||||
|
||||
${seafile_object_gen}: vala.stamp
|
||||
@@ -90,5 +92,5 @@ install-data-local:
|
||||
if MACOS
|
||||
sed -i '' -e "s|(DESTDIR)|${DESTDIR}|g" $(pcfiles)
|
||||
else
|
||||
- ${SED} -i "s|(DESTDIR)|${DESTDIR}|g" $(pcfiles)
|
||||
+ ${SED} "s|(DESTDIR)|${DESTDIR}|g" $(pcfiles)
|
||||
endif
|
||||
@@ -1,107 +0,0 @@
|
||||
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-09 19:31:56.000000000 +0200
|
||||
+++ seafile-server-4.1.2/lib/net.c 2015-09-14 20:20:30.906021296 +0200
|
||||
@@ -31,11 +31,7 @@
|
||||
|
||||
#include <fcntl.h>
|
||||
|
||||
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
|
||||
#include <event2/util.h>
|
||||
-#else
|
||||
-#include <evutil.h>
|
||||
-#endif
|
||||
|
||||
#include "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-09 19:31:56.000000000 +0200
|
||||
+++ seafile-server-4.1.2/lib/net.h 2015-09-14 20:20:30.906021296 +0200
|
||||
@@ -19,11 +19,7 @@
|
||||
#include <netinet/tcp.h>
|
||||
#endif
|
||||
|
||||
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
|
||||
#include <event2/util.h>
|
||||
-#else
|
||||
-#include <evutil.h>
|
||||
-#endif
|
||||
|
||||
#ifdef WIN32
|
||||
#define ECONNREFUSED WSAECONNREFUSED
|
||||
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-09 19:31:56.000000000 +0200
|
||||
+++ seafile-server-4.1.2/lib/utils.h 2015-09-14 20:20:30.907021326 +0200
|
||||
@@ -13,11 +13,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <sys/stat.h>
|
||||
|
||||
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
|
||||
#include <event2/util.h>
|
||||
-#else
|
||||
-#include <evutil.h>
|
||||
-#endif
|
||||
|
||||
#ifdef __linux__
|
||||
#include <endian.h>
|
||||
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-09 19:31:56.000000000 +0200
|
||||
+++ seafile-server-4.1.2/server/access-file.c 2015-09-14 20:20:30.907021326 +0200
|
||||
@@ -3,13 +3,9 @@
|
||||
#define DEBUG_FLAG SEAFILE_DEBUG_HTTP
|
||||
#include "log.h"
|
||||
|
||||
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
|
||||
#include <event2/event.h>
|
||||
#include <event2/bufferevent.h>
|
||||
#include <event2/bufferevent_struct.h>
|
||||
-#else
|
||||
-#include <event.h>
|
||||
-#endif
|
||||
|
||||
#include <evhtp.h>
|
||||
|
||||
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-09 19:31:56.000000000 +0200
|
||||
+++ seafile-server-4.1.2/server/http-server.c 2015-09-14 20:20:30.908021355 +0200
|
||||
@@ -6,11 +6,7 @@
|
||||
#include <locale.h>
|
||||
#include <sys/types.h>
|
||||
|
||||
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
|
||||
#include <event2/event.h>
|
||||
-#else
|
||||
-#include <event.h>
|
||||
-#endif
|
||||
|
||||
#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
|
||||
--- 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-14 20:20:30.909021385 +0200
|
||||
@@ -6,11 +6,7 @@
|
||||
#include <getopt.h>
|
||||
#include <fcntl.h>
|
||||
|
||||
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
|
||||
#include <event2/event.h>
|
||||
-#else
|
||||
-#include <event.h>
|
||||
-#endif
|
||||
|
||||
#include <evhtp.h>
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
diff -rupN seafile-server-5.1.1.orig/lib/repo.vala seafile-server-5.1.1/lib/repo.vala
|
||||
--- seafile-server-5.1.1.orig/lib/repo.vala 2016-04-19 15:44:32.000000000 +0200
|
||||
+++ seafile-server-5.1.1/lib/repo.vala 2016-04-25 21:29:33.327962235 +0200
|
||||
@@ -30,7 +30,7 @@ public class Repo : Object {
|
||||
// data format version
|
||||
public int version { get; set; }
|
||||
|
||||
- public int last_modify { get; set; }
|
||||
+ public int64 last_modify { get; set; }
|
||||
public int64 size { get; set; }
|
||||
public int64 file_count { get; set; }
|
||||
public string head_cmmt_id { get; set; }
|
||||
@@ -40,7 +40,7 @@ public class Repo : Object {
|
||||
public string repo_id { get; set; }
|
||||
public string repo_name { get; set; }
|
||||
public string repo_desc { get; set; }
|
||||
- public int last_modified { get; set; }
|
||||
+ public int64 last_modified { get; set; }
|
||||
|
||||
// Section 2: Encryption related
|
||||
// Members in this section should be set for every Repo object
|
||||
@@ -63,7 +63,7 @@ public class Repo : Object {
|
||||
get { return _relay_id; }
|
||||
set { _relay_id = value; }
|
||||
}
|
||||
- public int last_sync_time { get; set; }
|
||||
+ public int64 last_sync_time { get; set; }
|
||||
public bool auto_sync { get; set; }
|
||||
public bool worktree_invalid { get; set; }
|
||||
|
||||
@@ -155,7 +155,7 @@ public class DeletedEntry : Object {
|
||||
public string obj_name { get; set; }
|
||||
public string basedir { get; set; }
|
||||
public int mode { get; set; }
|
||||
- public int delete_time { get; set; }
|
||||
+ public int64 delete_time { get; set; }
|
||||
public int64 file_size { get; set; }
|
||||
public string scan_stat { get; set; }
|
||||
}
|
||||
Reference in New Issue
Block a user