|
|
|
|
@ -2,26 +2,19 @@
|
|
|
|
|
%define legacy_actions %{_libexecdir}/initscripts/legacy-actions
|
|
|
|
|
|
|
|
|
|
Name: ipset
|
|
|
|
|
Version: 7.11
|
|
|
|
|
Release: 6%{?dist}
|
|
|
|
|
Version: 7.1
|
|
|
|
|
Release: 1%{?dist}
|
|
|
|
|
Summary: Manage Linux IP sets
|
|
|
|
|
|
|
|
|
|
License: GPLv2
|
|
|
|
|
URL: http://ipset.netfilter.org/
|
|
|
|
|
Source0: %{url}/%{name}-%{version}.tar.bz2
|
|
|
|
|
Source0: http://ipset.netfilter.org/%{name}-%{version}.tar.bz2
|
|
|
|
|
Source1: %{name}.service
|
|
|
|
|
Source2: %{name}.start-stop
|
|
|
|
|
Source3: %{name}-config
|
|
|
|
|
Source4: %{name}.save-legacy
|
|
|
|
|
|
|
|
|
|
Patch1: 0001-Add-deprecation-notice-to-ipset.8.patch
|
|
|
|
|
|
|
|
|
|
BuildRequires: libmnl-devel
|
|
|
|
|
BuildRequires: automake
|
|
|
|
|
BuildRequires: autoconf
|
|
|
|
|
BuildRequires: make
|
|
|
|
|
BuildRequires: libtool
|
|
|
|
|
BuildRequires: libtool-ltdl-devel
|
|
|
|
|
|
|
|
|
|
# An explicit requirement is needed here, to avoid cases where a user would
|
|
|
|
|
# explicitly update only one of the two (e.g 'yum update ipset')
|
|
|
|
|
@ -54,7 +47,6 @@ This package contains the libraries which provide the IP sets funcionality.
|
|
|
|
|
%package devel
|
|
|
|
|
Summary: Development files for %{name}
|
|
|
|
|
Requires: %{name}-libs%{?_isa} == %{version}-%{release}
|
|
|
|
|
Requires: kernel-headers
|
|
|
|
|
|
|
|
|
|
%description devel
|
|
|
|
|
This package contains the files required to develop software using the %{name}
|
|
|
|
|
@ -65,7 +57,7 @@ libraries.
|
|
|
|
|
Summary: %{name} service for %{name}s
|
|
|
|
|
Requires: %{name} = %{version}-%{release}
|
|
|
|
|
BuildRequires: systemd
|
|
|
|
|
Requires: iptables-nft-services
|
|
|
|
|
Requires: iptables-services
|
|
|
|
|
Requires(post): systemd
|
|
|
|
|
Requires(preun): systemd
|
|
|
|
|
Requires(postun): systemd
|
|
|
|
|
@ -77,11 +69,10 @@ out of the base package since it is not active by default.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%prep
|
|
|
|
|
%autosetup -p1
|
|
|
|
|
%setup -q
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%build
|
|
|
|
|
./autogen.sh
|
|
|
|
|
%configure --enable-static=no --with-kmod=no
|
|
|
|
|
|
|
|
|
|
# Just to make absolutely sure we are not building the bundled kernel module
|
|
|
|
|
@ -92,11 +83,11 @@ rm -fr kernel
|
|
|
|
|
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
|
|
|
|
|
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
|
|
|
|
|
|
|
|
|
|
%make_build
|
|
|
|
|
make %{?_smp_mflags}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%install
|
|
|
|
|
%make_install
|
|
|
|
|
make install DESTDIR=%{buildroot}
|
|
|
|
|
find %{buildroot} -name '*.la' -exec rm -f '{}' \;
|
|
|
|
|
|
|
|
|
|
# install systemd unit file
|
|
|
|
|
@ -126,7 +117,9 @@ if [[ $1 -eq 0 && -n $(lsmod | grep "^xt_set ") ]]; then
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%ldconfig_scriptlets libs
|
|
|
|
|
%post libs -p /sbin/ldconfig
|
|
|
|
|
|
|
|
|
|
%postun libs -p /sbin/ldconfig
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%post service
|
|
|
|
|
@ -142,22 +135,35 @@ fi
|
|
|
|
|
%postun service
|
|
|
|
|
%systemd_postun_with_restart %{name}.service
|
|
|
|
|
|
|
|
|
|
%triggerin service -- ipset-service < 6.38-1.el7
|
|
|
|
|
# Before 6.38-1, ipset.start-stop keeps a backup of previously saved sets, but
|
|
|
|
|
# doesn't touch the /etc/sysconfig/ipset.d/.saved flag. Remove the backup on
|
|
|
|
|
# upgrade, so that we use the current version of saved sets
|
|
|
|
|
rm -f /etc/sysconfig/ipset.save || :
|
|
|
|
|
exit 0
|
|
|
|
|
|
|
|
|
|
%triggerun service -- ipset-service < 6.38-1.el7
|
|
|
|
|
# Up to 6.29-1, ipset.start-stop uses a single data file
|
|
|
|
|
for f in /etc/sysconfig/ipset.d/*; do
|
|
|
|
|
[ "${f}" = "/etc/sysconfig/ipset.d/*" ] && break
|
|
|
|
|
cat ${f} >> /etc/sysconfig/ipset || :
|
|
|
|
|
done
|
|
|
|
|
exit 0
|
|
|
|
|
|
|
|
|
|
%files
|
|
|
|
|
%doc ChangeLog
|
|
|
|
|
%license COPYING
|
|
|
|
|
%{_mandir}/man8/%{name}.8.*
|
|
|
|
|
%doc COPYING ChangeLog
|
|
|
|
|
%doc %{_mandir}/man8/%{name}.8.gz
|
|
|
|
|
%{_sbindir}/%{name}
|
|
|
|
|
|
|
|
|
|
%files libs
|
|
|
|
|
%license COPYING
|
|
|
|
|
%doc COPYING
|
|
|
|
|
%{_libdir}/lib%{name}.so.13*
|
|
|
|
|
%doc %{_mandir}/man3/lib%{name}.3.gz
|
|
|
|
|
|
|
|
|
|
%files devel
|
|
|
|
|
%{_includedir}/lib%{name}
|
|
|
|
|
%{_libdir}/lib%{name}.so
|
|
|
|
|
%{_libdir}/pkgconfig/lib%{name}.pc
|
|
|
|
|
%{_mandir}/man3/libipset.3.*
|
|
|
|
|
|
|
|
|
|
%files service
|
|
|
|
|
%{_unitdir}/%{name}.service
|
|
|
|
|
@ -170,67 +176,46 @@ fi
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
|
|
* Mon Nov 08 2021 Phil Sutter <psutter@redhat.com> - 7.11-6
|
|
|
|
|
- Sync ipset.service with RHEL8, fix the required package name
|
|
|
|
|
* Sun May 26 2019 Stefano Brivio <sbrivio@redhat.com> - 7.1-1
|
|
|
|
|
- Rebase to 7.1 (RHBZ#1649090):
|
|
|
|
|
- Add compatibility support for strscpy()
|
|
|
|
|
- Correct the manpage about the sort option
|
|
|
|
|
- Add missing functions to libipset.map
|
|
|
|
|
- configure.ac: Fix build regression on RHEL/CentOS/SL (Serhey Popovych)
|
|
|
|
|
- Implement sorting for hash types in the ipset tool
|
|
|
|
|
- Fix to list/save into file specified by option (reported by Isaac Good)
|
|
|
|
|
- Introduction of new commands and protocol version 7, updated kernel include files
|
|
|
|
|
- Add compatibility support for async in pernet_operations
|
|
|
|
|
- Use more robust awk patterns to check for backward compatibility
|
|
|
|
|
- Prepare the ipset tool to handle multiple protocol version
|
|
|
|
|
- Fix warning message handlin
|
|
|
|
|
- Correct to test null valued entry in hash:net6,port,net6 test
|
|
|
|
|
- Library reworked to support embedding ipset completely
|
|
|
|
|
- Add compatibility to support kvcalloc()
|
|
|
|
|
- Validate string type attributes in attr2data() (Stefano Brivio)
|
|
|
|
|
- manpage: Add comment about matching on destination MAC address (Stefano Brivio)
|
|
|
|
|
(RHBZ#1649079)
|
|
|
|
|
- Add compatibility to support is_zero_ether_addr()
|
|
|
|
|
- Fix use-after-free in ipset_parse_name_compat() (Stefano Brivio) (RHBZ#1649085)
|
|
|
|
|
- Fix leak in build_argv() on line parsing error (Stefano Brivio) (RHBZ#1649085)
|
|
|
|
|
- Simplify return statement in ipset_mnl_query() (Stefano Brivio) (RHBZ#1649085)
|
|
|
|
|
- tests/check_klog.sh: Try dmesg too, don't let shell terminate script (Stefano Brivio)
|
|
|
|
|
- Fixes:
|
|
|
|
|
- Fix all shellcheck warnings in init script (RHBZ#1649085)
|
|
|
|
|
- Make error reporting consistent, introduce different severities (RHBZ#1683711)
|
|
|
|
|
- While restoring, on invalid entries, remove them and retry (RHBZ#1683713)
|
|
|
|
|
- Fix covscan SC2166 warning in init script (RHBZ#1649085)
|
|
|
|
|
|
|
|
|
|
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 7.11-5
|
|
|
|
|
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
|
|
|
|
Related: rhbz#1991688
|
|
|
|
|
* Tue Nov 13 2018 Stefano Brivio <sbrivio@redhat.com> - 6.38-3
|
|
|
|
|
- Fix loading of sets with dependencies on other sets (RHBZ#1647096), and
|
|
|
|
|
hardcode 6.38-1.el7 for ipset-service upgrade and downgrade triggers, so that
|
|
|
|
|
we don't run into issues with z-stream updates
|
|
|
|
|
|
|
|
|
|
* Fri Jul 02 2021 Phil Sutter <psutter@redhat.com> - 7.11-4
|
|
|
|
|
- Improve deprecation notice a bit
|
|
|
|
|
* Mon Oct 08 2018 Stefano Brivio <sbrivio@redhat.com> - 6.38-2
|
|
|
|
|
- Drop ipset-devel dependency on kernel-devel (RHBZ#163175)
|
|
|
|
|
|
|
|
|
|
* Fri Jun 25 2021 Phil Sutter <psutter@redhat.com> - 7.11-3
|
|
|
|
|
- Add deprecation notice to ipset.8
|
|
|
|
|
|
|
|
|
|
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 7.11-2
|
|
|
|
|
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
|
|
|
|
|
|
|
|
|
* Mon Mar 01 2021 Nicolas Chauvet <kwizart@gmail.com> - 7.11-1
|
|
|
|
|
- Update to 7.11
|
|
|
|
|
|
|
|
|
|
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 7.10-2
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
* Mon Dec 21 2020 Nicolas Chauvet <kwizart@gmail.com> - 7.10-1
|
|
|
|
|
- Update to 7.10
|
|
|
|
|
|
|
|
|
|
* Wed Dec 16 2020 Nicolas Chauvet <kwizart@gmail.com> - 7.9-1
|
|
|
|
|
- Update to 7.9
|
|
|
|
|
|
|
|
|
|
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.6-2
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
* Mon Feb 24 2020 Nicolas Chauvet <kwizart@gmail.com> - 7.6-1
|
|
|
|
|
- Update to 7.6
|
|
|
|
|
|
|
|
|
|
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.5-2
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
* Fri Jan 10 2020 Nicolas Chauvet <kwizart@gmail.com> - 7.5-1
|
|
|
|
|
- Update to 7.5
|
|
|
|
|
|
|
|
|
|
* Mon Nov 04 2019 Eric Garver <eric@garver.life> - 7.4-1
|
|
|
|
|
- Update to 7.4
|
|
|
|
|
|
|
|
|
|
* Mon Aug 19 2019 Nicolas Chauvet <kwizart@gmail.com> - 7.3-1
|
|
|
|
|
- Update to 7.3
|
|
|
|
|
|
|
|
|
|
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 7.2-2
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
* Thu Jul 11 2019 Nicolas Chauvet <kwizart@gmail.com> - 7.2-1
|
|
|
|
|
- Update to 7.2
|
|
|
|
|
|
|
|
|
|
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 6.38-2
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
* Mon Aug 13 2018 Nicolas Chauvet <kwizart@gmail.com> - 6.38-1
|
|
|
|
|
- Update to 6.38
|
|
|
|
|
- Clean-up spec
|
|
|
|
|
|
|
|
|
|
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 6.35-4
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
|
|
|
|
* Tue Aug 14 2018 Stefano Brivio <sbrivio@redhat.com> - 6.38-1
|
|
|
|
|
- Update to 6.38, source from RHEL7 6.38-2 (RHBZ#1615967)
|
|
|
|
|
|
|
|
|
|
* Mon Feb 12 2018 Eric Garver <egarver@redhat.com> - 6.35-3
|
|
|
|
|
- Patch for missing header file (RHBZ#1543596)
|
|
|
|
|
|