aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo <thinkabit.ukim@gmail.com>2019-11-25 15:47:43 +0100
committerJakub Jirutka <jakub@jirutka.cz>2019-12-19 23:57:49 +0100
commit2d7d02837781c16b7d2eeca6b6dd58f65630bc1f (patch)
tree0f32b3d369236291a6184888d79292db3ab5a6f6
parent204537a1ffc9406723894fd10f80cff455d93579 (diff)
downloadaports-2d7d02837781c16b7d2eeca6b6dd58f65630bc1f.tar.gz
aports-2d7d02837781c16b7d2eeca6b6dd58f65630bc1f.tar.bz2
aports-2d7d02837781c16b7d2eeca6b6dd58f65630bc1f.tar.xz
community/clsync: upgrade to 0.4.3
-rw-r--r--community/clsync/APKBUILD11
-rw-r--r--community/clsync/musl-fix.patch22
2 files changed, 17 insertions, 16 deletions
diff --git a/community/clsync/APKBUILD b/community/clsync/APKBUILD
index e06d4e0fc9..3fb5199099 100644
--- a/community/clsync/APKBUILD
+++ b/community/clsync/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=clsync
-pkgver=0.4.2
-pkgrel=1
+pkgver=0.4.3
+pkgrel=0
pkgdesc="File live sync daemon based on inotify"
url="https://github.com/xaionaro/clsync"
arch="x86 x86_64"
@@ -44,10 +44,7 @@ package() {
cd "$builddir"
make DESTDIR="$pkgdir" install
-
- # https://github.com/xaionaro/clsync/issues/150
- rm "$pkgdir"/usr/bin/gencompilerflags
}
-sha512sums="d14a2efc4bf58d9d5c7a3fe5634cacdd182cd7cd814b0e9ebd99024a7282b056d1f7ceeec6903666391c3572d599a18e205af818b098ed7768d5c0e0f4cd1200 clsync-0.4.2.tar.gz
-98e81408911731f6e203368094ea0e9eda312648eef8c5beec98b13c6ee43bccee59f0777805bea4d26cbe4e964d2ff95fe863be5be7750b50358d213f106542 musl-fix.patch"
+sha512sums="ab803cc04cd2efd5902ea54ae3f7dc29fd88fc01b70f90112f188b60bb45fe79e255a91df3fa429d0b0f4fb6f67ea453d732a53b4db44d9f85077230d9095e4a clsync-0.4.3.tar.gz
+8211e588246a754770713be36b316a47e525f02abad580102720ecff460ed7ccb21d1e56c9c427c974747cd25c8f9c879dd89a5aaba56eeaef5d5422844885fd musl-fix.patch"
diff --git a/community/clsync/musl-fix.patch b/community/clsync/musl-fix.patch
index a0dc31e9f2..5a3bb2a09e 100644
--- a/community/clsync/musl-fix.patch
+++ b/community/clsync/musl-fix.patch
@@ -3,21 +3,25 @@ musl declares lstat64 only for GNU compatibility using macro
global function lstat from sys/stat.h.
Upstream issue: https://github.com/xaionaro/clsync/issues/150
+
+diff --git a/mon_gio.c b/mon_gio.c
+index 80bec82..c28ccb3 100644
--- a/mon_gio.c
+++ b/mon_gio.c
-@@ -305,18 +305,18 @@
- count = 0;
- while (gio_wait(ctx_p, indexes_p, &tv)) {
+@@ -316,19 +316,19 @@ int gio_handle ( ctx_t *ctx_p, indexes_t *indexes_p )
+
+ while ( gio_wait ( ctx_p, indexes_p, &tv ) ) {
event_t *ev = event_pop();
- stat64_t lstat, *lstat_p;
+ stat64_t _lstat, *lstat_p;
mode_t st_mode;
size_t st_size;
-- if ((ev->objtype_new == EOT_DOESNTEXIST) || (ctx_p->flags[CANCEL_SYSCALLS]&CSC_MON_STAT) || lstat64(ev->path, &lstat)) {
-- debug(2, "Cannot lstat64(\"%s\", lstat). Seems, that the object had been deleted (%i) or option \"--cancel-syscalls mon_stat\" (%i) is set.", ev->path, ev->objtype_new == EOT_DOESNTEXIST, ctx_p->flags[CANCEL_SYSCALLS]&CSC_MON_STAT);
-+ if ((ev->objtype_new == EOT_DOESNTEXIST) || (ctx_p->flags[CANCEL_SYSCALLS]&CSC_MON_STAT) || lstat64(ev->path, &_lstat)) {
-+ debug(2, "Cannot lstat64(\"%s\", _lstat). Seems, that the object had been deleted (%i) or option \"--cancel-syscalls mon_stat\" (%i) is set.", ev->path, ev->objtype_new == EOT_DOESNTEXIST, ctx_p->flags[CANCEL_SYSCALLS]&CSC_MON_STAT);
- st_mode = (ev->objtype_event == EOT_DIR ? S_IFDIR : S_IFREG);
+
+- if ( ( ev->objtype_new == EOT_DOESNTEXIST ) || ( ctx_p->flags[CANCEL_SYSCALLS]&CSC_MON_STAT ) || lstat64 ( ev->path, &lstat ) ) {
+- debug ( 2, "Cannot lstat64(\"%s\", lstat). Seems, that the object had been deleted (%i) or option \"--cancel-syscalls mon_stat\" (%i) is set.", ev->path, ev->objtype_new == EOT_DOESNTEXIST, ctx_p->flags[CANCEL_SYSCALLS]&CSC_MON_STAT );
++ if ( ( ev->objtype_new == EOT_DOESNTEXIST ) || ( ctx_p->flags[CANCEL_SYSCALLS]&CSC_MON_STAT ) || lstat64 ( ev->path, &_lstat ) ) {
++ debug ( 2, "Cannot lstat64(\"%s\", _lstat). Seems, that the object had been deleted (%i) or option \"--cancel-syscalls mon_stat\" (%i) is set.", ev->path, ev->objtype_new == EOT_DOESNTEXIST, ctx_p->flags[CANCEL_SYSCALLS]&CSC_MON_STAT );
+ st_mode = ( ev->objtype_event == EOT_DIR ? S_IFDIR : S_IFREG );
st_size = 0;
lstat_p = NULL;
} else {
@@ -29,4 +33,4 @@ Upstream issue: https://github.com/xaionaro/clsync/issues/150
+ lstat_p = &_lstat;
}
- if (sync_prequeue_loadmark(1, ctx_p, indexes_p, NULL, ev->path, lstat_p, ev->objtype_old, ev->objtype_new, ev->event_id, ev->handle_id, st_mode, st_size, &path_full, &path_full_len, NULL)) {
+ if ( sync_prequeue_loadmark ( 1, ctx_p, indexes_p, NULL, ev->path, lstat_p, ev->objtype_old, ev->objtype_new, ev->event_id, ev->handle_id, st_mode, st_size, &path_full, &path_full_len, NULL ) ) {