diff --git a/.gitignore b/.gitignore index 7334550..eafa358 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,3 @@ 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/0003-ipvsadm-use-CFLAGS-and-LDFLAGS-environment-variables.patch b/0003-ipvsadm-use-CFLAGS-and-LDFLAGS-environment-variables.patch deleted file mode 100644 index 20e0cbe..0000000 --- a/0003-ipvsadm-use-CFLAGS-and-LDFLAGS-environment-variables.patch +++ /dev/null @@ -1,52 +0,0 @@ -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 077d156..8b122be 100644 --- a/ipvsadm.spec +++ b/ipvsadm.spec @@ -1,21 +1,17 @@ Name: ipvsadm Summary: Utility to administer the Linux Virtual Server -Version: 1.31 -Release: 16%{?dist} -License: GPL-2.0-or-later +Version: 1.29 +Release: 1%{?dist} +License: GPLv2+ URL: https://kernel.org/pub/linux/utils/kernel/ipvsadm/ Source0: https://kernel.org/pub/linux/utils/kernel/ipvsadm/%{name}-%{version}.tar.gz Source1: ipvsadm.service Source2: ipvsadm-config -Patch0: 0003-ipvsadm-use-CFLAGS-and-LDFLAGS-environment-variables.patch - -BuildRequires: gcc Buildrequires: libnl3-devel Buildrequires: popt-devel BuildRequires: systemd -BuildRequires: make Requires(post): systemd Requires(preun): systemd @@ -37,11 +33,9 @@ services. Supported Features include: %prep %setup -q -%patch -P0 -p1 %build -%set_build_flags -%{__make} +CFLAGS="%{optflags}" make %install %{__rm} -rf %{buildroot} @@ -52,6 +46,9 @@ services. Supported Features include: %{__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 @@ -62,6 +59,7 @@ 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 @@ -73,85 +71,6 @@ 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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. - -* 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 - -* 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) - -* 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 - -* 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) - -* 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 - -* 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 - -* Wed Jul 26 2017 Fedora Release Engineering - 1.29-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 1.29-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - * Thu Dec 29 2016 Ryan O'Hara - 1.29-1 - Update to 1.29 (#1408437) diff --git a/sources b/sources index 189522c..a0c6118 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ipvsadm-1.31.tar.gz) = c02cc54c6c44ac94de632b087a1f95ba9cd4e622e48471e2643900905cd84fa2335496c955ee6507497c7252227575cf309ed97924e062c61d719218bfc25a07 +SHA512 (ipvsadm-1.29.tar.gz) = ea0213444ef706e217c63561157c8273a555a5c2ed368bb0a086fa246002ee393f5f0223e144137fa0146738f8149b07f706275155df87e04fcf75ba5b3c8aca