Backup_Repos/pentoo-overlay
1
0
Fork 0
mirror of https://github.com/pentoo/pentoo-overlay synced 2026-03-22 21:42:37 +01:00
Code Issues Projects Releases Wiki Activity

seafile-server: 7.0.2 bump, cleanup

Browse source
This commit is contained in:
blshkv 2019-06-19 08:00:17 +08:00
parent 64a9f111c6
commit bb86757709
No known key found for this signature in database
GPG key ID: 273E3E90D1A6294F
7 changed files with 8 additions and 198 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net-misc/ccnet-server/Manifest
View file

@ -1 +1 @@
DIST ccnet-server-7.0.1.tar.gz 218014 BLAKE2B 952e982cfcd05a1dff504b2817e9de128abfb3bdf7a67d214a21eaedf9e37fa0c176b88a7f463d16126fca2c3fda0ebfb6a2552ac5fbbf3cfdd3b7b5d07a6f8c SHA512 1c87896f5a3a7c1840c7302709b5f09dd6b93ca3063f4a7526a1d5621b811d17460d99fd0c55e3ce554bb0dce53da8690a7edfb7d6dfb5e12862490e818a9dbc
DIST ccnet-server-7.0.2.tar.gz 218034 BLAKE2B 7c5ff727b2620e0f56889376c817f5c01b5a3bcbe2dfba2e3b961608da27af9dce15fd80759b60e98a586bb2ede49cc9e39e479ea0a127446d6cceddf0f28f25 SHA512 b4115e6d98179027184845f47348ea7ec5c91cbc5d3a4ec7b47b45f6b0dab2566f8b41baf7913dd02175dbfc864cf7f9903c88b38e33ef0dc560e1aa06557376

0
net-misc/ccnet-server/ccnet-server-7.0.1-r1.ebuild → net-misc/ccnet-server/ccnet-server-7.0.2.ebuild
View file

2
net-misc/seafile-server/Manifest
View file

@ -1 +1 @@
DIST seafile-server-7.0.1.tar.gz 747882 BLAKE2B c3d081137fdaf6a09000439f6d82d3b65ce8822da235c658a57c0b8dd6a9ae18609abad43b1463f09e0e504d1d4c2c39869b499e4c3fea3d5a9295f34ea6febd SHA512 f9b3dec5c91558ca47b51a230329bc5103a06490f59c18913c1ba0bbafabe99a1a99370500a972fe8507b25b8e668b52aa83747c886996bd4d77e2c50ce2e03e
DIST seafile-server-7.0.2.tar.gz 747863 BLAKE2B 24fa5bd6d2b8ebb19b520e6685c242df8066d8d731fd6586dfd8cad711526b32167db92f50f1cf9e95e8c114648c1afa66bfc6743b47fe8f602eb2fc9388ea4d SHA512 46068d452976274bd773e5888179ee40b70a56bcf27f1fa0a7cb0c62705354eeb040bc1af12c7510be307d6b70ec96de7cd31af1b9a6ffd2e07a51895f4a891c

42
net-misc/seafile-server/files/7.0.1-ccnet.patch
View file

@ -1,42 +0,0 @@
diff -urN seafile-server-7.0.1-server.orig/server/repo-mgr.c seafile-server-7.0.1-server/server/repo-mgr.c
--- seafile-server-7.0.1-server.orig/server/repo-mgr.c 2019-05-30 20:37:43.000000000 +0800
+++ seafile-server-7.0.1-server/server/repo-mgr.c 2019-06-12 12:50:04.040923729 +0800
@@ -4260,7 +4260,7 @@
return NULL;
/* Get the groups this user belongs to. */
- groups = ccnet_get_groups_by_user (rpc_client, user, 1);
+ groups = ccnet_get_groups_by_user (rpc_client, user);
if (!groups) {
goto out;
}
@@ -4472,7 +4472,7 @@
goto out;
/* Get the groups this user belongs to. */
- groups = ccnet_get_groups_by_user (rpc_client, user, 1);
+ groups = ccnet_get_groups_by_user (rpc_client, user);
if (!groups) {
goto out;
}
diff -urN seafile-server-7.0.1-server.orig/server/repo-perm.c seafile-server-7.0.1-server/server/repo-perm.c
--- seafile-server-7.0.1-server.orig/server/repo-perm.c 2019-05-30 20:37:43.000000000 +0800
+++ seafile-server-7.0.1-server/server/repo-perm.c 2019-06-12 12:49:53.449922950 +0800
@@ -55,7 +55,7 @@
return NULL;
/* Get the groups this user belongs to. */
- groups = ccnet_get_groups_by_user (rpc_client, user_name, 1);
+ groups = ccnet_get_groups_by_user (rpc_client, user_name);
if (!groups) {
goto out;
}
@@ -170,7 +170,7 @@
}
g_hash_table_destroy (user_perms);
- groups = ccnet_get_groups_by_user (rpc_client, user, 1);
+ groups = ccnet_get_groups_by_user (rpc_client, user);
ccnet_rpc_client_free (rpc_client);
if (!groups) {
return NULL;

148
net-misc/seafile-server/files/libevhtp-1.2.18.patch
View file

@ -1,148 +0,0 @@
Author: Alexandre Rossi <alexandre.rossi@gmail.com>
Description: Fix download stalling on recent libevhtp
A while ago[1], evhtp_request_pause() behavior changed: it now disables
both read and write events. seafile-server would then stall.
.
[1] https://github.com/criticalstack/libevhtp/commit/6cd89466fd6bd76c5b8624be65af5893afe3e40c
[2] https://github.com/haiwen/seafile/issues/1119
Forwarded: no
Index: seafile-server/server/access-file.c
===================================================================
--- seafile-server.orig/server/access-file.c 2018-02-01 12:23:53.209308343 +0100
+++ seafile-server/server/access-file.c 2018-02-01 12:23:53.205308288 +0100
@@ -618,7 +618,7 @@
/* Block any new request from this connection before finish
* handling this request.
*/
- evhtp_request_pause (req);
+ bufferevent_disable(bev, EV_READ);
/* Kick start data transfer by sending out http headers. */
evhtp_send_reply_start(req, EVHTP_RES_OK);
@@ -967,7 +967,7 @@
/* Block any new request from this connection before finish
* handling this request.
*/
- evhtp_request_pause (req);
+ bufferevent_disable(bev, EV_READ);
/* Kick start data transfer by sending out http headers. */
evhtp_send_reply_start(req, EVHTP_RES_PARTIAL);
@@ -1032,7 +1032,7 @@
/* Block any new request from this connection before finish
* handling this request.
*/
- evhtp_request_pause (req);
+ bufferevent_disable(bev, EV_READ);
/* Kick start data transfer by sending out http headers. */
evhtp_send_reply_start(req, EVHTP_RES_OK);
@@ -1365,7 +1365,7 @@
/* Block any new request from this connection before finish
* handling this request.
*/
- evhtp_request_pause (req);
+ bufferevent_disable(bev, EV_READ);
/* Kick start data transfer by sending out http headers. */
evhtp_send_reply_start(req, EVHTP_RES_OK);
Index: seafile-server/server/upload-file.c
===================================================================
--- seafile-server.orig/server/upload-file.c 2018-02-01 12:23:53.209308343 +0100
+++ seafile-server/server/upload-file.c 2018-02-01 12:25:14.542400155 +0100
@@ -2054,6 +2054,7 @@
if (res != EVHTP_RES_OK) {
/* Don't receive any data before the connection is closed. */
//evhtp_request_pause (req);
+ // or for later evhtp bufferevent_disable(evhtp_request_get_bev(req), EV_READ);
/* Set keepalive to 0. This will cause evhtp to close the
* connection after sending the reply.
@@ -2271,6 +2272,7 @@
err:
/* Don't receive any data before the connection is closed. */
//evhtp_request_pause (req);
+ // or for later evhtp bufferevent_disable(evhtp_request_get_bev(req), EV_READ);
/* Set keepalive to 0. This will cause evhtp to close the
* connection after sending the reply.
--- seafile-server.orig/server/upload-file.c 2018-02-01 12:25:52.666911934 +0100
+++ seafile-server/server/upload-file.c 2018-02-01 12:27:37.812323399 +0100
@@ -2059,7 +2059,7 @@
/* Set keepalive to 0. This will cause evhtp to close the
* connection after sending the reply.
*/
- req->keepalive = 0;
+ req->flags &= ~EVHTP_REQ_FLAG_KEEPALIVE;
fsm->state = RECV_ERROR;
}
@@ -2260,8 +2260,8 @@
}
/* Set up per-request hooks, so that we can read file data piece by piece. */
- evhtp_set_hook (&req->hooks, evhtp_hook_on_read, upload_read_cb, fsm);
- evhtp_set_hook (&req->hooks, evhtp_hook_on_request_fini, upload_finish_cb, fsm);
+ evhtp_request_set_hook (req, evhtp_hook_on_read, upload_read_cb, fsm);
+ evhtp_request_set_hook (req, evhtp_hook_on_request_fini, upload_finish_cb, fsm);
/* Set arg for upload_cb or update_cb. */
req->cbarg = fsm;
@@ -2277,7 +2277,7 @@
/* Set keepalive to 0. This will cause evhtp to close the
* connection after sending the reply.
*/
- req->keepalive = 0;
+ req->flags &= ~EVHTP_REQ_FLAG_KEEPALIVE;
send_error_reply (req, EVHTP_RES_BADREQ, err_msg);
g_free (repo_id);
@@ -2346,38 +2346,32 @@
cb = evhtp_set_regex_cb (htp, "^/upload/.*", upload_cb, NULL);
/* upload_headers_cb() will be called after evhtp parsed all http headers. */
- evhtp_set_hook(&cb->hooks, evhtp_hook_on_headers, upload_headers_cb, NULL);
+ evhtp_callback_set_hook(cb, evhtp_hook_on_headers, upload_headers_cb, NULL);
cb = evhtp_set_regex_cb (htp, "^/upload-api/.*", upload_api_cb, NULL);
- evhtp_set_hook(&cb->hooks, evhtp_hook_on_headers, upload_headers_cb, NULL);
+ evhtp_callback_set_hook(cb, evhtp_hook_on_headers, upload_headers_cb, NULL);
cb = evhtp_set_regex_cb (htp, "^/upload-raw-blks-api/.*",
upload_raw_blks_api_cb, NULL);
- evhtp_set_hook(&cb->hooks, evhtp_hook_on_headers, upload_headers_cb, NULL);
+ evhtp_callback_set_hook(cb, evhtp_hook_on_headers, upload_headers_cb, NULL);
cb = evhtp_set_regex_cb (htp, "^/upload-blks-api/.*", upload_blks_api_cb, NULL);
- evhtp_set_hook(&cb->hooks, evhtp_hook_on_headers, upload_headers_cb, NULL);
-
- /* cb = evhtp_set_regex_cb (htp, "^/upload-blks-aj/.*", upload_blks_ajax_cb, NULL); */
- /* evhtp_set_hook(&cb->hooks, evhtp_hook_on_headers, upload_headers_cb, NULL); */
+ evhtp_callback_set_hook(cb, evhtp_hook_on_headers, upload_headers_cb, NULL);
cb = evhtp_set_regex_cb (htp, "^/upload-aj/.*", upload_ajax_cb, NULL);
- evhtp_set_hook(&cb->hooks, evhtp_hook_on_headers, upload_headers_cb, NULL);
+ evhtp_callback_set_hook(cb, evhtp_hook_on_headers, upload_headers_cb, NULL);
cb = evhtp_set_regex_cb (htp, "^/update/.*", update_cb, NULL);
- evhtp_set_hook(&cb->hooks, evhtp_hook_on_headers, upload_headers_cb, NULL);
+ evhtp_callback_set_hook(cb, evhtp_hook_on_headers, upload_headers_cb, NULL);
cb = evhtp_set_regex_cb (htp, "^/update-api/.*", update_api_cb, NULL);
- evhtp_set_hook(&cb->hooks, evhtp_hook_on_headers, upload_headers_cb, NULL);
+ evhtp_callback_set_hook(cb, evhtp_hook_on_headers, upload_headers_cb, NULL);
cb = evhtp_set_regex_cb (htp, "^/update-blks-api/.*", update_blks_api_cb, NULL);
- evhtp_set_hook(&cb->hooks, evhtp_hook_on_headers, upload_headers_cb, NULL);
-
- /* cb = evhtp_set_regex_cb (htp, "^/update-blks-aj/.*", update_blks_ajax_cb, NULL); */
- /* evhtp_set_hook(&cb->hooks, evhtp_hook_on_headers, upload_headers_cb, NULL); */
+ evhtp_callback_set_hook(cb, evhtp_hook_on_headers, upload_headers_cb, NULL);
cb = evhtp_set_regex_cb (htp, "^/update-aj/.*", update_ajax_cb, NULL);
- evhtp_set_hook(&cb->hooks, evhtp_hook_on_headers, upload_headers_cb, NULL);
+ evhtp_callback_set_hook(cb, evhtp_hook_on_headers, upload_headers_cb, NULL);
evhtp_set_regex_cb (htp, "^/upload_progress.*", upload_progress_cb, NULL);

8
net-misc/seafile-server/seafile-server-7.0.1-r3.ebuild → net-misc/seafile-server/seafile-server-7.0.2.ebuild
View file

@ -14,6 +14,7 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
#list of deps ./ci/requirements.txt
RDEPEND="${PYTHON_DEPS}
!net-libs/ccnet
net-misc/ccnet-server
@ -41,7 +42,6 @@ DEPEND="${RDEPEND}
S="${WORKDIR}/${P}-server"
src_prepare() {
#https://github.com/haiwen/seafile-server/issues/67#issuecomment-337904800
# eapply "${FILESDIR}/libevhtp-1.2.18.patch"
#https://github.com/openwrt/packages/tree/master/net/seafile-server/patches
@ -55,8 +55,9 @@ src_prepare() {
eapply "${FILESDIR}/090-django-11-compat.patch"
eapply "${FILESDIR}/100-seafile-admin-Make-sure-ccnet-is-running.patch"
#apply with net-libs/libevhtp
# eapply "${FILESDIR}/110-libevhtp-linking.patch"
#libevhtp 1.2.18 (not forked) patches
#https://github.com/haiwen/seafile-server/issues/67#issuecomment-337904800
## eapply "${FILESDIR}/110-libevhtp-linking.patch"
# eapply "${FILESDIR}/120-recent-libevhtp.patch"
# eapply "${FILESDIR}/130-newer-libevhtp.patch"
@ -64,7 +65,6 @@ src_prepare() {
#https://github.com/haiwen/seafile-server/issues/235
eapply "${FILESDIR}/remove_pc.patch"
sed -i '/seafile_HEADERS/d' lib/Makefile.am || die
# sed -i -e 's|seafile ||' python/Makefile.am || die
sed -i -e 's/valac /${VALAC} /' lib/Makefile.am || die

4
www-apps/seahub/files/seahub.sh
View file

@ -230,9 +230,9 @@ function clear_sessions () {
function stop_seahub () {
if [[ -f ${pidfile} ]]; then
echo "Stopping seahub ..."
pkill -9 -f "thirdpart/gunicorn"
pkill -9 -f "gunicorn"
sleep 1
if pgrep -f "thirdpart/gunicorn" 2>/dev/null 1>&2 ; then
if pgrep -f "gunicorn" 2>/dev/null 1>&2 ; then
echo 'Failed to stop seahub.'
exit 1
fi