Valery Kartel: 1 testing/csync2: Previously commited patches and nossl config patch. No post-install. You won ;) 4 files changed, 60 insertions(+), 26 deletions(-)
Copy & paste the following snippet into your terminal to import this patchset into git:
curl -s https://lists.alpinelinux.org/~alpine/aports/patches/1411/mbox | git am -3Learn more about email & git
--- 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
Natanael Copa <ncopa@alpinelinux.org>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/APKBUILD b/testing/csync2/APKBUILD index ada4ab4..7850f17 100644 --- a/testing/csync2/APKBUILD +++ b/testing/csync2/APKBUILD @@ -4,19 +4,20 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=csync2 pkgver=2.0 -pkgrel=1 +pkgrel=2 pkgdesc="Cluster synchronization tool" url="http://oss.linbit.com/csync2/" arch="all" license="GPL2+" depends="" depends_dev="" -makedepends="librsync-dev gnutls-dev sqlite-dev mysql-dev postgresql-dev" +makedepends="autoconf automake librsync-dev gnutls-dev sqlite-dev mysql-dev postgresql-dev" install="$pkgname.post-upgrade" subpackages="$pkgname-compare $pkgname-doc" source="http://oss.linbit.com/$pkgname/$pkgname-$pkgver.tar.gz longlong-format.patch - rsync-strlcpy-disable.patch + nossl-config.patch + have-strlcpy.patch $pkgname.initd" _builddir="$srcdir"/$pkgname-$pkgver @@ -27,6 +28,7 @@ prepare() { *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; esac done + autoreconf --install --force } build() { @@ -63,13 +65,16 @@ compare() { md5sums="4069fc9e86e8508c392fe2862059eb91 csync2-2.0.tar.gz 8fc73254db29316f9125761d18f1ed46 longlong-format.patch -5908c4106d4866ab1c1f88f4c9482c9f rsync-strlcpy-disable.patch +b5adcbe1a3b0bc409336e539087319ea nossl-config.patch +3ed476916ba9afa7c4aa587ae86a6e34 have-strlcpy.patch bf77ad1534addbd596a08d1f7084e85e csync2.initd" sha256sums="11cb37380fb185bce0c22b804fec9b01c385d9d83cc528cfd48d748453834fa2 csync2-2.0.tar.gz afb1317987cc4b81908bc437269162c7af23b34e6842306483da5b53efce2db3 longlong-format.patch -339c7f5d91ff7ed3e63de5a5e39cf17efd7533f9c460eb81db76003acb164017 rsync-strlcpy-disable.patch +bc7abcb34224b6ea77cd4f90ee69d916b4bc7ef0f321bd649b1060ff54cdc084 nossl-config.patch +f9aad05465919657894ee24fd102451790911445d0d8291ce565242a96f6024e have-strlcpy.patch 0c1488e6bca746d8e5c5e3d893997b94e3c1766de69270d7c5c5a2282fb3b767 csync2.initd" sha512sums="f91fd222f67affe9634471d341b43ff67854a6ed25b620301a454e98a79a9fb80b2a66eb8713546758fd08300d52751e5ca7472c696daa20ee11779b87a830f8 csync2-2.0.tar.gz 38a17cbf23cbccd4996ad1af049851e33179586e619e3f3edbfacbaa36662e44d916839acd59b1cfc67b3af9042c3258068ec9e5b57f7e26c00a41a0e6f0e148 longlong-format.patch -c44ad7e7fb7093f66fd9582b5309e3929dfdf7b76ef4d234d346fa25158f088b9436db9a1989d036d739570459867210d053af62125facb66e4f5202448c7bea rsync-strlcpy-disable.patch +9fe50c761ba463ebeecda147c7172526bb9a2378e11101bcab60433b2aec389439eefe8139539babe0d680e2f30cc69df34788454a1d3dce64decd66cc153b32 nossl-config.patch +66a4762c2a6f99dd0f48aaf36d977150b93f3710de8ae34f090636285115a5801878089ca509d26737bbc30fadb6f9f6acebad8cea1c60e40aaff95ce43ee3a6 have-strlcpy.patch 5050af0004679c7c63e0eb41a8dfed9ca1d92ce6acaee7c5e2150ce808474c61e6feb84f9b77185a282fbb36de9b981e1eab937ee0fb1ec045ab587960fda812 csync2.initd" 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 @@ -0,0 +1,30 @@ +--- old/configure.ac ++++ new/configure.ac +@@ -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 +@@ -38,7 +38,7 @@ + #include <w32api/windows.h> + #endif + +- ++#ifndef HAVE_STRLCPY + /* This has been taken from rsync:lib/compat.c */ + + /** +@@ -61,6 +61,7 @@ + } + return ret; + } ++#endif + + /* splits filepath at the last '/', if any, like so: + * dirname basename filepath
Natanael Copa <ncopa@alpinelinux.org>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 @@ -0,0 +1,19 @@ +--- old/csync2.cfg ++++ new/csync2.cfg +@@ -4,12 +4,15 @@ + # Please read the documentation: + # http://oss.linbit.com/csync2/paper.pdf + ++# Do not use ssl by default ++nossl * *; ++
Natanael Copa <ncopa@alpinelinux.org>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@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---
+ # group mygroup + # { + # host host1 host2 (host3); + # host host4@host4-eth2; + # +-# key /etc/csync2.key_mygroup; ++# key /etc/csync2/csync2.key_mygroup; + # + # # + # # WARNING: diff --git a/testing/csync2/rsync-strlcpy-disable.patch b/testing/csync2/rsync-strlcpy-disable.patch deleted file mode 100644 index 5d28e1d..0000000 --- a/testing/csync2/rsync-strlcpy-disable.patch @@ -1,20 +0,0 @@ ---- old/rsync.c -+++ new/rsync.c -@@ -48,7 +48,7 @@ - * @param bufsize is the size of the destination buffer. - * - * @return index of the terminating byte. -- **/ -+ * disabled - static size_t strlcpy(char *d, const char *s, size_t bufsize) - { - size_t len = strlen(s); -@@ -61,7 +61,7 @@ - } - return ret; - } -- -+ **/ - /* splits filepath at the last '/', if any, like so: - * dirname basename filepath - * "/" "" "/" -- 2.5.3 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---