From 1f973020e951d6b3a7df336bf28b38a72d297438 Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Mon, 5 Feb 2018 10:29:18 -0600 Subject: [PATCH 01/29] Catch the original errno from netlink answer (#1526813) --- ...e-original-errno-from-netlink-answer.patch | 80 +++++++++++++++++++ ...s-discrepancy-with-libnl-genlmsg_put.patch | 40 ++++++++++ ipvsadm.spec | 10 ++- 3 files changed, 129 insertions(+), 1 deletion(-) create mode 100644 0001-ipvsadm-catch-the-original-errno-from-netlink-answer.patch create mode 100644 0002-libipvs-discrepancy-with-libnl-genlmsg_put.patch diff --git a/0001-ipvsadm-catch-the-original-errno-from-netlink-answer.patch b/0001-ipvsadm-catch-the-original-errno-from-netlink-answer.patch new file mode 100644 index 0000000..a9ffeec --- /dev/null +++ b/0001-ipvsadm-catch-the-original-errno-from-netlink-answer.patch @@ -0,0 +1,80 @@ +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 new file mode 100644 index 0000000..09e0b3d --- /dev/null +++ b/0002-libipvs-discrepancy-with-libnl-genlmsg_put.patch @@ -0,0 +1,40 @@ +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 d7f2d04..2b8fe36 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: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ URL: https://kernel.org/pub/linux/utils/kernel/ipvsadm/ @@ -9,6 +9,9 @@ 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 + Buildrequires: libnl3-devel Buildrequires: popt-devel BuildRequires: systemd @@ -33,6 +36,8 @@ services. Supported Features include: %prep %setup -q +%patch1 -p1 +%patch2 -p1 %build CFLAGS="%{optflags}" make @@ -71,6 +76,9 @@ CFLAGS="%{optflags}" make %{_mandir}/man8/%{name}-save.8* %changelog +* Mon Feb 05 2018 Ryan O'Hara - 1.29-5 +- Catch the original errno from netlink answer (#1526813) + * Wed Aug 02 2017 Fedora Release Engineering - 1.29-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 6310412f9b5f658ef0895f2fa66327abe82a99bd Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Mon, 5 Feb 2018 10:29:18 -0600 Subject: [PATCH 02/29] Catch the original errno from netlink answer (#1526813) --- ...e-original-errno-from-netlink-answer.patch | 80 +++++++++++++++++++ ...s-discrepancy-with-libnl-genlmsg_put.patch | 40 ++++++++++ ipvsadm.spec | 10 ++- 3 files changed, 129 insertions(+), 1 deletion(-) create mode 100644 0001-ipvsadm-catch-the-original-errno-from-netlink-answer.patch create mode 100644 0002-libipvs-discrepancy-with-libnl-genlmsg_put.patch diff --git a/0001-ipvsadm-catch-the-original-errno-from-netlink-answer.patch b/0001-ipvsadm-catch-the-original-errno-from-netlink-answer.patch new file mode 100644 index 0000000..a9ffeec --- /dev/null +++ b/0001-ipvsadm-catch-the-original-errno-from-netlink-answer.patch @@ -0,0 +1,80 @@ +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 new file mode 100644 index 0000000..09e0b3d --- /dev/null +++ b/0002-libipvs-discrepancy-with-libnl-genlmsg_put.patch @@ -0,0 +1,40 @@ +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 d7f2d04..2b8fe36 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: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ URL: https://kernel.org/pub/linux/utils/kernel/ipvsadm/ @@ -9,6 +9,9 @@ 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 + Buildrequires: libnl3-devel Buildrequires: popt-devel BuildRequires: systemd @@ -33,6 +36,8 @@ services. Supported Features include: %prep %setup -q +%patch1 -p1 +%patch2 -p1 %build CFLAGS="%{optflags}" make @@ -71,6 +76,9 @@ CFLAGS="%{optflags}" make %{_mandir}/man8/%{name}-save.8* %changelog +* Mon Feb 05 2018 Ryan O'Hara - 1.29-5 +- Catch the original errno from netlink answer (#1526813) + * Wed Aug 02 2017 Fedora Release Engineering - 1.29-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From cead4ca2207ff7a4e614f9425f63182509933345 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 17:38:20 +0000 Subject: [PATCH 03/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ipvsadm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ipvsadm.spec b/ipvsadm.spec index 2b8fe36..cffa56d 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: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ URL: https://kernel.org/pub/linux/utils/kernel/ipvsadm/ @@ -76,6 +76,9 @@ CFLAGS="%{optflags}" make %{_mandir}/man8/%{name}-save.8* %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 1.29-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Mon Feb 05 2018 Ryan O'Hara - 1.29-5 - Catch the original errno from netlink answer (#1526813) From bf29ba448ba76250572d78aadb85563d795cdda8 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 09:10:21 +0100 Subject: [PATCH 04/29] Remove %clean section None of currently supported distributions need that. Last one was EL5 which is EOL for a while. Signed-off-by: Igor Gnatenko --- ipvsadm.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/ipvsadm.spec b/ipvsadm.spec index cffa56d..e85d46b 100644 --- a/ipvsadm.spec +++ b/ipvsadm.spec @@ -51,9 +51,6 @@ CFLAGS="%{optflags}" make %{__install} -p -D -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service %{__install} -p -D -m 0600 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/%{name}-config -%clean -%{__rm} -rf %{buildroot} - %post %systemd_post %{name}.service From 8527ebe228d8232a632f8160ef5a601564f3c367 Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Fri, 23 Feb 2018 08:43:53 -0600 Subject: [PATCH 05/29] Add BuildRequires gcc --- ipvsadm.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/ipvsadm.spec b/ipvsadm.spec index e85d46b..b8acac8 100644 --- a/ipvsadm.spec +++ b/ipvsadm.spec @@ -12,6 +12,7 @@ Source2: ipvsadm-config Patch1: 0001-ipvsadm-catch-the-original-errno-from-netlink-answer.patch Patch2: 0002-libipvs-discrepancy-with-libnl-genlmsg_put.patch +BuildRequires: gcc Buildrequires: libnl3-devel Buildrequires: popt-devel BuildRequires: systemd From fd6cbda552fa56eb69b17a0bea0ccd6fad82bb42 Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Fri, 23 Feb 2018 10:41:38 -0600 Subject: [PATCH 06/29] Add %set_build_flags (#1543790) --- ipvsadm.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ipvsadm.spec b/ipvsadm.spec index b8acac8..355ab89 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: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ URL: https://kernel.org/pub/linux/utils/kernel/ipvsadm/ @@ -41,6 +41,7 @@ services. Supported Features include: %patch2 -p1 %build +%set_build_flags CFLAGS="%{optflags}" make %install @@ -74,6 +75,9 @@ CFLAGS="%{optflags}" make %{_mandir}/man8/%{name}-save.8* %changelog +* Fri Feb 23 2018 Ryan O'Hara - 1.29-7 +- Add %set_build_flags (#1543790) + * Wed Feb 07 2018 Fedora Release Engineering - 1.29-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 1f290eadb3736ccb6c34c93c0656dd873a3cdd70 Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Tue, 27 Feb 2018 11:56:50 -0600 Subject: [PATCH 07/29] Use CFLAGS and LDFLAGS environment variables (#1543790) --- ...GS-and-LDFLAGS-environment-variables.patch | 52 +++++++++++++++++++ ipvsadm.spec | 9 +++- 2 files changed, 59 insertions(+), 2 deletions(-) create mode 100644 0003-ipvsadm-use-CFLAGS-and-LDFLAGS-environment-variables.patch diff --git a/0003-ipvsadm-use-CFLAGS-and-LDFLAGS-environment-variables.patch b/0003-ipvsadm-use-CFLAGS-and-LDFLAGS-environment-variables.patch new file mode 100644 index 0000000..20e0cbe --- /dev/null +++ b/0003-ipvsadm-use-CFLAGS-and-LDFLAGS-environment-variables.patch @@ -0,0 +1,52 @@ +From 25d7aa2faef0c36f053ee1ba418fe14022ef6f7c Mon Sep 17 00:00:00 2001 +From: Ryan O'Hara +Date: Tue, 27 Feb 2018 11:49:44 -0600 +Subject: [PATCH] ipvsadm: use CFLAGS and LDFLAGS environment variables + +Signed-off-by: Ryan O'Hara +--- + Makefile | 6 +++--- + libipvs/Makefile | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Makefile b/Makefile +index 91a2991..2a1d179 100644 +--- a/Makefile ++++ b/Makefile +@@ -46,9 +46,9 @@ INSTALL = install + STATIC_LIBS = libipvs/libipvs.a + + ifeq "${ARCH}" "sparc64" +- CFLAGS = -Wall -Wunused -Wstrict-prototypes -g -m64 -pipe -mcpu=ultrasparc -mcmodel=medlow ++ CFLAGS += -Wall -Wunused -Wstrict-prototypes -g -m64 -pipe -mcpu=ultrasparc -mcmodel=medlow + else +- CFLAGS = -Wall -Wunused -Wstrict-prototypes -g ++ CFLAGS += -Wall -Wunused -Wstrict-prototypes -g + endif + + +@@ -87,7 +87,7 @@ libs: + make -C libipvs + + ipvsadm: $(OBJS) $(STATIC_LIBS) +- $(CC) $(CFLAGS) -o $@ $^ $(LIBS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) + + install: all + if [ ! -d $(SBIN) ]; then $(MKDIR) -p $(SBIN); fi +diff --git a/libipvs/Makefile b/libipvs/Makefile +index f845c8b..780f3f3 100644 +--- a/libipvs/Makefile ++++ b/libipvs/Makefile +@@ -1,7 +1,7 @@ + # Makefile for libipvs + + CC = gcc +-CFLAGS = -Wall -Wunused -Wstrict-prototypes -g -fPIC ++CFLAGS += -Wall -Wunused -Wstrict-prototypes -g -fPIC + ifneq (0,$(HAVE_NL)) + CFLAGS += -DLIBIPVS_USE_NL + CFLAGS += $(shell \ +-- +2.14.3 + diff --git a/ipvsadm.spec b/ipvsadm.spec index 355ab89..4addadd 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: 7%{?dist} +Release: 8%{?dist} License: GPLv2+ URL: https://kernel.org/pub/linux/utils/kernel/ipvsadm/ @@ -11,6 +11,7 @@ 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 BuildRequires: gcc Buildrequires: libnl3-devel @@ -39,10 +40,11 @@ services. Supported Features include: %setup -q %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build %set_build_flags -CFLAGS="%{optflags}" make +%{__make} %install %{__rm} -rf %{buildroot} @@ -75,6 +77,9 @@ CFLAGS="%{optflags}" make %{_mandir}/man8/%{name}-save.8* %changelog +* Tue Feb 27 2018 Ryan O'Hara - 1.29-8 +- Use CFLAGS and LDFLAGS environment variables (#1543790) + * Fri Feb 23 2018 Ryan O'Hara - 1.29-7 - Add %set_build_flags (#1543790) From 213e77acb5ea71113b80662be19bf17f6c0b1ee9 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Tue, 10 Jul 2018 01:24:25 -0500 Subject: [PATCH 08/29] Remove needless use of %defattr --- ipvsadm.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/ipvsadm.spec b/ipvsadm.spec index 4addadd..a51ce91 100644 --- a/ipvsadm.spec +++ b/ipvsadm.spec @@ -65,7 +65,6 @@ services. Supported Features include: %systemd_postun_with_restart %{name}.service %files -%defattr(-,root,root,-) %doc MAINTAINERS README %{_unitdir}/%{name}.service %config(noreplace) %{_sysconfdir}/sysconfig/%{name}-config From dda49886f023e37400d15cce7062446406cb2732 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 05:49:51 +0000 Subject: [PATCH 09/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ipvsadm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ipvsadm.spec b/ipvsadm.spec index a51ce91..111c14f 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: 8%{?dist} +Release: 9%{?dist} License: GPLv2+ URL: https://kernel.org/pub/linux/utils/kernel/ipvsadm/ @@ -76,6 +76,9 @@ services. Supported Features include: %{_mandir}/man8/%{name}-save.8* %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 1.29-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Tue Feb 27 2018 Ryan O'Hara - 1.29-8 - Use CFLAGS and LDFLAGS environment variables (#1543790) From 5c2e7946da850d2ed581891fabc07497d04a86e4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 03:31:50 +0000 Subject: [PATCH 10/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ipvsadm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ipvsadm.spec b/ipvsadm.spec index 111c14f..4dfcd4e 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: 9%{?dist} +Release: 10%{?dist} License: GPLv2+ URL: https://kernel.org/pub/linux/utils/kernel/ipvsadm/ @@ -76,6 +76,9 @@ services. Supported Features include: %{_mandir}/man8/%{name}-save.8* %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 1.29-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Jul 13 2018 Fedora Release Engineering - 1.29-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 8595a479d44fb8d04d5b5f671e8bcba062c50007 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 09:41:29 +0000 Subject: [PATCH 11/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ipvsadm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ipvsadm.spec b/ipvsadm.spec index 4dfcd4e..fa5da7c 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: 10%{?dist} +Release: 11%{?dist} License: GPLv2+ URL: https://kernel.org/pub/linux/utils/kernel/ipvsadm/ @@ -76,6 +76,9 @@ services. Supported Features include: %{_mandir}/man8/%{name}-save.8* %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 1.29-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Feb 01 2019 Fedora Release Engineering - 1.29-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 88ec8aef8fc2eb71e8108dfa83689ba61769d816 Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Thu, 2 Jan 2020 09:23:17 -0600 Subject: [PATCH 12/29] 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 From 17e8615ec635758d904836657e6e98c84d57f30b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 05:37:51 +0000 Subject: [PATCH 13/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ipvsadm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ipvsadm.spec b/ipvsadm.spec index a933571..dc01ebd 100644 --- a/ipvsadm.spec +++ b/ipvsadm.spec @@ -1,7 +1,7 @@ Name: ipvsadm Summary: Utility to administer the Linux Virtual Server Version: 1.31 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://kernel.org/pub/linux/utils/kernel/ipvsadm/ @@ -72,6 +72,9 @@ services. Supported Features include: %{_mandir}/man8/%{name}-save.8* %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 1.31-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Jan 02 2020 Ryan O'Hara - 1.31-1 - Update to 1.31 (#1726210) From f63ac5877fd17f44c535dcab4570e50f71ac5047 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 01:57:09 +0000 Subject: [PATCH 14/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ipvsadm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ipvsadm.spec b/ipvsadm.spec index dc01ebd..6cba9a4 100644 --- a/ipvsadm.spec +++ b/ipvsadm.spec @@ -1,7 +1,7 @@ Name: ipvsadm Summary: Utility to administer the Linux Virtual Server Version: 1.31 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: https://kernel.org/pub/linux/utils/kernel/ipvsadm/ @@ -72,6 +72,9 @@ services. Supported Features include: %{_mandir}/man8/%{name}-save.8* %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 1.31-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jan 29 2020 Fedora Release Engineering - 1.31-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From b0f695cb245263e88e4819735e8558f6dfed019b Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 19 Dec 2020 00:55:09 +0000 Subject: [PATCH 15/29] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- ipvsadm.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/ipvsadm.spec b/ipvsadm.spec index 6cba9a4..e007bf8 100644 --- a/ipvsadm.spec +++ b/ipvsadm.spec @@ -15,6 +15,7 @@ BuildRequires: gcc Buildrequires: libnl3-devel Buildrequires: popt-devel BuildRequires: systemd +BuildRequires: make Requires(post): systemd Requires(preun): systemd From 05bb67c0662985d393e388cbcecdff115dd3b3a7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 14:29:04 +0000 Subject: [PATCH 16/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ipvsadm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ipvsadm.spec b/ipvsadm.spec index e007bf8..6458b1b 100644 --- a/ipvsadm.spec +++ b/ipvsadm.spec @@ -1,7 +1,7 @@ Name: ipvsadm Summary: Utility to administer the Linux Virtual Server Version: 1.31 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ URL: https://kernel.org/pub/linux/utils/kernel/ipvsadm/ @@ -73,6 +73,9 @@ services. Supported Features include: %{_mandir}/man8/%{name}-save.8* %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1.31-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Jul 28 2020 Fedora Release Engineering - 1.31-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 842ef1c44fd33ad61348f857d6f2e91f372fd93f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 2 Mar 2021 16:13:36 +0100 Subject: [PATCH 17/29] Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. --- ipvsadm.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ipvsadm.spec b/ipvsadm.spec index 6458b1b..0f21c90 100644 --- a/ipvsadm.spec +++ b/ipvsadm.spec @@ -1,7 +1,7 @@ Name: ipvsadm Summary: Utility to administer the Linux Virtual Server Version: 1.31 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ URL: https://kernel.org/pub/linux/utils/kernel/ipvsadm/ @@ -73,6 +73,10 @@ services. Supported Features include: %{_mandir}/man8/%{name}-save.8* %changelog +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 1.31-5 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + * Tue Jan 26 2021 Fedora Release Engineering - 1.31-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 2aa386e92bfbf48f06692ad7e7a0a56e29c49741 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 08:43:21 +0000 Subject: [PATCH 18/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ipvsadm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ipvsadm.spec b/ipvsadm.spec index 0f21c90..a40fd3e 100644 --- a/ipvsadm.spec +++ b/ipvsadm.spec @@ -1,7 +1,7 @@ Name: ipvsadm Summary: Utility to administer the Linux Virtual Server Version: 1.31 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ URL: https://kernel.org/pub/linux/utils/kernel/ipvsadm/ @@ -73,6 +73,9 @@ services. Supported Features include: %{_mandir}/man8/%{name}-save.8* %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 1.31-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 1.31-5 - Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. From 91dc5313be24af0c616521f9cb539ec18203c54a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 13:26:27 +0000 Subject: [PATCH 19/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ipvsadm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ipvsadm.spec b/ipvsadm.spec index a40fd3e..e91e3fa 100644 --- a/ipvsadm.spec +++ b/ipvsadm.spec @@ -1,7 +1,7 @@ Name: ipvsadm Summary: Utility to administer the Linux Virtual Server Version: 1.31 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ URL: https://kernel.org/pub/linux/utils/kernel/ipvsadm/ @@ -73,6 +73,9 @@ services. Supported Features include: %{_mandir}/man8/%{name}-save.8* %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 1.31-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Jul 22 2021 Fedora Release Engineering - 1.31-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From e06ddb5a7089ebd4c45882e52d3ef9e67ac6d116 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 14:50:23 +0000 Subject: [PATCH 20/29] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ipvsadm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ipvsadm.spec b/ipvsadm.spec index e91e3fa..4938b4c 100644 --- a/ipvsadm.spec +++ b/ipvsadm.spec @@ -1,7 +1,7 @@ Name: ipvsadm Summary: Utility to administer the Linux Virtual Server Version: 1.31 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2+ URL: https://kernel.org/pub/linux/utils/kernel/ipvsadm/ @@ -73,6 +73,9 @@ services. Supported Features include: %{_mandir}/man8/%{name}-save.8* %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 1.31-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jan 20 2022 Fedora Release Engineering - 1.31-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 10ddf2188fa9017318800f617ada56008654bce9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 13:20:17 +0000 Subject: [PATCH 21/29] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ipvsadm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ipvsadm.spec b/ipvsadm.spec index 4938b4c..af147a0 100644 --- a/ipvsadm.spec +++ b/ipvsadm.spec @@ -1,7 +1,7 @@ Name: ipvsadm Summary: Utility to administer the Linux Virtual Server Version: 1.31 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2+ URL: https://kernel.org/pub/linux/utils/kernel/ipvsadm/ @@ -73,6 +73,9 @@ services. Supported Features include: %{_mandir}/man8/%{name}-save.8* %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 1.31-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Jul 21 2022 Fedora Release Engineering - 1.31-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 0c44fad5fe0d281b076039c9720b2638b7fda8ea Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 07:36:32 +0000 Subject: [PATCH 22/29] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ipvsadm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ipvsadm.spec b/ipvsadm.spec index af147a0..7152727 100644 --- a/ipvsadm.spec +++ b/ipvsadm.spec @@ -1,7 +1,7 @@ Name: ipvsadm Summary: Utility to administer the Linux Virtual Server Version: 1.31 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2+ URL: https://kernel.org/pub/linux/utils/kernel/ipvsadm/ @@ -73,6 +73,9 @@ services. Supported Features include: %{_mandir}/man8/%{name}-save.8* %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 1.31-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jan 19 2023 Fedora Release Engineering - 1.31-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From bc78f281b5866b5643c56ff0294fe32340908802 Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Fri, 4 Aug 2023 12:03:45 -0500 Subject: [PATCH 23/29] Mirate to SPDX license --- ipvsadm.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ipvsadm.spec b/ipvsadm.spec index 7152727..d36049d 100644 --- a/ipvsadm.spec +++ b/ipvsadm.spec @@ -1,8 +1,8 @@ Name: ipvsadm Summary: Utility to administer the Linux Virtual Server Version: 1.31 -Release: 10%{?dist} -License: GPLv2+ +Release: 11%{?dist} +License: GPL-2.0-or-later URL: https://kernel.org/pub/linux/utils/kernel/ipvsadm/ Source0: https://kernel.org/pub/linux/utils/kernel/ipvsadm/%{name}-%{version}.tar.gz @@ -73,6 +73,9 @@ services. Supported Features include: %{_mandir}/man8/%{name}-save.8* %changelog +* Fri Aug 04 2023 Ryan O'Hara - 1.31-11 +- Migrate to SPDX license + * Thu Jul 20 2023 Fedora Release Engineering - 1.31-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From b3b152099a9083eb3747345cbb72551d89caa15d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jan 2024 23:16:04 +0000 Subject: [PATCH 24/29] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- ipvsadm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ipvsadm.spec b/ipvsadm.spec index d36049d..4374c3a 100644 --- a/ipvsadm.spec +++ b/ipvsadm.spec @@ -1,7 +1,7 @@ Name: ipvsadm Summary: Utility to administer the Linux Virtual Server Version: 1.31 -Release: 11%{?dist} +Release: 12%{?dist} License: GPL-2.0-or-later URL: https://kernel.org/pub/linux/utils/kernel/ipvsadm/ @@ -73,6 +73,9 @@ services. Supported Features include: %{_mandir}/man8/%{name}-save.8* %changelog +* Sat Jan 20 2024 Fedora Release Engineering - 1.31-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Aug 04 2023 Ryan O'Hara - 1.31-11 - Migrate to SPDX license From 995df2fd446bf82a63c6750d2aebc7cc9553bd83 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 22:55:08 +0000 Subject: [PATCH 25/29] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- ipvsadm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ipvsadm.spec b/ipvsadm.spec index 4374c3a..3a6050a 100644 --- a/ipvsadm.spec +++ b/ipvsadm.spec @@ -1,7 +1,7 @@ Name: ipvsadm Summary: Utility to administer the Linux Virtual Server Version: 1.31 -Release: 12%{?dist} +Release: 13%{?dist} License: GPL-2.0-or-later URL: https://kernel.org/pub/linux/utils/kernel/ipvsadm/ @@ -73,6 +73,9 @@ services. Supported Features include: %{_mandir}/man8/%{name}-save.8* %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 1.31-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jan 20 2024 Fedora Release Engineering - 1.31-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 5a1ff51af58164b50bc8e4dada7fe905b1246b2d Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:47 +0200 Subject: [PATCH 26/29] Eliminate use of obsolete %patchN syntax (#2283636) --- ipvsadm.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ipvsadm.spec b/ipvsadm.spec index 3a6050a..a2e962d 100644 --- a/ipvsadm.spec +++ b/ipvsadm.spec @@ -37,7 +37,7 @@ services. Supported Features include: %prep %setup -q -%patch0 -p1 +%patch -P0 -p1 %build %set_build_flags From 39de6dbf43b21814600365d6707d9d0477aac3e0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 10:34:34 +0000 Subject: [PATCH 27/29] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- ipvsadm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ipvsadm.spec b/ipvsadm.spec index a2e962d..6e29fca 100644 --- a/ipvsadm.spec +++ b/ipvsadm.spec @@ -1,7 +1,7 @@ Name: ipvsadm Summary: Utility to administer the Linux Virtual Server Version: 1.31 -Release: 13%{?dist} +Release: 14%{?dist} License: GPL-2.0-or-later URL: https://kernel.org/pub/linux/utils/kernel/ipvsadm/ @@ -73,6 +73,9 @@ services. Supported Features include: %{_mandir}/man8/%{name}-save.8* %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 1.31-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Wed Jan 24 2024 Fedora Release Engineering - 1.31-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 50351881580eb262e0de80cf4e3ea8c2625158f1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 07:23:16 +0000 Subject: [PATCH 28/29] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- ipvsadm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ipvsadm.spec b/ipvsadm.spec index 6e29fca..02301b9 100644 --- a/ipvsadm.spec +++ b/ipvsadm.spec @@ -1,7 +1,7 @@ Name: ipvsadm Summary: Utility to administer the Linux Virtual Server Version: 1.31 -Release: 14%{?dist} +Release: 15%{?dist} License: GPL-2.0-or-later URL: https://kernel.org/pub/linux/utils/kernel/ipvsadm/ @@ -73,6 +73,9 @@ services. Supported Features include: %{_mandir}/man8/%{name}-save.8* %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 1.31-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Jul 18 2024 Fedora Release Engineering - 1.31-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 7435d583e451842ef96f955ad6ba2cf5d27d8f8c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 17:46:43 +0000 Subject: [PATCH 29/29] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- ipvsadm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ipvsadm.spec b/ipvsadm.spec index 02301b9..077d156 100644 --- a/ipvsadm.spec +++ b/ipvsadm.spec @@ -1,7 +1,7 @@ Name: ipvsadm Summary: Utility to administer the Linux Virtual Server Version: 1.31 -Release: 15%{?dist} +Release: 16%{?dist} License: GPL-2.0-or-later URL: https://kernel.org/pub/linux/utils/kernel/ipvsadm/ @@ -73,6 +73,9 @@ services. Supported Features include: %{_mandir}/man8/%{name}-save.8* %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 1.31-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Jan 17 2025 Fedora Release Engineering - 1.31-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild