package/keepalived: bump to version 2.2.8
Drop all patches (already in version) and so drop autoreconf https://www.keepalived.org/release-notes/Release-2.2.8.html Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Fabrice Fontaine
Peter Korsgaard
parent
799512e149
commit
1df2976f79
@ -612,9 +612,6 @@ package/janus-gateway/0001-disable-ssp.patch Upstream
|
||||
package/janus-gateway/0002-Add-test-for-Wunused-but-set-variable.patch Upstream
|
||||
package/jose/0001-lib-hsh.c-rename-hsh-local-variable.patch Upstream
|
||||
package/jose/0002-man-add-option-to-skip-building-man-pages.patch Upstream
|
||||
package/keepalived/0001-vrrp-nft-didn-t-support-meta-l4proro-until-Linux-3-14.patch Upstream
|
||||
package/keepalived/0002-ipvs-nft-didn-t-support-meta-l4proro-until-Linux-3-14.patch Upstream
|
||||
package/keepalived/0003-fix-build-with-libressl.patch Upstream
|
||||
package/kexec-lite/0001-clean-restart.patch Upstream
|
||||
package/keyutils/0001-fix-install-rule.patch Upstream
|
||||
package/keyutils/0002-cifs.patch Sob Upstream
|
||||
|
||||
@ -1,76 +0,0 @@
|
||||
From edc71b19c619fdc1d71df10a2d0e8f5822965d69 Mon Sep 17 00:00:00 2001
|
||||
From: Quentin Armitage <quentin@armitage.org.uk>
|
||||
Date: Tue, 8 Feb 2022 14:58:49 +0000
|
||||
Subject: [PATCH] vrrp: nft didn't support meta l4proro until Linux 3.14
|
||||
|
||||
For Linux 3.13 (first version to support nftables), we instead specify:
|
||||
@nh,48,8 58
|
||||
|
||||
Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
|
||||
|
||||
[Retrieved (and updated to drop update of README.kernel_versions) from:
|
||||
https://github.com/acassen/keepalived/commit/edc71b19c619fdc1d71df10a2d0e8f5822965d69]
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
README.kernel_versions | 1 +
|
||||
configure.ac | 5 +++++
|
||||
keepalived/vrrp/vrrp_nftables.c | 16 ++++++++++++++--
|
||||
3 files changed, 20 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 350a9f4e9..bc643dbf1 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -1754,6 +1754,11 @@ if test .${enable_nftables} != .no; then
|
||||
],[
|
||||
AC_MSG_RESULT(no)
|
||||
])
|
||||
+
|
||||
+ # nft l4proto from Linux 3.14
|
||||
+ AC_CHECK_DECLS([NFT_META_L4PROTO], [], [],
|
||||
+ [#include <linux/netfilter/nf_tables.h>])
|
||||
+
|
||||
# nft dup from Linux 4.3
|
||||
AC_CHECK_DECLS([NFTA_DUP_MAX], [], [],
|
||||
[#include <linux/netfilter/nf_tables.h>])
|
||||
diff --git a/keepalived/vrrp/vrrp_nftables.c b/keepalived/vrrp/vrrp_nftables.c
|
||||
index d3ea39db3..8b5095ad4 100644
|
||||
--- a/keepalived/vrrp/vrrp_nftables.c
|
||||
+++ b/keepalived/vrrp/vrrp_nftables.c
|
||||
@@ -1191,6 +1191,8 @@ setup_rule_move_igmp(uint8_t family, const char *table,
|
||||
otherwise:
|
||||
nft add rule ip keepalived out ip protocol igmp [meta oifkind macvlan] oif @vmac_set drop
|
||||
nft add rule ip6 keepalived out icmpv6 type mld2-listener-report [meta oifkind macvlan] oif @vmac_set drop
|
||||
+ *
|
||||
+ * Note: on 3.13 kernels, icmpv6 is specified as @nh,48,8 58
|
||||
*/
|
||||
struct nftnl_rule *r = NULL;
|
||||
uint64_t handle_num;
|
||||
@@ -1223,7 +1225,12 @@ setup_rule_move_igmp(uint8_t family, const char *table,
|
||||
offsetof(struct iphdr, daddr), sizeof(struct in_addr));
|
||||
#endif
|
||||
} else {
|
||||
- add_meta(r, NFT_META_L4PROTO, NFT_REG_1);
|
||||
+#if HAVE_DECL_NFT_META_L4PROTO
|
||||
+ add_meta(r, NFT_META_L4PROTO, NFT_REG_1); /* From Linux 3.14 */
|
||||
+#else
|
||||
+ add_payload(r, NFT_PAYLOAD_NETWORK_HEADER, NFT_REG_1,
|
||||
+ offsetof(struct ip6_hdr, ip6_nxt), sizeof(((struct ip6_hdr *)NULL)->ip6_nxt));
|
||||
+#endif
|
||||
protocol = IPPROTO_ICMPV6;
|
||||
add_cmp(r, NFT_REG_1, NFT_CMP_EQ, &protocol, sizeof(protocol));
|
||||
add_payload(r, NFT_PAYLOAD_TRANSPORT_HEADER, NFT_REG_1,
|
||||
@@ -1279,7 +1286,12 @@ setup_rule_drop_router_solicit(const char *table, const char *chain,
|
||||
nftnl_rule_set_u64(r, NFTNL_RULE_POSITION, handle_num);
|
||||
}
|
||||
|
||||
- add_meta(r, NFT_META_L4PROTO, NFT_REG_1);
|
||||
+#if HAVE_DECL_NFT_META_L4PROTO
|
||||
+ add_meta(r, NFT_META_L4PROTO, NFT_REG_1); /* From Linux 3.14 */
|
||||
+#else
|
||||
+ add_payload(r, NFT_PAYLOAD_NETWORK_HEADER, NFT_REG_1,
|
||||
+ offsetof(struct ip6_hdr, ip6_nxt), sizeof(((struct ip6_hdr *)NULL)->ip6_nxt));
|
||||
+#endif
|
||||
protocol = IPPROTO_ICMPV6;
|
||||
add_cmp(r, NFT_REG_1, NFT_CMP_EQ, &protocol, sizeof(protocol));
|
||||
add_payload(r, NFT_PAYLOAD_TRANSPORT_HEADER, NFT_REG_1,
|
||||
@ -1,40 +0,0 @@
|
||||
From 50e8a8d56cd5a3d7184b035708865302bbc7ef69 Mon Sep 17 00:00:00 2001
|
||||
From: Quentin Armitage <quentin@armitage.org.uk>
|
||||
Date: Tue, 8 Feb 2022 17:43:49 +0000
|
||||
Subject: [PATCH] ipvs: nft didn't support meta l4proro until Linux 3.14
|
||||
|
||||
For Linux 3.13 (first version to support nftables), we instead specify:
|
||||
ipv4: @nh,72,8 PROTO
|
||||
ipv6: @nh,48,8 PROTO
|
||||
|
||||
Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
|
||||
|
||||
[Retrieved from:
|
||||
https://github.com/acassen/keepalived/commit/50e8a8d56cd5a3d7184b035708865302bbc7ef69]
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
keepalived/check/check_nftables.c | 11 ++++++++++-
|
||||
1 file changed, 10 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/keepalived/check/check_nftables.c b/keepalived/check/check_nftables.c
|
||||
index 2d163ac14..45831203b 100644
|
||||
--- a/keepalived/check/check_nftables.c
|
||||
+++ b/keepalived/check/check_nftables.c
|
||||
@@ -150,7 +150,16 @@ setup_rule_set_mark(uint8_t family, const char *table,
|
||||
nftnl_rule_set_u64(r, NFTNL_RULE_POSITION, handle_num);
|
||||
}
|
||||
|
||||
- add_meta(r, NFT_META_L4PROTO, NFT_REG_1);
|
||||
+#if HAVE_DECL_NFT_META_L4PROTO
|
||||
+ add_meta(r, NFT_META_L4PROTO, NFT_REG_1); /* From Linux 3.14 */
|
||||
+#else
|
||||
+ if (family == NFPROTO_IPV4)
|
||||
+ add_payload(r, NFT_PAYLOAD_NETWORK_HEADER, NFT_REG_1,
|
||||
+ offsetof(struct iphdr, protocol), sizeof(((struct iphdr *)NULL)->protocol));
|
||||
+ else
|
||||
+ add_payload(r, NFT_PAYLOAD_NETWORK_HEADER, NFT_REG_1,
|
||||
+ offsetof(struct ip6_hdr, ip6_nxt), sizeof(((struct ip6_hdr *)NULL)->ip6_nxt));
|
||||
+#endif
|
||||
add_cmp(r, NFT_REG_1, NFT_CMP_EQ, &l4_protocol, sizeof(l4_protocol));
|
||||
if (family == NFPROTO_IPV4)
|
||||
add_payload(r, NFT_PAYLOAD_NETWORK_HEADER, NFT_REG_1,
|
||||
@ -1,50 +0,0 @@
|
||||
From bbec15d4781670ac1be5e543cb04543f79200e69 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Tue, 12 Apr 2022 20:30:57 +0200
|
||||
Subject: [PATCH] fix build with libressl
|
||||
|
||||
SSL_set0_rbio is provided by libressl since version 3.4.0 and
|
||||
https://github.com/libressl-portable/openbsd/commit/c99939f9665a9c3c648682b4987df46600b70efc
|
||||
but SSL_set0_wbio is not provided resulting in the following build
|
||||
failure:
|
||||
|
||||
/nvmedata/autobuild/instance-9/output-1/host/lib/gcc/s390x-buildroot-linux-gnu/10.3.0/../../../../s390x-buildroot-linux-gnu/bin/ld: check/libcheck.a(check_ssl.o): in function `ssl_connect':
|
||||
check_ssl.c:(.text+0x7da): undefined reference to `SSL_set0_wbio'
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/76f72a3c7350ea265e2277c89d68e5256410e94c
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Retrieved from:
|
||||
https://github.com/acassen/keepalived/commit/bbec15d4781670ac1be5e543cb04543f79200e69]
|
||||
---
|
||||
configure.ac | 2 +-
|
||||
keepalived/check/check_ssl.c | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 5a2ea76ec..e8b5ccc41 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -1327,7 +1327,7 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
|
||||
AC_CHECK_FUNCS([SSL_CTX_set_verify_depth])
|
||||
|
||||
# SSL_set0_rbio(), SSL_set0_wbio() OPENSSL_init_crypto() and TLS_method() introduced OpenSSL v1.1.0
|
||||
-AC_CHECK_FUNCS([SSL_set0_rbio OPENSSL_init_crypto TLS_method])
|
||||
+AC_CHECK_FUNCS([SSL_set0_wbio OPENSSL_init_crypto TLS_method])
|
||||
|
||||
# In OpenSSL v1.1.1 the call to SSL_CTX_new() fails if OPENSSL_init_crypto() has been called with
|
||||
# OPENSSL_INIT_NO_LOAD_CONFIG. It does not fail in v1.1.0h and v1.1.1b.
|
||||
diff --git a/keepalived/check/check_ssl.c b/keepalived/check/check_ssl.c
|
||||
index 0155fce59..2cbedb8d3 100644
|
||||
--- a/keepalived/check/check_ssl.c
|
||||
+++ b/keepalived/check/check_ssl.c
|
||||
@@ -234,7 +234,7 @@ ssl_connect(thread_ref_t thread, int new_req)
|
||||
BIO_get_fd(req->bio, &bio_fd);
|
||||
if (fcntl(bio_fd, F_SETFD, fcntl(bio_fd, F_GETFD) | FD_CLOEXEC) == -1)
|
||||
log_message(LOG_INFO, "Setting CLOEXEC failed on ssl socket - errno %d", errno);
|
||||
-#ifdef HAVE_SSL_SET0_RBIO
|
||||
+#ifdef HAVE_SSL_SET0_WBIO
|
||||
BIO_up_ref(req->bio);
|
||||
SSL_set0_rbio(req->ssl, req->bio);
|
||||
SSL_set0_wbio(req->ssl, req->bio);
|
||||
@ -1,3 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 c61940d874154a560a54627ecf7ef47adebdf832164368d10bf242a4d9b7d49d keepalived-2.2.7.tar.gz
|
||||
sha256 85882eb62974f395d4c631be990a41a839594a7e62fbfebcb5649a937a7a1bb6 keepalived-2.2.8.tar.gz
|
||||
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
|
||||
|
||||
@ -4,15 +4,13 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
KEEPALIVED_VERSION = 2.2.7
|
||||
KEEPALIVED_VERSION = 2.2.8
|
||||
KEEPALIVED_SITE = http://www.keepalived.org/software
|
||||
KEEPALIVED_DEPENDENCIES = host-pkgconf openssl
|
||||
KEEPALIVED_LICENSE = GPL-2.0+
|
||||
KEEPALIVED_LICENSE_FILES = COPYING
|
||||
KEEPALIVED_CPE_ID_VENDOR = keepalived
|
||||
KEEPALIVED_CONF_OPTS = --disable-hardening
|
||||
# We're patching configure.ac
|
||||
KEEPALIVED_AUTORECONF = YES
|
||||
|
||||
ifeq ($(BR2_PACKAGE_JSON_C),y)
|
||||
KEEPALIVED_DEPENDENCIES += json-c
|
||||
|
||||
Loading…
Reference in New Issue
Block a user