diff options
| author | Jakub Jirutka <jakub@jirutka.cz> | 2020-11-14 13:12:23 +0100 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2020-11-14 13:40:12 +0100 |
| commit | 133809955776b1183f76cdbe895e7035ccfc85f2 (patch) | |
| tree | efb3d0e6c416346f1c800d0f171a0500ed61121f | |
| parent | 31033253a10ad435659193b6ecad24bc2f75f3a9 (diff) | |
community/clsync: upgrade to 0.4.5
| -rw-r--r-- | community/clsync/APKBUILD | 6 | ||||
| -rw-r--r-- | community/clsync/musl-fix.patch | 30 |
2 files changed, 2 insertions, 34 deletions
diff --git a/community/clsync/APKBUILD b/community/clsync/APKBUILD index 128b89bec90..45c6cfec985 100644 --- a/community/clsync/APKBUILD +++ b/community/clsync/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=clsync -pkgver=0.4.4 +pkgver=0.4.5 pkgrel=0 pkgdesc="File live sync daemon based on inotify" url="https://github.com/xaionaro/clsync" @@ -12,7 +12,6 @@ depends_dev="glib-dev fts-dev libcap-dev libexecinfo-dev linux-headers musl-dev" makedepends="$depends_dev autoconf automake file libtool" subpackages="$pkgname-openrc $pkgname-doc $pkgname-dev" source="$pkgname-$pkgver.tar.gz::https://github.com/xaionaro/clsync/archive/v$pkgver.tar.gz - musl-fix.patch $pkgname.initd $pkgname.confd " @@ -52,7 +51,6 @@ package() { install -d -m 0755 "$pkgdir"/etc/$pkgname } -sha512sums="cdafbf43fdeafe9cb53c08e0514ef356fb5b4bbd8da2226263180e7441d222c76e6c73f847f484b3688a8672e4a85df0346c0236d8d0ed4506d209189af02dcd clsync-0.4.4.tar.gz -3302e4d565c6647f27c5e24325a81eaf4789735a944b749a4f5b4372558c65ca4b8acd26eec097d965bc1c811597915c46eed75f697cb930e03a8113e20a1d82 musl-fix.patch +sha512sums="6568f3c49ac4fe11e54593ba23eed392d0b7d9b5bf052983c4a5a2befbb807dbd3f9d13412264f8909998702f869d1cd6db77d89bd9491414b1f3213437c5212 clsync-0.4.5.tar.gz 230324ec639454e614db886eb52f5c2270aae2c54ef46b62e45dba95440f55d02618fa79dccc73d20ed27012ef083cb45bdb3de8b3c4cc4ef91ba31c0e2f7c69 clsync.initd 227329c0c13c2db137d6d61905c7133fc7ca0666ceff8c14d043e2811adbe6ef5aae4c876093a4d91ec496646ccacc607c853d2c1c1a53ef6d2a4b4db9209307 clsync.confd" diff --git a/community/clsync/musl-fix.patch b/community/clsync/musl-fix.patch deleted file mode 100644 index ad219be3b3b..00000000000 --- a/community/clsync/musl-fix.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/mon_gio.c b/mon_gio.c -index 80bec82..c28ccb3 100644 ---- a/mon_gio.c -+++ b/mon_gio.c -@@ -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 ); - st_size = 0; - lstat_p = NULL; - } else { -- st_mode = lstat.st_mode; -- st_size = lstat.st_size; -- lstat_p = &lstat; -+ st_mode = _lstat.st_mode; -+ st_size = _lstat.st_size; -+ 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 ) ) { |