Skip to content

Commit 9e80abd

Browse files
committed
Fix incompatible pointer type
haiwen/seafile-server#758
1 parent bfe9589 commit 9e80abd

File tree

3 files changed

+30
-2
lines changed

3 files changed

+30
-2
lines changed

.SRCINFO

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
pkgbase = seafile-server
22
pkgdesc = Seafile server core
33
pkgver = 12.0.11
4-
pkgrel = 1
4+
pkgrel = 2
55
url = https://github.com/haiwen/seafile-server
66
arch = i686
77
arch = x86_64
@@ -25,11 +25,13 @@ pkgbase = seafile-server
2525
conflicts = seafile
2626
source = seafile-server-12.0.11.tar.gz::https://github.com/haiwen/seafile-server/archive/v12.0.11-server.tar.gz
2727
source = fix_seafile-controller_paths.diff
28+
source = fix_incompatible_pointer.diff
2829
2930
source = seafile-sysusers.conf
3031
source = seafile-tmpfiles.conf
3132
sha256sums = 935a778a6d809d63b928b74c708304f1e9cb8abbc41ebd91a342bd4a2fa755c5
3233
sha256sums = c4bd2b24fa2e5919b1ada61fff0dda7486460a8814764dc37db79178378d4930
34+
sha256sums = 3a0dd0d5a659d29f9f4b0f2406074e91a6f594f6cdc472838b6b4c99c25de55c
3335
sha256sums = b09ab24829df0692e78b777802298b8cac23bdcdc31306e12ed3543833a7088e
3436
sha256sums = 2faf52556d901ae18cfaa33b1cc55ee14abab4f78869eb6a2889ceeac4e3076a
3537
sha256sums = 24962ce5cba697d18980b9d418c7654fbfc5118c69236f9fc94aa3cd526ac176

PKGBUILD

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
pkgname=seafile-server
77
pkgver=12.0.11
8-
pkgrel=1
8+
pkgrel=2
99
pkgdesc='Seafile server core'
1010
arch=('i686' 'x86_64' 'armv7h' 'aarch64')
1111
url='https://github.com/haiwen/seafile-server'
@@ -26,13 +26,15 @@ conflicts=('seafile')
2626
source=(
2727
"$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver-server.tar.gz"
2828
'fix_seafile-controller_paths.diff'
29+
'fix_incompatible_pointer.diff'
2930
3031
'seafile-sysusers.conf'
3132
'seafile-tmpfiles.conf'
3233
)
3334
sha256sums=(
3435
'935a778a6d809d63b928b74c708304f1e9cb8abbc41ebd91a342bd4a2fa755c5'
3536
'c4bd2b24fa2e5919b1ada61fff0dda7486460a8814764dc37db79178378d4930'
37+
'3a0dd0d5a659d29f9f4b0f2406074e91a6f594f6cdc472838b6b4c99c25de55c'
3638
'b09ab24829df0692e78b777802298b8cac23bdcdc31306e12ed3543833a7088e'
3739
'2faf52556d901ae18cfaa33b1cc55ee14abab4f78869eb6a2889ceeac4e3076a'
3840
'24962ce5cba697d18980b9d418c7654fbfc5118c69236f9fc94aa3cd526ac176'
@@ -42,6 +44,7 @@ prepare() {
4244
cd "$srcdir/$pkgname-$pkgver-server"
4345
sed -i 's|(DESTDIR)@prefix@|@prefix@|' './lib/libseafile.pc.in'
4446
patch -p1 -i "$srcdir/fix_seafile-controller_paths.diff"
47+
patch -p1 -i "$srcdir/fix_incompatible_pointer.diff"
4548
}
4649

4750
build() {

fix_incompatible_pointer.diff

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
diff --git a/server/upload-file.c b/server/upload-file.c
2+
index 5012a57..9553722 100755
3+
--- a/server/upload-file.c
4+
+++ b/server/upload-file.c
5+
@@ -2640,8 +2640,8 @@ upload_headers_cb (evhtp_request_t *req, evhtp_headers_t *hdr, void *arg)
6+
seaf_metric_manager_in_flight_request_inc (seaf->metric_mgr);
7+
8+
/* Set up per-request hooks, so that we can read file data piece by piece. */
9+
- evhtp_set_hook (&req->hooks, evhtp_hook_on_read, upload_read_cb, fsm);
10+
- evhtp_set_hook (&req->hooks, evhtp_hook_on_request_fini, upload_finish_cb, fsm);
11+
+ evhtp_set_hook (&req->hooks, evhtp_hook_on_read, (evhtp_hook)upload_read_cb, fsm);
12+
+ evhtp_set_hook (&req->hooks, evhtp_hook_on_request_fini, (evhtp_hook)upload_finish_cb, fsm);
13+
/* Set arg for upload_cb or update_cb. */
14+
req->cbarg = fsm;
15+
16+
@@ -2889,6 +2889,7 @@ int
17+
upload_file_init (evhtp_t *htp, const char *http_temp_dir)
18+
{
19+
evhtp_callback_t *cb;
20+
+ evhtp_hook upload_headers_cb = (evhtp_hook)upload_headers_cb;
21+
22+
if (g_mkdir_with_parents (http_temp_dir, 0777) < 0) {
23+
seaf_warning ("Failed to create temp file dir %s.\n",

0 commit comments

Comments
 (0)