From 88ec8aef8fc2eb71e8108dfa83689ba61769d816 Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Thu, 2 Jan 2020 09:23:17 -0600 Subject: [PATCH] Update to 1.31 (#1726210) --- .gitignore | 1 + ...e-original-errno-from-netlink-answer.patch | 80 ------------------- ...s-discrepancy-with-libnl-genlmsg_put.patch | 40 ---------- ipvsadm.spec | 15 ++-- sources | 2 +- 5 files changed, 9 insertions(+), 129 deletions(-) delete mode 100644 0001-ipvsadm-catch-the-original-errno-from-netlink-answer.patch delete mode 100644 0002-libipvs-discrepancy-with-libnl-genlmsg_put.patch diff --git a/.gitignore b/.gitignore index eafa358..7334550 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ ipvsadm-1.25.tar.gz /ipvsadm-1.27.tar.gz /ipvsadm-1.28.tar.gz /ipvsadm-1.29.tar.gz +/ipvsadm-1.31.tar.gz diff --git a/0001-ipvsadm-catch-the-original-errno-from-netlink-answer.patch b/0001-ipvsadm-catch-the-original-errno-from-netlink-answer.patch deleted file mode 100644 index a9ffeec..0000000 --- a/0001-ipvsadm-catch-the-original-errno-from-netlink-answer.patch +++ /dev/null @@ -1,80 +0,0 @@ -From f8cff0808a24b1dd141e86cc8039108aa1763071 Mon Sep 17 00:00:00 2001 -From: Julian Anastasov -Date: Sat, 5 Aug 2017 14:38:28 +0300 -Subject: [PATCH 1/2] ipvsadm: catch the original errno from netlink answer - -nl_recvmsgs_default() returns NLE_* error codes and not -errno values. As result, attempt to delete virtual service -returns NLE_OBJ_NOTFOUND (12) which matches the ENOMEM value. - -Problem as reported by Emanuele Rocca: - -ipvsadm -D -t example.org:80 -Memory allocation problem - -Fix it by providing generic error handler to catch the errno -value as returned in netlink answer. By this way all netlink -commands will get proper error string. The problem is present -only when ipvsadm is compiled with libnl. - -ipvsadm -D -t example.org:80 -No such service - -Reported-by: Emanuele Rocca -Signed-off-by: Julian Anastasov -Signed-off-by: Jesper Dangaard Brouer ---- - libipvs/libipvs.c | 22 +++++++++++++++++++++- - 1 file changed, 21 insertions(+), 1 deletion(-) - -diff --git a/libipvs/libipvs.c b/libipvs/libipvs.c -index 180ea42..d271c48 100644 ---- a/libipvs/libipvs.c -+++ b/libipvs/libipvs.c -@@ -74,9 +74,23 @@ static int ipvs_nl_noop_cb(struct nl_msg *msg, void *arg) - return NL_OK; - } - -+struct cb_err_data { -+ int err; -+}; -+ -+static int ipvs_nl_err_cb(struct sockaddr_nl *nla, struct nlmsgerr *nlerr, -+ void *arg) -+{ -+ struct cb_err_data *data = arg; -+ -+ data->err = nlerr->error; -+ return -nl_syserr2nlerr(nlerr->error); -+} -+ - int ipvs_nl_send_message(struct nl_msg *msg, nl_recvmsg_msg_cb_t func, void *arg) - { - int err = EINVAL; -+ struct cb_err_data err_data = { .err = 0 }; - - sock = nl_socket_alloc(); - if (!sock) { -@@ -100,12 +114,18 @@ int ipvs_nl_send_message(struct nl_msg *msg, nl_recvmsg_msg_cb_t func, void *arg - - if (nl_socket_modify_cb(sock, NL_CB_VALID, NL_CB_CUSTOM, func, arg) != 0) - goto fail_genl; -+ if (nl_socket_modify_err_cb(sock, NL_CB_CUSTOM, ipvs_nl_err_cb, -+ &err_data) != 0) -+ goto fail_genl; - - if (nl_send_auto_complete(sock, msg) < 0) - goto fail_genl; - -- if ((err = -nl_recvmsgs_default(sock)) > 0) -+ if (nl_recvmsgs_default(sock) < 0) { -+ if (err_data.err) -+ err = -err_data.err; - goto fail_genl; -+ } - - nlmsg_free(msg); - --- -2.14.3 - diff --git a/0002-libipvs-discrepancy-with-libnl-genlmsg_put.patch b/0002-libipvs-discrepancy-with-libnl-genlmsg_put.patch deleted file mode 100644 index 09e0b3d..0000000 --- a/0002-libipvs-discrepancy-with-libnl-genlmsg_put.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 76c1270148161242f240d9a00746cf06d916b3e3 Mon Sep 17 00:00:00 2001 -From: Arthur Gautier -Date: Wed, 27 Sep 2017 15:31:05 +0000 -Subject: [PATCH 2/2] libipvs: discrepancy with libnl genlmsg_put - -There is a mixup between NL_AUTO_PORT and NL_AUTO_PID. The -first should be used with genlmsg_put while the second with -nlmsg_put. - -This is not a problem, because both NL_AUTO_PORT and NL_AUTO_PID -have the same value, but still a discrepancy with libnl documentation. - -see documentation of genlmsg_put here: - http://www.infradead.org/~tgr/libnl/doc/api/group__genl.html#ga9a86a71bbba6961d41b8a75f62f9e946 - -Cc: Julian Anastasov -Cc: Simon Horman -Cc: Jesper Dangaard Brouer -Signed-off-by: Arthur Gautier -Signed-off-by: Jesper Dangaard Brouer ---- - libipvs/libipvs.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libipvs/libipvs.c b/libipvs/libipvs.c -index d271c48..a843243 100644 ---- a/libipvs/libipvs.c -+++ b/libipvs/libipvs.c -@@ -63,7 +63,7 @@ struct nl_msg *ipvs_nl_message(int cmd, int flags) - if (!msg) - return NULL; - -- genlmsg_put(msg, NL_AUTO_PID, NL_AUTO_SEQ, family, 0, flags, -+ genlmsg_put(msg, NL_AUTO_PORT, NL_AUTO_SEQ, family, 0, flags, - cmd, IPVS_GENL_VERSION); - - return msg; --- -2.14.3 - diff --git a/ipvsadm.spec b/ipvsadm.spec index fa5da7c..a933571 100644 --- a/ipvsadm.spec +++ b/ipvsadm.spec @@ -1,7 +1,7 @@ Name: ipvsadm Summary: Utility to administer the Linux Virtual Server -Version: 1.29 -Release: 11%{?dist} +Version: 1.31 +Release: 1%{?dist} License: GPLv2+ URL: https://kernel.org/pub/linux/utils/kernel/ipvsadm/ @@ -9,9 +9,7 @@ Source0: https://kernel.org/pub/linux/utils/kernel/ipvsadm/%{name}-%{version}.ta Source1: ipvsadm.service Source2: ipvsadm-config -Patch1: 0001-ipvsadm-catch-the-original-errno-from-netlink-answer.patch -Patch2: 0002-libipvs-discrepancy-with-libnl-genlmsg_put.patch -Patch3: 0003-ipvsadm-use-CFLAGS-and-LDFLAGS-environment-variables.patch +Patch0: 0003-ipvsadm-use-CFLAGS-and-LDFLAGS-environment-variables.patch BuildRequires: gcc Buildrequires: libnl3-devel @@ -38,9 +36,7 @@ services. Supported Features include: %prep %setup -q -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 +%patch0 -p1 %build %set_build_flags @@ -76,6 +72,9 @@ services. Supported Features include: %{_mandir}/man8/%{name}-save.8* %changelog +* Thu Jan 02 2020 Ryan O'Hara - 1.31-1 +- Update to 1.31 (#1726210) + * Thu Jul 25 2019 Fedora Release Engineering - 1.29-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index a0c6118..189522c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ipvsadm-1.29.tar.gz) = ea0213444ef706e217c63561157c8273a555a5c2ed368bb0a086fa246002ee393f5f0223e144137fa0146738f8149b07f706275155df87e04fcf75ba5b3c8aca +SHA512 (ipvsadm-1.31.tar.gz) = c02cc54c6c44ac94de632b087a1f95ba9cd4e622e48471e2643900905cd84fa2335496c955ee6507497c7252227575cf309ed97924e062c61d719218bfc25a07