View | Details | Raw Unified | Return to bug 203933 | Differences between
and this patch

Collapse All | Expand All

(-)net-mgmt/seafile/Makefile (-4 / +7 lines)
Lines 1-8 Link Here
1
# $FreeBSD$
1
# $FreeBSD$
2
2
3
PORTNAME=	seafile
3
PORTNAME=	seafile
4
PORTVERSION=	4.0.6
4
PORTVERSION=	4.4.3
5
PORTREVISION=	3
6
DISTVERSIONPREFIX=	v
5
DISTVERSIONPREFIX=	v
7
DISTVERSIONSUFFIX=	-server
6
DISTVERSIONSUFFIX=	-server
8
CATEGORIES=	net-mgmt devel
7
CATEGORIES=	net-mgmt devel
Lines 11-16 Link Here
11
COMMENT=	Framework for writing networked applications
10
COMMENT=	Framework for writing networked applications
12
11
13
LICENSE=	GPLv3
12
LICENSE=	GPLv3
13
LICENSE_FILE=	${WRKSRC}/LICENSE.txt
14
14
15
BUILD_DEPENDS=	valac:${PORTSDIR}/lang/vala
15
BUILD_DEPENDS=	valac:${PORTSDIR}/lang/vala
16
LIB_DEPENDS=	libsearpc.so:${PORTSDIR}/devel/libsearpc \
16
LIB_DEPENDS=	libsearpc.so:${PORTSDIR}/devel/libsearpc \
Lines 27-35 Link Here
27
USE_GITHUB=	yes
27
USE_GITHUB=	yes
28
GH_ACCOUNT=	haiwen
28
GH_ACCOUNT=	haiwen
29
29
30
USES=		autoreconf iconv libarchive libtool pathfix pkgconfig python:2 \
30
USES=		autoreconf iconv libarchive libtool pathfix pkgconfig python:-2.7 \
31
		shebangfix
31
		shebangfix
32
SHEBANG_FILES=	scripts/*.sh scripts/upgrade/*.sh
32
SHEBANG_FILES=	scripts/*.sh scripts/upgrade/*.sh  tests/*.py tests/basic/*.sh \
33
		tests/sync-auto-test/*.template *.sh scripts/build/*.py \
34
		scripts/*.py *.py scripts/upgrade/*.py app/seaf-cli \
35
		tools/seafile-admin
33
GNU_CONFIGURE=	yes
36
GNU_CONFIGURE=	yes
34
USE_OPENSSL=	yes
37
USE_OPENSSL=	yes
35
USE_LDCONFIG=	yes
38
USE_LDCONFIG=	yes
(-)net-mgmt/seafile/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (haiwen-seafile-v4.0.6-server_GH0.tar.gz) = 3f9aacc53c67aa165c66a4546a6f8c7ad3a002f741578a538b0c0965a73317bf
1
SHA256 (haiwen-seafile-v4.4.3-server_GH0.tar.gz) = 10a805a54623153443e64df52f7d484c8663f0177262c2e6dc2391b21a560b62
2
SIZE (haiwen-seafile-v4.0.6-server_GH0.tar.gz) = 1082453
2
SIZE (haiwen-seafile-v4.4.3-server_GH0.tar.gz) = 1151725
(-)net-mgmt/seafile/files/patch-common_obj-backend-fs.c (-4 / +4 lines)
Lines 1-6 Link Here
1
--- common/obj-backend-fs.c.orig	2015-01-28 02:14:45.000000000 -0500
1
--- common/obj-backend-fs.c.orig	2015-09-21 03:42:11 UTC
2
+++ common/obj-backend-fs.c	2015-01-28 02:15:58.000000000 -0500
2
+++ common/obj-backend-fs.c
3
@@ -101,7 +101,7 @@
3
@@ -101,7 +101,7 @@ obj_backend_fs_read (ObjBackend *bend,
4
 static int
4
 static int
5
 fsync_obj_contents (int fd)
5
 fsync_obj_contents (int fd)
6
 {
6
 {
Lines 9-15 Link Here
9
     /* Some file systems may not support fsync().
9
     /* Some file systems may not support fsync().
10
      * In this case, just skip the error.
10
      * In this case, just skip the error.
11
      */
11
      */
12
@@ -153,7 +153,7 @@
12
@@ -153,7 +153,7 @@ fsync_obj_contents (int fd)
13
 static int
13
 static int
14
 rename_and_sync (const char *tmp_path, const char *obj_path)
14
 rename_and_sync (const char *tmp_path, const char *obj_path)
15
 {
15
 {
(-)net-mgmt/seafile/files/patch-configure.ac (-16 / +17 lines)
Lines 1-6 Link Here
1
--- configure.ac.orig	2015-01-21 22:45:28.000000000 -0500
1
--- configure.ac.orig	2015-09-21 03:42:11 UTC
2
+++ configure.ac	2015-01-28 14:01:20.000000000 -0500
2
+++ configure.ac
3
@@ -50,8 +50,16 @@
3
@@ -50,8 +50,16 @@ else
4
   AC_MSG_RESULT(no)
4
   AC_MSG_RESULT(no)
5
 fi
5
 fi
6
 
6
 
Lines 18-24 Link Here
18
   blinux=true
18
   blinux=true
19
   AC_MSG_RESULT(compile in linux)
19
   AC_MSG_RESULT(compile in linux)
20
 else
20
 else
21
@@ -93,6 +101,11 @@
21
@@ -93,6 +101,11 @@ if test "$bwin32" != true; then
22
       [compile_fuse=$enableval],[compile_fuse="yes"])
22
       [compile_fuse=$enableval],[compile_fuse="yes"])
23
 fi
23
 fi
24
 
24
 
Lines 30-36 Link Here
30
 AC_ARG_ENABLE(client, AC_HELP_STRING([--enable-client], [enable client]),
30
 AC_ARG_ENABLE(client, AC_HELP_STRING([--enable-client], [enable client]),
31
    [compile_client=$enableval],[compile_client="yes"])
31
    [compile_client=$enableval],[compile_client="yes"])
32
 
32
 
33
@@ -148,6 +161,7 @@
33
@@ -148,6 +161,7 @@ AM_CONDITIONAL([COMPILE_FUSE], [test "${
34
 
34
 
35
 AM_CONDITIONAL([WIN32], [test "$bwin32" = "true"])
35
 AM_CONDITIONAL([WIN32], [test "$bwin32" = "true"])
36
 AM_CONDITIONAL([MACOS], [test "$bmac" = "true"])
36
 AM_CONDITIONAL([MACOS], [test "$bmac" = "true"])
Lines 38-47 Link Here
38
 AM_CONDITIONAL([LINUX], [test "$blinux" = "true"])
38
 AM_CONDITIONAL([LINUX], [test "$blinux" = "true"])
39
 
39
 
40
 
40
 
41
@@ -192,6 +206,9 @@
41
@@ -193,6 +207,9 @@ if test "$bwin32" = true; then
42
   LIB_PSAPI=-lpsapi
43
   LIB_MAC=
42
   LIB_MAC=
44
   MSVC_CFLAGS="-D__MSVCRT__ -D__MSVCRT_VERSION__=0x0601"
43
   MSVC_CFLAGS="-D__MSVCRT__ -D__MSVCRT_VERSION__=0x0601"
44
   LIB_CRYPT32=-lcrypt32
45
+  ZLIB_LIBS=
45
+  ZLIB_LIBS=
46
+  LIB_INOTIFY=
46
+  LIB_INOTIFY=
47
+  LIB_KVM=
47
+  LIB_KVM=
Lines 48-57 Link Here
48
 elif test "$bmac" = true ; then
48
 elif test "$bmac" = true ; then
49
   LIB_WS32=
49
   LIB_WS32=
50
   LIB_GDI32=
50
   LIB_GDI32=
51
@@ -204,6 +221,24 @@
51
@@ -206,6 +223,25 @@ elif test "$bmac" = true ; then
52
   LIB_PSAPI=
53
   MSVC_CFLAGS=
52
   MSVC_CFLAGS=
54
   LIB_MAC="-framework CoreServices"
53
   LIB_MAC="-framework CoreServices"
54
   LIB_CRYPT32=
55
+  ZLIB_LIBS=
55
+  ZLIB_LIBS=
56
+  LIB_INOTIFY=
56
+  LIB_INOTIFY=
57
+  LIB_KVM=
57
+  LIB_KVM=
Lines 59-65 Link Here
59
+  LIB_WS32=
59
+  LIB_WS32=
60
+  LIB_GDI32=
60
+  LIB_GDI32=
61
+  LIB_RT=
61
+  LIB_RT=
62
+  LIB_INTL=
62
+  LIB_INTL=                                                                        
63
+  LIB_RESOLV=
63
+  LIB_RESOLV=
64
+  LIB_UUID=-luuid
64
+  LIB_UUID=-luuid
65
+  LIB_IPHLPAPI=
65
+  LIB_IPHLPAPI=
Lines 67-72 Link Here
67
+  LIB_PSAPI=
67
+  LIB_PSAPI=
68
+  LIB_MAC=
68
+  LIB_MAC=
69
+  MSVC_CFLAGS=
69
+  MSVC_CFLAGS=
70
+  LIB_CRYPT32=
70
+  ZLIB_LIBS=-lz
71
+  ZLIB_LIBS=-lz
71
+  LIB_INOTIFY=-linotify
72
+  LIB_INOTIFY=-linotify
72
+  LIB_KVM=-lkvm
73
+  LIB_KVM=-lkvm
Lines 73-82 Link Here
73
 else
74
 else
74
   LIB_WS32=
75
   LIB_WS32=
75
   LIB_GDI32=
76
   LIB_GDI32=
76
@@ -216,6 +251,9 @@
77
@@ -219,6 +255,9 @@ else
77
   LIB_PSAPI=
78
   LIB_MAC=
78
   LIB_MAC=
79
   MSVC_CFLAGS=
79
   MSVC_CFLAGS=
80
   LIB_CRYPT32=
80
+  ZLIB_LIBS=-lz
81
+  ZLIB_LIBS=-lz
81
+  LIB_INOTIFY=-linotify
82
+  LIB_INOTIFY=-linotify
82
+  LIB_KVM=
83
+  LIB_KVM=
Lines 83-89 Link Here
83
 fi
84
 fi
84
 
85
 
85
 AC_SUBST(LIB_WS32)
86
 AC_SUBST(LIB_WS32)
86
@@ -228,6 +266,9 @@
87
@@ -231,6 +270,9 @@ AC_SUBST(LIB_IPHLPAPI)
87
 AC_SUBST(LIB_SHELL32)
88
 AC_SUBST(LIB_SHELL32)
88
 AC_SUBST(LIB_PSAPI)
89
 AC_SUBST(LIB_PSAPI)
89
 AC_SUBST(LIB_MAC)
90
 AC_SUBST(LIB_MAC)
Lines 91-99 Link Here
91
+AC_SUBST(LIB_INOTIFY)
92
+AC_SUBST(LIB_INOTIFY)
92
+AC_SUBST(LIB_KVM)
93
+AC_SUBST(LIB_KVM)
93
 AC_SUBST(MSVC_CFLAGS)
94
 AC_SUBST(MSVC_CFLAGS)
95
 AC_SUBST(LIB_CRYPT32)
94
 
96
 
95
 
97
@@ -244,7 +286,9 @@ ZDB_REQUIRED=2.10
96
@@ -240,7 +281,9 @@
97
 #LIBNAUTILUS_EXTENSION_REQUIRED=2.30.1
98
 #LIBNAUTILUS_EXTENSION_REQUIRED=2.30.1
98
 CURL_REQUIRED=7.17
99
 CURL_REQUIRED=7.17
99
 FUSE_REQUIRED=2.7.3
100
 FUSE_REQUIRED=2.7.3
Lines 103-109 Link Here
103
 
104
 
104
 PKG_CHECK_MODULES(SSL, [openssl])
105
 PKG_CHECK_MODULES(SSL, [openssl])
105
 AC_SUBST(SSL_CFLAGS)
106
 AC_SUBST(SSL_CFLAGS)
106
@@ -270,9 +313,11 @@
107
@@ -274,9 +318,11 @@ PKG_CHECK_MODULES(LIBEVENT, [libevent >=
107
 AC_SUBST(LIBEVENT_CFLAGS)
108
 AC_SUBST(LIBEVENT_CFLAGS)
108
 AC_SUBST(LIBEVENT_LIBS)
109
 AC_SUBST(LIBEVENT_LIBS)
109
 
110
 
(-)net-mgmt/seafile/files/patch-controller_seafile-controller.c (-6 / +6 lines)
Lines 1-5 Link Here
1
--- controller/seafile-controller.c.orig	2015-01-28 13:03:24.000000000 -0500
1
--- controller/seafile-controller.c.orig	2015-09-21 03:42:11 UTC
2
+++ controller/seafile-controller.c	2015-01-28 13:15:05.000000000 -0500
2
+++ controller/seafile-controller.c
3
@@ -17,6 +17,19 @@
3
@@ -17,6 +17,19 @@
4
 #include "log.h"
4
 #include "log.h"
5
 #include "seafile-controller.h"
5
 #include "seafile-controller.h"
Lines 20-26 Link Here
20
 #define CHECK_PROCESS_INTERVAL 10        /* every 10 seconds */
20
 #define CHECK_PROCESS_INTERVAL 10        /* every 10 seconds */
21
 
21
 
22
 SeafileController *ctl;
22
 SeafileController *ctl;
23
@@ -247,7 +260,20 @@
23
@@ -247,7 +260,20 @@ static void
24
 init_seafile_path ()
24
 init_seafile_path ()
25
 {
25
 {
26
     GError *error = NULL;
26
     GError *error = NULL;
Lines 41-47 Link Here
41
     char *tmp = NULL;
41
     char *tmp = NULL;
42
     if (error != NULL) {
42
     if (error != NULL) {
43
         seaf_warning ("failed to readlink: %s\n", error->message);
43
         seaf_warning ("failed to readlink: %s\n", error->message);
44
@@ -261,7 +287,9 @@
44
@@ -261,7 +287,9 @@ init_seafile_path ()
45
 
45
 
46
     topdir = g_path_get_dirname (installpath);
46
     topdir = g_path_get_dirname (installpath);
47
 
47
 
Lines 51-57 Link Here
51
     g_free (tmp);
51
     g_free (tmp);
52
 }
52
 }
53
 
53
 
54
@@ -401,11 +429,40 @@
54
@@ -402,11 +430,40 @@ need_restart (int which)
55
         return FALSE;
55
         return FALSE;
56
     } else {
56
     } else {
57
         char buf[256];
57
         char buf[256];
Lines 92-98 Link Here
92
         }
92
         }
93
     }
93
     }
94
 }
94
 }
95
@@ -852,6 +909,9 @@
95
@@ -877,6 +934,9 @@ int main (int argc, char **argv)
96
         exit (1);
96
         exit (1);
97
     }
97
     }
98
 
98
 
(-)net-mgmt/seafile/files/patch-daemon_Makefile.am (-5 / +5 lines)
Lines 1-6 Link Here
1
--- daemon/Makefile.am.orig	2015-01-28 13:48:56.000000000 -0500
1
--- daemon/Makefile.am.orig	2015-10-12 04:12:33 UTC
2
+++ daemon/Makefile.am	2015-01-28 13:55:22.000000000 -0500
2
+++ daemon/Makefile.am
3
@@ -65,6 +65,10 @@
3
@@ -69,6 +69,10 @@ if LINUX
4
 wt_monitor_src = wt-monitor.c wt-monitor-linux.c wt-monitor-structs.c
4
 wt_monitor_src = wt-monitor.c wt-monitor-linux.c wt-monitor-structs.c
5
 endif
5
 endif
6
 
6
 
Lines 11-20 Link Here
11
 if WIN32
11
 if WIN32
12
 wt_monitor_src = wt-monitor.c wt-monitor-win32.c wt-monitor-structs.c
12
 wt_monitor_src = wt-monitor.c wt-monitor-win32.c wt-monitor-structs.c
13
 endif
13
 endif
14
@@ -127,7 +131,8 @@
14
@@ -135,7 +139,8 @@ seaf_daemon_LDADD = $(top_builddir)/lib/
15
 	@GLIB2_LIBS@  @GOBJECT_LIBS@ @SSL_LIBS@ @LIB_RT@ @LIB_UUID@ -lsqlite3 @LIBEVENT_LIBS@ \
15
 	@GLIB2_LIBS@  @GOBJECT_LIBS@ @SSL_LIBS@ @LIB_RT@ @LIB_UUID@ -lsqlite3 @LIBEVENT_LIBS@ \
16
 	$(top_builddir)/common/cdc/libcdc.la \
16
 	$(top_builddir)/common/cdc/libcdc.la \
17
 	$(top_builddir)/common/index/libindex.la ${LIB_WS32} \
17
 	$(top_builddir)/common/index/libindex.la @LIB_WS32@ @LIB_CRYPT32@ \
18
-	@SEARPC_LIBS@ @CCNET_LIBS@ @GNOME_KEYRING_LIBS@ @JANSSON_LIBS@ @LIB_MAC@ @ZLIB_LIBS@ @CURL_LIBS@
18
-	@SEARPC_LIBS@ @CCNET_LIBS@ @GNOME_KEYRING_LIBS@ @JANSSON_LIBS@ @LIB_MAC@ @ZLIB_LIBS@ @CURL_LIBS@
19
+	@SEARPC_LIBS@ @CCNET_LIBS@ @GNOME_KEYRING_LIBS@ @JANSSON_LIBS@ @LIB_MAC@ @ZLIB_LIBS@ \
19
+	@SEARPC_LIBS@ @CCNET_LIBS@ @GNOME_KEYRING_LIBS@ @JANSSON_LIBS@ @LIB_MAC@ @ZLIB_LIBS@ \
20
+	@CURL_LIBS@ @LIB_INOTIFY@
20
+	@CURL_LIBS@ @LIB_INOTIFY@
(-)net-mgmt/seafile/files/patch-daemon_http-tx-mgr.c (+25 lines)
Line 0 Link Here
1
--- daemon/http-tx-mgr.c.orig	2015-09-21 03:42:11 UTC
2
+++ daemon/http-tx-mgr.c
3
@@ -58,6 +58,22 @@
4
 #define USER_AGENT_OS "Linux"
5
 #endif
6
 
7
+#ifdef __FreeBSD__
8
+#define USER_AGENT_OS "FreeBSD"
9
+#endif
10
+
11
+#ifdef __DragonFly__
12
+#define USER_AGENT_OS "DragonFly"
13
+#endif
14
+
15
+#ifdef __NetBSD__
16
+#define USER_AGENT_OS "NetBSD"
17
+#endif
18
+
19
+#ifdef __OpenBSD__
20
+#define USER_AGENT_OS "OpenBSD"
21
+#endif
22
+
23
 struct _Connection {
24
     CURL *curl;
25
     gint64 ctime;               /* Used to clean up unused connection. */
(-)net-mgmt/seafile/files/patch-daemon_repo-mgr.c (-6 / +40 lines)
Lines 1-6 Link Here
1
--- daemon/repo-mgr.c.orig	2015-01-28 02:18:05.000000000 -0500
1
--- daemon/repo-mgr.c.orig	2015-09-21 03:42:11 UTC
2
+++ daemon/repo-mgr.c	2015-01-28 02:22:10.000000000 -0500
2
+++ daemon/repo-mgr.c
3
@@ -2514,13 +2514,13 @@
3
@@ -4017,13 +4017,13 @@ checkout_file (const char *repo_id,
4
     gboolean force_conflict = FALSE;
4
     gboolean force_conflict = FALSE;
5
     gboolean update_mode_only = FALSE;
5
     gboolean update_mode_only = FALSE;
6
 
6
 
Lines 17-23 Link Here
17
 #endif
17
 #endif
18
 
18
 
19
     if (!path)
19
     if (!path)
20
@@ -2675,13 +2675,13 @@
20
@@ -4193,13 +4193,13 @@ checkout_empty_dir (const char *worktree
21
     char *path;
21
     char *path;
22
     gboolean case_conflict = FALSE;
22
     gboolean case_conflict = FALSE;
23
 
23
 
Lines 34-40 Link Here
34
 #endif
34
 #endif
35
 
35
 
36
     if (!path)
36
     if (!path)
37
@@ -2839,13 +2839,13 @@
37
@@ -4606,13 +4606,13 @@ schedule_file_fetch (GThreadPool *tpool,
38
         new_ce = TRUE;
39
     }
40
 
41
-#ifndef __linux__
42
+#if defined(__linux__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__)
43
+    path = build_checkout_path (worktree, de->name, strlen(de->name));
44
+#else
45
     path = build_case_conflict_free_path (worktree, de->name,
46
                                           conflict_hash, no_conflict_hash,
47
                                           &case_conflict,
48
                                           FALSE);
49
-#else
50
-    path = build_checkout_path (worktree, de->name, strlen(de->name));
51
 #endif
52
 
53
     if (!path) {
54
@@ -4736,13 +4736,13 @@ checkout_file_http (FileTxData *data,
55
      * A.txt to checkout, we can only detect case conflict after one file is checkecd
56
      * out. So we need to generate a new one here.
57
      */
58
-#ifndef __linux__
59
+#if defined(__linux__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__)
60
+    path = build_checkout_path (worktree, de->name, strlen(de->name));
61
+#else
62
     path = build_case_conflict_free_path (worktree, de->name,
63
                                           conflict_hash, no_conflict_hash,
64
                                           &case_conflict,
65
                                           FALSE);
66
-#else
67
-    path = build_checkout_path (worktree, de->name, strlen(de->name));
68
 #endif
69
 
70
     if (!path) {
71
@@ -5110,13 +5110,13 @@ do_rename_in_worktree (DiffEntry *de, co
38
     old_path = g_build_filename (worktree, de->name, NULL);
72
     old_path = g_build_filename (worktree, de->name, NULL);
39
 
73
 
40
     if (seaf_util_exists (old_path)) {
74
     if (seaf_util_exists (old_path)) {
Lines 50-53 Link Here
50
-        new_path = build_checkout_path (worktree, de->new_name, strlen(de->new_name));
84
-        new_path = build_checkout_path (worktree, de->new_name, strlen(de->new_name));
51
 #endif
85
 #endif
52
 
86
 
53
         if (seaf_util_rename (old_path, new_path) < 0) {
87
         if (!new_path) {
(-)net-mgmt/seafile/files/patch-daemon_vc-utils.c (-4 / +4 lines)
Lines 1-6 Link Here
1
--- daemon/vc-utils.c.orig	2015-01-28 02:24:19.000000000 -0500
1
--- daemon/vc-utils.c.orig	2015-09-21 03:42:11 UTC
2
+++ daemon/vc-utils.c	2015-01-28 02:30:05.000000000 -0500
2
+++ daemon/vc-utils.c
3
@@ -664,7 +664,7 @@
3
@@ -664,7 +664,7 @@ error:
4
 
4
 
5
 #endif  /* defined WIN32 || defined __APPLE__ */
5
 #endif  /* defined WIN32 || defined __APPLE__ */
6
 
6
 
Lines 9-15 Link Here
9
 
9
 
10
 char *
10
 char *
11
 build_checkout_path (const char *worktree, const char *ce_name, int len)
11
 build_checkout_path (const char *worktree, const char *ce_name, int len)
12
@@ -724,13 +724,13 @@
12
@@ -724,13 +724,13 @@ checkout_entry (struct cache_entry *ce,
13
     gboolean force_conflict = FALSE;
13
     gboolean force_conflict = FALSE;
14
 
14
 
15
     path_in = g_build_path ("/", o->base, ce->name, NULL);
15
     path_in = g_build_path ("/", o->base, ce->name, NULL);
(-)net-mgmt/seafile/files/patch-lib_Makefile.am (+29 lines)
Line 0 Link Here
1
--- lib/Makefile.am.orig	2015-10-12 04:12:33 UTC
2
+++ lib/Makefile.am
3
@@ -53,6 +53,7 @@ libseafile_common_la_SOURCES = ${seafile
4
 libseafile_common_la_LDFLAGS = -no-undefined
5
 libseafile_common_la_LIBADD = @GLIB2_LIBS@  @GOBJECT_LIBS@ @SSL_LIBS@ -lcrypto @LIB_GDI32@ \
6
 				     @LIB_UUID@ @LIB_WS32@ @LIB_PSAPI@ -lsqlite3 \
7
+				@LIB_KVM@ \
8
 					 @LIBEVENT_LIBS@ @SEARPC_LIBS@ @LIB_SHELL32@ \
9
 	@ZLIB_LIBS@
10
 
11
@@ -74,7 +75,7 @@ vala.stamp: ${seafile_object_define}
12
 	rm -f ${seafile_object_gen}
13
 	@rm -f vala.tmp
14
 	@touch vala.tmp
15
-	valac -C --pkg posix $^
16
+	valac -C --pkg posix ${seafile_object_define}
17
 	@mv -f vala.tmp $@
18
 
19
 ${seafile_object_gen}: vala.stamp
20
@@ -90,5 +91,9 @@ install-data-local:
21
 if MACOS
22
 	sed -i '' -e "s|(DESTDIR)|${DESTDIR}|g" $(pcfiles)
23
 else
24
+if BSD
25
+	sed -i '' "s|(DESTDIR)|${PREFIX}|g" $(pcfiles)
26
+else
27
 	${SED} -i "s|(DESTDIR)|${DESTDIR}|g" $(pcfiles)
28
 endif
29
+endif
(-)net-mgmt/seafile/files/patch-lib_Makfile.am (-29 lines)
Lines 1-29 Link Here
1
--- lib/Makefile.am.orig	2015-01-28 13:44:26.000000000 -0500
2
+++ lib/Makefile.am	2015-01-28 13:48:00.000000000 -0500
3
@@ -53,6 +53,7 @@
4
 libseafile_common_la_LDFLAGS = -no-undefined
5
 libseafile_common_la_LIBADD = @GLIB2_LIBS@  @GOBJECT_LIBS@ @SSL_LIBS@ -lcrypto @LIB_GDI32@ \
6
 				     @LIB_UUID@ @LIB_WS32@ @LIB_PSAPI@ -lsqlite3 \
7
+				@LIB_KVM@ \
8
 					 @LIBEVENT_LIBS@ @SEARPC_LIBS@ @LIB_SHELL32@ \
9
 	@ZLIB_LIBS@
10
 
11
@@ -74,7 +75,7 @@
12
 	rm -f ${seafile_object_gen}
13
 	@rm -f vala.tmp
14
 	@touch vala.tmp
15
-	valac -C --pkg posix $^
16
+	valac -C --pkg posix ${seafile_object_define}
17
 	@mv -f vala.tmp $@
18
 
19
 ${seafile_object_gen}: vala.stamp
20
@@ -90,5 +91,9 @@
21
 if MACOS
22
 	sed -i '' -e "s|(DESTDIR)|${DESTDIR}|g" $(pcfiles)
23
 else
24
+if BSD
25
+	sed -i '' "s|(DESTDIR)|${PREFIX}|g" $(pcfiles)
26
+else
27
 	${SED} -i "s|(DESTDIR)|${DESTDIR}|g" $(pcfiles)
28
 endif
29
+endif
(-)net-mgmt/seafile/files/patch-lib_net.c (-3 / +3 lines)
Lines 1-6 Link Here
1
--- lib/net.c.orig	2015-01-28 00:52:56.000000000 -0500
1
--- lib/net.c.orig	2015-09-21 03:42:11 UTC
2
+++ lib/net.c	2015-01-28 00:55:31.000000000 -0500
2
+++ lib/net.c
3
@@ -157,7 +157,11 @@
3
@@ -157,7 +157,11 @@ ccnet_net_bind_tcp (int port, int nonblo
4
 
4
 
5
     snprintf (buf, sizeof(buf), "%d", port);
5
     snprintf (buf, sizeof(buf), "%d", port);
6
 
6
 
(-)net-mgmt/seafile/files/patch-lib_utils.c (-7 / +7 lines)
Lines 1-5 Link Here
1
--- lib/utils.c.orig	2015-01-28 01:03:42.000000000 -0500
1
--- lib/utils.c.orig	2015-09-21 03:42:11 UTC
2
+++ lib/utils.c	2015-01-28 01:26:32.000000000 -0500
2
+++ lib/utils.c
3
@@ -56,6 +56,16 @@
3
@@ -56,6 +56,16 @@
4
 
4
 
5
 #include <zlib.h>
5
 #include <zlib.h>
Lines 17-23 Link Here
17
 extern int inet_pton(int af, const char *src, void *dst);
17
 extern int inet_pton(int af, const char *src, void *dst);
18
 
18
 
19
 
19
 
20
@@ -2097,14 +2107,19 @@
20
@@ -2112,14 +2122,19 @@ wchar_from_utf8 (const char *utf8)
21
 
21
 
22
 #endif  /* ifdef WIN32 */
22
 #endif  /* ifdef WIN32 */
23
 
23
 
Lines 38-44 Link Here
38
         return -1;
38
         return -1;
39
     }
39
     }
40
 
40
 
41
@@ -2128,7 +2143,8 @@
41
@@ -2143,7 +2158,8 @@ find_process_in_dirent(struct dirent *di
42
 }
42
 }
43
 
43
 
44
 /* read the /proc fs to determine whether some process is running */
44
 /* read the /proc fs to determine whether some process is running */
Lines 48-54 Link Here
48
 {
48
 {
49
     DIR *proc_dir = opendir("/proc");
49
     DIR *proc_dir = opendir("/proc");
50
     if (!proc_dir) {
50
     if (!proc_dir) {
51
@@ -2153,7 +2169,8 @@
51
@@ -2168,7 +2184,8 @@ gboolean process_is_running (const char 
52
     return FALSE;
52
     return FALSE;
53
 }
53
 }
54
 
54
 
Lines 58-64 Link Here
58
 {
58
 {
59
     int count = 0;
59
     int count = 0;
60
     DIR *proc_dir = opendir("/proc");
60
     DIR *proc_dir = opendir("/proc");
61
@@ -2177,6 +2194,14 @@
61
@@ -2192,6 +2209,14 @@ int count_process(const char *process_na
62
     return count;
62
     return count;
63
 }
63
 }
64
 
64
 
Lines 73-79 Link Here
73
 #endif
73
 #endif
74
 
74
 
75
 #ifdef __APPLE__
75
 #ifdef __APPLE__
76
@@ -2187,6 +2212,119 @@
76
@@ -2202,6 +2227,119 @@ gboolean process_is_running (const char 
77
 }
77
 }
78
 #endif
78
 #endif
79
 
79
 
(-)net-mgmt/seafile/files/patch-lib_utils.h (-2 / +2 lines)
Lines 1-5 Link Here
1
--- lib/utils.h.orig	2015-01-28 00:57:13.000000000 -0500
1
--- lib/utils.h.orig	2015-09-21 03:42:11 UTC
2
+++ lib/utils.h	2015-01-28 01:01:59.000000000 -0500
2
+++ lib/utils.h
3
@@ -3,6 +3,9 @@
3
@@ -3,6 +3,9 @@
4
 #ifndef CCNET_UTILS_H
4
 #ifndef CCNET_UTILS_H
5
 #define CCNET_UTILS_H
5
 #define CCNET_UTILS_H
(-)net-mgmt/seafile/files/patch-scripts_setup-seafile.sh (-3 / +3 lines)
Lines 1-6 Link Here
1
--- scripts/setup-seafile.sh.orig	2015-01-28 00:37:17.000000000 -0500
1
--- scripts/setup-seafile.sh.orig	2015-10-12 04:12:33 UTC
2
+++ scripts/setup-seafile.sh	2015-01-28 00:43:26.000000000 -0500
2
+++ scripts/setup-seafile.sh
3
@@ -339,7 +339,11 @@
3
@@ -340,7 +340,11 @@ fi
4
 }
4
 }
5
 
5
 
6
 function copy_user_manuals() {
6
 function copy_user_manuals() {
(-)net-mgmt/seafile/files/patch-scripts_upgrade_regenerate__secret__key.sh (+13 lines)
Line 0 Link Here
1
--- scripts/upgrade/regenerate_secret_key.sh.orig	2015-10-21 04:01:24 UTC
2
+++ scripts/upgrade/regenerate_secret_key.sh
3
@@ -8,6 +8,8 @@ TOPDIR=$(dirname "${INSTALLPATH}")
4
 seahub_secret_keygen=${INSTALLPATH}/seahub/tools/secret_key_generator.py
5
 seahub_settings_py=${TOPDIR}/seahub_settings.py
6
 
7
-line="SECRET_KEY = \"$(python $seahub_secret_keygen)\""
8
+line="SECRET_KEY = \"$(python2.7 $seahub_secret_keygen)\""
9
 
10
-sed -i -e "/SECRET_KEY/c\\$line" $seahub_settings_py
11
+sed -i.bak -e "/SECRET_KEY/c\\
12
+$line
13
+" $seahub_settings_py
(-)net-mgmt/seafile/pkg-plist (-1 / +20 lines)
Lines 19-25 Link Here
19
%%SEAFILE_SERVER%%/seaf-gc.sh
19
%%SEAFILE_SERVER%%/seaf-gc.sh
20
%%SEAFILE_SERVER%%/seafile.sh
20
%%SEAFILE_SERVER%%/seafile.sh
21
%%SEAFILE_SERVER%%/seafile/bin/seaf-fsck
21
%%SEAFILE_SERVER%%/seafile/bin/seaf-fsck
22
%%SEAFILE_SERVER%%/seafile/bin/seaf-fuse
22
%%FUSE%%%%SEAFILE_SERVER%%/seafile/bin/seaf-fuse
23
%%SEAFILE_SERVER%%/seafile/bin/seaf-migrate
23
%%SEAFILE_SERVER%%/seafile/bin/seaf-migrate
24
%%SEAFILE_SERVER%%/seafile/bin/seaf-server
24
%%SEAFILE_SERVER%%/seafile/bin/seaf-server
25
%%SEAFILE_SERVER%%/seafile/bin/seaf-server-init
25
%%SEAFILE_SERVER%%/seafile/bin/seaf-server-init
Lines 51-56 Link Here
51
%%SEAFILE_SERVER%%/upgrade/db_update_1.3_1.4.py
51
%%SEAFILE_SERVER%%/upgrade/db_update_1.3_1.4.py
52
%%SEAFILE_SERVER%%/upgrade/db_update_helper.py
52
%%SEAFILE_SERVER%%/upgrade/db_update_helper.py
53
%%SEAFILE_SERVER%%/upgrade/minor-upgrade.sh
53
%%SEAFILE_SERVER%%/upgrade/minor-upgrade.sh
54
%%SEAFILE_SERVER%%/seaf-fsck.sh
55
%%SEAFILE_SERVER%%/upgrade/fix_mysql_user.py
56
%%SEAFILE_SERVER%%/upgrade/regenerate_secret_key.sh
54
%%SEAFILE_SERVER%%/upgrade/sql/1.6.0/mysql/seahub.sql
57
%%SEAFILE_SERVER%%/upgrade/sql/1.6.0/mysql/seahub.sql
55
%%SEAFILE_SERVER%%/upgrade/sql/1.6.0/sqlite3/seahub.sql
58
%%SEAFILE_SERVER%%/upgrade/sql/1.6.0/sqlite3/seahub.sql
56
%%SEAFILE_SERVER%%/upgrade/sql/1.7.0/mysql/seafile.sql
59
%%SEAFILE_SERVER%%/upgrade/sql/1.7.0/mysql/seafile.sql
Lines 69-74 Link Here
69
%%SEAFILE_SERVER%%/upgrade/sql/3.0.0/sqlite3/seahub.sql
72
%%SEAFILE_SERVER%%/upgrade/sql/3.0.0/sqlite3/seahub.sql
70
%%SEAFILE_SERVER%%/upgrade/sql/3.1.0/mysql/seahub.sql
73
%%SEAFILE_SERVER%%/upgrade/sql/3.1.0/mysql/seahub.sql
71
%%SEAFILE_SERVER%%/upgrade/sql/3.1.0/sqlite3/seahub.sql
74
%%SEAFILE_SERVER%%/upgrade/sql/3.1.0/sqlite3/seahub.sql
75
%%SEAFILE_SERVER%%/upgrade/sql/4.1.0/mysql/ccnet.sql
76
%%SEAFILE_SERVER%%/upgrade/sql/4.1.0/mysql/seafile.sql
77
%%SEAFILE_SERVER%%/upgrade/sql/4.1.0/sqlite3/ccnet/groupmgr.sql
78
%%SEAFILE_SERVER%%/upgrade/sql/4.1.0/sqlite3/seafile.sql
79
%%SEAFILE_SERVER%%/upgrade/sql/4.2.0/mysql/seafile.sql
80
%%SEAFILE_SERVER%%/upgrade/sql/4.2.0/mysql/seahub.sql
81
%%SEAFILE_SERVER%%/upgrade/sql/4.2.0/sqlite3/seafile.sql
82
%%SEAFILE_SERVER%%/upgrade/sql/4.2.0/sqlite3/seahub.sql
83
%%SEAFILE_SERVER%%/upgrade/sql/4.3.0/mysql/.gitkeep
84
%%SEAFILE_SERVER%%/upgrade/sql/4.3.0/sqlite3/.gitkeep
85
%%SEAFILE_SERVER%%/upgrade/sql/4.4.0/mysql/.gitkeep
86
%%SEAFILE_SERVER%%/upgrade/sql/4.4.0/sqlite3/.gitkeep
72
%%SEAFILE_SERVER%%/upgrade/upgrade_1.2_1.3.sh
87
%%SEAFILE_SERVER%%/upgrade/upgrade_1.2_1.3.sh
73
%%SEAFILE_SERVER%%/upgrade/upgrade_1.3_1.4.sh
88
%%SEAFILE_SERVER%%/upgrade/upgrade_1.3_1.4.sh
74
%%SEAFILE_SERVER%%/upgrade/upgrade_1.4_1.5.sh
89
%%SEAFILE_SERVER%%/upgrade/upgrade_1.4_1.5.sh
Lines 81-84 Link Here
81
%%SEAFILE_SERVER%%/upgrade/upgrade_2.2_3.0.sh
96
%%SEAFILE_SERVER%%/upgrade/upgrade_2.2_3.0.sh
82
%%SEAFILE_SERVER%%/upgrade/upgrade_3.0_3.1.sh
97
%%SEAFILE_SERVER%%/upgrade/upgrade_3.0_3.1.sh
83
%%SEAFILE_SERVER%%/upgrade/upgrade_3.1_4.0.sh
98
%%SEAFILE_SERVER%%/upgrade/upgrade_3.1_4.0.sh
99
%%SEAFILE_SERVER%%/upgrade/upgrade_4.0_4.1.sh
100
%%SEAFILE_SERVER%%/upgrade/upgrade_4.1_4.2.sh
101
%%SEAFILE_SERVER%%/upgrade/upgrade_4.2_4.3.sh
102
%%SEAFILE_SERVER%%/upgrade/upgrade_4.3_4.4.sh
84
@dir(%%SEAFILE_USERNAME%%,%%SEAFILE_GROUPNAME%%,755) %%HAIWENDIR%%
103
@dir(%%SEAFILE_USERNAME%%,%%SEAFILE_GROUPNAME%%,755) %%HAIWENDIR%%

Return to bug 203933