Mail archive
alpine-aports

Re: [alpine-aports] [PATCH] testing/csync2: Previously commited patches and nossl config patch. No post-install. You won ;)

From: Natanael Copa <ncopa_at_alpinelinux.org>
Date: Fri, 9 Oct 2015 09:54:33 +0200

On Wed, 7 Oct 2015 12:36:06 +0300
Valery Kartel <valery.kartel_at_gmail.com> wrote:

> ---
> testing/csync2/APKBUILD | 17 +++++++++++------
> testing/csync2/have-strlcpy.patch | 30 ++++++++++++++++++++++++++++++
> testing/csync2/nossl-config.patch | 19 +++++++++++++++++++
> testing/csync2/rsync-strlcpy-disable.patch | 20 --------------------
> 4 files changed, 60 insertions(+), 26 deletions(-)
> create mode 100644 testing/csync2/have-strlcpy.patch
> create mode 100644 testing/csync2/nossl-config.patch
> delete mode 100644 testing/csync2/rsync-strlcpy-disable.patch

Thanks!

I fixed the commit message. The "No post-install. You won ;)" will make
no sense for someone looking at the git log.

...

> diff --git a/testing/csync2/have-strlcpy.patch b/testing/csync2/have-strlcpy.patch
> new file mode 100644
> index 0000000..394e1ec
> --- /dev/null
> +++ b/testing/csync2/have-strlcpy.patch
> _at_@ -0,0 +1,30 @@
> +--- old/configure.ac
> ++++ new/configure.ac
> +_at_@ -43,7 +43,7 @@
> +
> +
> + dnl inspired by rsync's configure.ac
> +-AC_CHECK_FUNCS(fchmod setmode open64 mkstemp64)
> ++AC_CHECK_FUNCS(strlcpy fchmod setmode open64 mkstemp64)
> + AC_CACHE_CHECK([for secure mkstemp],csync_cv_HAVE_SECURE_MKSTEMP,[
> + AC_TRY_RUN([#include <stdlib.h>
> + #include <sys/types.h>
> +--- old/rsync.c
> ++++ new/rsync.c
> +_at_@ -38,7 +38,7 @@
> + #include <w32api/windows.h>
> + #endif
> +
> +-
> ++#ifndef HAVE_STRLCPY
> + /* This has been taken from rsync:lib/compat.c */
> +
> + /**
> +_at_@ -61,6 +61,7 @@
> + }
> + return ret;
> + }
> ++#endif
> +
> + /* splits filepath at the last '/', if any, like so:
> + * dirname basename filepath


This patch is perfect. Have you sent it upstream? If not, could you please do so?


> diff --git a/testing/csync2/nossl-config.patch b/testing/csync2/nossl-config.patch
> new file mode 100644
> index 0000000..66e76f8
> --- /dev/null
> +++ b/testing/csync2/nossl-config.patch
> _at_@ -0,0 +1,19 @@
> +--- old/csync2.cfg
> ++++ new/csync2.cfg
> +_at_@ -4,12 +4,15 @@
> + # Please read the documentation:
> + # http://oss.linbit.com/csync2/paper.pdf
> +
> ++# Do not use ssl by default
> ++nossl * *;
> ++

I'm not sure I like to simply disable ssl. Sören is right though, we
should provide an openssl config if we generate selfsigned cert.

I think we need move forward so I applied it as it is.

Would be nice to fix it properly though. main/dovecot has an openssl
config to genereate a selfsigned cert from post-install. Maybe use that
as reference if you want look at it again?

-nc


---
Unsubscribe:  alpine-aports+unsubscribe_at_lists.alpinelinux.org
Help:         alpine-aports+help_at_lists.alpinelinux.org
---
Received on Fri Oct 09 2015 - 09:54:33 GMT