mirror of
https://github.com/novatiq/packages.git
synced 2026-04-30 07:28:39 +01:00
seafile-ccnet: Update to 7.1.2, add Python 3 bindings package
* Update package to 7.1.2 * Add Python 3 bindings package. The Python dependency is moved from seafile-ccnet to python3-seafile-ccnet. * Refresh patches. The path to valac does not need to be patched in 010-Makefile.patch because $(STAGING_DIR_HOSTPKG)/bin is already in the path during package build. * Use SEAFILE_UCI_LOG_DIR and SEAFILE_UCI_SOCKET_DIR, which will be added to seafile-server * Install binaries to /usr/libexec instead of /usr/bin, to mirror an upcoming change in seafile-server * Clean up Makefile formatting * Add myself as a maintainer Signed-off-by: Jeffery To <jeffery.to@gmail.com>
This commit is contained in:
@@ -0,0 +1,33 @@
|
||||
--- a/net/common/rpc-service.c
|
||||
+++ b/net/common/rpc-service.c
|
||||
@@ -314,7 +314,11 @@ ccnet_start_rpc(CcnetSession *session)
|
||||
|
||||
#endif /* CCNET_SERVER */
|
||||
|
||||
- char *path = g_build_filename (session->config_dir, CCNET_SOCKET_NAME, NULL);
|
||||
+ const char *socket_dir = g_getenv ("SEAFILE_UCI_SOCKET_DIR");
|
||||
+ if (!socket_dir) {
|
||||
+ socket_dir = session->config_dir;
|
||||
+ }
|
||||
+ char *path = g_build_filename (socket_dir, CCNET_SOCKET_NAME, NULL);
|
||||
SearpcNamedPipeServer *server = searpc_create_named_pipe_server_with_threadpool (path, NAMED_PIPE_SERVER_THREAD_POOL_SIZE);
|
||||
if (!server) {
|
||||
ccnet_warning ("Failed to create named pipe server.\n");
|
||||
--- a/net/server/ccnet-server.c
|
||||
+++ b/net/server/ccnet-server.c
|
||||
@@ -292,10 +292,13 @@ main (int argc, char **argv)
|
||||
config_dir = ccnet_expand_path (config_dir);
|
||||
|
||||
if (!log_file) {
|
||||
- char *logdir = g_build_filename (config_dir, "logs", NULL);
|
||||
+ char *logdir = g_strdup (g_getenv ("SEAFILE_UCI_LOG_DIR"));
|
||||
+ if (!logdir) {
|
||||
+ logdir = g_build_filename (config_dir, "logs", NULL);
|
||||
+ }
|
||||
checkdir_with_mkdir (logdir);
|
||||
+ log_file = g_build_filename (logdir, "ccnet.log", NULL);
|
||||
g_free (logdir);
|
||||
- log_file = g_build_filename (config_dir, "logs", "ccnet.log", NULL);
|
||||
}
|
||||
if (ccnet_log_init (log_file, log_level_str) < 0) {
|
||||
fprintf (stderr, "ccnet_log_init error: %s, %s\n", strerror(errno),
|
||||
Reference in New Issue
Block a user