From f35b00e574686adb92fe917b51c17167d86c9f03 Mon Sep 17 00:00:00 2001 From: Francesco Colista Date: Mon, 23 Jan 2023 17:05:08 +0100 Subject: [PATCH] community/raft: upgrade to 0.17.1 --- community/raft/APKBUILD | 6 ++--- ...isable-bind-address-test-segfaulting.patch | 24 +++++++++++++++---- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/community/raft/APKBUILD b/community/raft/APKBUILD index 7717bded044..d96546937a2 100644 --- a/community/raft/APKBUILD +++ b/community/raft/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Francesco Colista # Maintainer: Francesco Colista pkgname=raft -pkgver=0.16.0 +pkgver=0.17.1 pkgrel=0 pkgdesc="C implementation of the Raft consensus protocol" url="https://github.com/canonical/raft" @@ -39,7 +39,7 @@ package() { } sha512sums=" -cee4a2f6fd9a0a16b591d46aa9df2104a50f2b62068eb27017e3347fc28a6b3cd3aef6bfabe3acc7e72844406b4b71aff1d1e088d08e83d6d2f5744876a681c8 raft-0.16.0.tar.gz +20e2b4a144a597b77bcb31e8b22355725142b14fb50e20b33509e7b0dd10aa20d08501b66e836c659e9aa492184db71ea9e53a45fe4b908b1464eb94431154db raft-0.17.1.tar.gz 1e0e82e42fb9a65e6135e47ef17494e40f973c9a1af8aab09ff10fdbee83b55183414ec6938205806a9f954bbefaaa5eee776bbd313072ac7ce0105f18a2be03 unistd-include.patch -c5c1fafcd379ee9ecc8ccb9eb5e4b829ac9154270e3ebb041ee42ddb3a0ebec23ef5de41501d0225089012921d0d491d5d63e221b06c47b50cd74b09f39342d4 disable-bind-address-test-segfaulting.patch +b5c6e5a1ae1b6a06005cdbd3d3379e1d0bc6136307578089971f8ac48601958e9d1d31410d26da4cc91206813a56f01ee59fca64cd68e9a37a9921a339b6bf05 disable-bind-address-test-segfaulting.patch " diff --git a/community/raft/disable-bind-address-test-segfaulting.patch b/community/raft/disable-bind-address-test-segfaulting.patch index 6f1ac8292fe..a18284c96b2 100644 --- a/community/raft/disable-bind-address-test-segfaulting.patch +++ b/community/raft/disable-bind-address-test-segfaulting.patch @@ -1,8 +1,22 @@ diff --git a/test/integration/test_uv_tcp_listen.c b/test/integration/test_uv_tcp_listen.c -index 2dbd378..efaba8f 100644 +index 3d6c031..bbeba5e 100644 --- a/test/integration/test_uv_tcp_listen.c +++ b/test/integration/test_uv_tcp_listen.c -@@ -268,11 +268,12 @@ TEST(tcp_listen, secondOfTwo, setUp, tearDown, 0, NULL) +@@ -216,11 +216,10 @@ TEST(tcp_listen, success, setUp, tearDown, 0, validListenParams) + } + + /* Parameters for invalid listen addresses */ +-static char *invalidAddresses[] = {"500.1.2.3:9000", "not-existing:9000", +- "192.0.2.0:9000", NULL}; ++static char *invalidAddresses[] = {"500.1.2.3:9000", "not-existing:9000", NULL}; + + static char *invalidBindAddresses[] = { +- "", "500.1.2.3:9000", "not-existing:9000", "192.0.2.0:9000", NULL}; ++ "", "500.1.2.3:9000", "not-existing:9000", NULL}; + + static MunitParameterEnum invalidTcpListenParams[] = { + {"address", invalidAddresses}, +@@ -269,11 +268,12 @@ TEST(tcp_listen, secondOfTwo, setUp, tearDown, 0, NULL) /* Simulate port already in use error by addrinfo response contain the same IP * twice */ @@ -16,7 +30,7 @@ index 2dbd378..efaba8f 100644 const struct AddrinfoResult results[] = { {"127.0.0.1", 9000}, {"127.0.0.1", 9000}, {"127.0.0.1", 9000}}; struct fixture *f = data; -@@ -280,8 +281,9 @@ TEST(tcp_listen, alreadyBound, setUp, tearDown, 0, NULL) +@@ -281,8 +281,9 @@ TEST(tcp_listen, alreadyBound, setUp, tearDown, 0, NULL) LISTEN(RAFT_IOERR); return MUNIT_OK; } @@ -27,7 +41,7 @@ index 2dbd378..efaba8f 100644 TEST(tcp_listen, cannotBindFirst, setUp, tearDown, 0, NULL) { const struct AddrinfoResult results[] = {{"192.0.2.0", 9000}, -@@ -291,8 +293,9 @@ TEST(tcp_listen, cannotBindFirst, setUp, tearDown, 0, NULL) +@@ -292,8 +293,9 @@ TEST(tcp_listen, cannotBindFirst, setUp, tearDown, 0, NULL) LISTEN(RAFT_IOERR); return MUNIT_OK; } @@ -38,7 +52,7 @@ index 2dbd378..efaba8f 100644 TEST(tcp_listen, cannotBindSecond, setUp, tearDown, 0, NULL) { const struct AddrinfoResult results[] = {{"127.0.0.1", 9000}, -@@ -302,6 +305,7 @@ TEST(tcp_listen, cannotBindSecond, setUp, tearDown, 0, NULL) +@@ -303,6 +305,7 @@ TEST(tcp_listen, cannotBindSecond, setUp, tearDown, 0, NULL) LISTEN(RAFT_IOERR); return MUNIT_OK; }