From 3396588daad09462127e587364a6546d56b15763 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Tue, 6 Oct 2015 16:41:44 +0200 Subject: [PATCH] New package: csync2-2.0 Closes #2680 --- srcpkgs/csync2/patches/remove-strlcpy.patch | 36 +++++++++++++++++++++ srcpkgs/csync2/template | 15 +++++++++ 2 files changed, 51 insertions(+) create mode 100644 srcpkgs/csync2/patches/remove-strlcpy.patch create mode 100644 srcpkgs/csync2/template diff --git a/srcpkgs/csync2/patches/remove-strlcpy.patch b/srcpkgs/csync2/patches/remove-strlcpy.patch new file mode 100644 index 0000000000..75332e89b3 --- /dev/null +++ b/srcpkgs/csync2/patches/remove-strlcpy.patch @@ -0,0 +1,36 @@ +The declaration of strlcpy conflicts with the musl libc +implementation. The libc (GNU or musl) implementation +should be sufficient in any case. + +--- rsync.c 2015-03-09 15:08:51.000000000 +0100 ++++ rsync.c 2015-10-06 16:39:10.499186490 +0200 +@@ -39,29 +39,6 @@ + #endif + + +-/* This has been taken from rsync:lib/compat.c */ +- +-/** +- * Like strncpy but does not 0 fill the buffer and always null +- * terminates. +- * +- * @param bufsize is the size of the destination buffer. +- * +- * @return index of the terminating byte. +- **/ +-static size_t strlcpy(char *d, const char *s, size_t bufsize) +-{ +- size_t len = strlen(s); +- size_t ret = len; +- if (bufsize > 0) { +- if (len >= bufsize) +- len = bufsize-1; +- memcpy(d, s, len); +- d[len] = 0; +- } +- return ret; +-} +- + /* splits filepath at the last '/', if any, like so: + * dirname basename filepath + * "/" "" "/" diff --git a/srcpkgs/csync2/template b/srcpkgs/csync2/template new file mode 100644 index 0000000000..ddc909e68b --- /dev/null +++ b/srcpkgs/csync2/template @@ -0,0 +1,15 @@ +# Template file for 'csync2' +pkgname=csync2 +version=2.0 +revision=1 +build_style=gnu-configure +conf_files="/etc/csync2.cfg" +hostmakedepends="pkg-config" +makedepends="librsync-devel sqlite-devel gnutls-devel" +short_desc="A cluster synchronization tool" +maintainer="Diogo Leal " +license="GPL-3" +homepage="http://oss.linbit.com/csync2/" +distfiles="http://oss.linbit.com/csync2/csync2-${version}.tar.gz" +checksum=11cb37380fb185bce0c22b804fec9b01c385d9d83cc528cfd48d748453834fa2 +