From cbf5eaa3cc3a8c1e008a712bd1e4822ca4d50ba7 Mon Sep 17 00:00:00 2001
From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Jul 26 2017 14:36:08 +0000
Subject: Update to v2


---

diff --git a/.gitignore b/.gitignore
index de989a6..18accdd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /casync-1.tar.gz
 /casync-2434f4c.tar.gz
 /casync-cc63fcd.tar.gz
+/casync-2.tar.gz
diff --git a/0001-Fix-segv-in-ca_remote_forget_chunk.patch b/0001-Fix-segv-in-ca_remote_forget_chunk.patch
new file mode 100644
index 0000000..fe78c7c
--- /dev/null
+++ b/0001-Fix-segv-in-ca_remote_forget_chunk.patch
@@ -0,0 +1,33 @@
+From 42b8c68addc8aed0a829b7678ef0ceefd47dc113 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
+Date: Wed, 26 Jul 2017 10:34:03 -0400
+Subject: [PATCH] Fix segv in ca_remote_forget_chunk
+
+With gcc-7.1.1-6.fc27:
+
+In file included from ../src/caformat-util.h:7:0,
+                 from ../src/caremote.c:8:
+../src/caremote.c: In function 'ca_remote_forget_chunk':
+../src/util.h:471:13: error: argument 1 null where non-null expected [-Werror=nonnull]
+         if (strncmp(s, prefix, l) == 0)
+             ^~~~~~~~~~~~~~~~~~~~~
+---
+ src/caremote.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/caremote.c b/src/caremote.c
+index 7d49923980..755c3a6389 100644
+--- a/src/caremote.c
++++ b/src/caremote.c
+@@ -2729,7 +2729,7 @@ int ca_remote_forget_chunk(CaRemote *rr, const CaChunkID *id) {
+ 
+                 p = startswith(qpos, "low-priority/");
+                 if (!p) {
+-                        p = startswith(p, "high-priority/");
++                        p = startswith(qpos, "high-priority/");
+                         if (!p) {
+                                 r = -EBADMSG;
+                                 goto finish;
+-- 
+2.13.0
+
diff --git a/casync.spec b/casync.spec
index 2de16e5..465a425 100644
--- a/casync.spec
+++ b/casync.spec
@@ -1,28 +1,35 @@
-%global gitcommit cc63fcd2b23def5ca6b824cdaf7ba6deda3d23de
+#global gitcommit cc63fcd2b23def5ca6b824cdaf7ba6deda3d23de
 %{?gitcommit:%global gitcommitshort %(c=%{gitcommit}; echo ${c:0:7})}
 
 Name:           casync
-Version:        1
-Release:        5%{?gitcommit:.git%{gitcommitshort}}%{?dist}
+Version:        2
+Release:        1%{?gitcommit:.git%{gitcommitshort}}%{?dist}
 Summary:        Content Addressable Data Synchronizer
 
 License:        LGPLv2+
 URL:            https://github.com/systemd/casync
 %if %{defined gitcommit}
-Source0:        https://github.com/keszybz/casync/archive/%{?gitcommit}.tar.gz#/%{name}-%{gitcommitshort}.tar.gz
+Source0:        https://github.com/keszybz/casync/archive/%{?gitcommit}/casync-%{shortcommit}.tar.gz
 %else
 Source0:        https://github.com/systemd/casync/archive/v%{version}/%{name}-%{version}.tar.gz
 %endif
+Patch0001:      0001-Fix-segv-in-ca_remote_forget_chunk.patch
 
 BuildRequires:  meson
 BuildRequires:  gcc
 BuildRequires:  pkgconfig(liblzma) >= 5.1.0
+BuildRequires:  pkgconfig(libzstd)
+BuildRequires:  pkgconfig(zlib)
 BuildRequires:  pkgconfig(libcurl) >= 7.32.0
 BuildRequires:  pkgconfig(fuse) >= 2.6
-BuildRequires:  libgcrypt-devel
+BuildRequires:  pkgconfig(libssl)
 BuildRequires:  libacl-devel
+# for rpm macros
+BuildRequires:  systemd
 # for tests
 BuildRequires:  rsync
+# for the man page
+BuildRequires:  python3-sphinx
 
 %description
 casync provides a way to efficiently transfer files which change over
@@ -60,8 +67,14 @@ export LC_CTYPE=C.utf8
 %_prefix/lib/casync/protocols/casync-ftp
 %_prefix/lib/casync/protocols/casync-http
 %_prefix/lib/casync/protocols/casync-https
+%_prefix/lib/casync/protocols/casync-sftp
+%_mandir/man1/casync.1*
+%_udevrulesdir/75-casync.rules
 
 %changelog
+* Wed Jul 26 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2-1
+- Update to latest version
+
 * Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1-5.gitcc63fcd
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
 
diff --git a/sources b/sources
index 56ce438..332e119 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (casync-cc63fcd.tar.gz) = 196b5935b2e287ec3a4d86cc40f808626aeba9537ba85e17bd95ae20e362108ff698bd0dcdba219a4a4b2123b952aaa02b9e00b81a94512ef7d3ee763d482353
+SHA512 (casync-2.tar.gz) = d3f27a8af75c07030cbd465bc716f74b1389234ff03c4043f76e898a2c2633ca6352618c89330aca6b83ff8d09082ff7d7a3d835035665c4f9eab9dc643fd3cf