Restore Provides: /sbin/ip

In Rawhide, packages pptp and resource-agents still use it.

.gitignore

@@ -1,11 +1,3 @@
-/iproute2-4.7.0.tar.xz
-/iproute2-4.8.0.tar.xz
-/iproute2-4.9.0.tar.xz
-/iproute2-4.10.0.tar.xz
-/iproute2-4.11.0.tar.xz
-/iproute2-4.12.0.tar.xz
-/iproute2-4.13.0.tar.xz
-/iproute2-4.14.1.tar.xz
-/iproute2-4.15.0.tar.xz
-/iproute2-4.16.0.tar.xz
-/iproute2-4.17.0.tar.xz
+/iproute2-4.18.0.tar.xz
+/iproute2-4.20.0.tar.xz
+/iproute2-5.0.0.tar.xz

0001-Add-cbq.8-as-an-alias-to-tc-cbq.8.patch

@@ -1,21 +0,0 @@
-From d0a7e6eaa550dc7930ea53268637ff2186c7ddc6 Mon Sep 17 00:00:00 2001
-From: Phil Sutter <psutter@redhat.com>
-Date: Fri, 17 Mar 2017 22:47:27 +0100
-Subject: [PATCH] Add cbq.8 as an alias to tc-cbq.8
-
-Signed-off-by: Phil Sutter <psutter@redhat.com>
----
- man/man8/cbq.8 | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 man/man8/cbq.8
-
-diff --git a/man/man8/cbq.8 b/man/man8/cbq.8
-new file mode 100644
-index 0000000000000..bef35201f4eab
---- /dev/null
-+++ b/man/man8/cbq.8
-@@ -0,0 +1 @@
-+.so man8/tc-cbq.8
--- 
-2.17.0
-

avpkt

@@ -1 +0,0 @@
-AVPKT=3000

cbq-0000.example

@@ -1,5 +0,0 @@
-DEVICE=eth0,10Mbit,1Mbit
-RATE=128Kbit
-WEIGHT=10Kbit
-PRIO=5
-RULE=192.168.1.0/24

iproute.spec

@@ -1,25 +1,19 @@
 %global             cbq_version v0.7.3
 Summary:            Advanced IP routing and network device configuration tools
 Name:               iproute
-Version:            4.17.0
+Version:            5.0.0
 Release:            2%{?dist}
 Group:              Applications/System
 URL:                http://kernel.org/pub/linux/utils/net/%{name}2/
 Source0:            http://kernel.org/pub/linux/utils/net/%{name}2/%{name}2-%{version}.tar.xz
-Source1:            cbq-0000.example
-Source2:            avpkt
-
-# Fedora local docs changes:
-# - We ship cbq.init-v0.7.3 as cbq binary, so have a cbq.8 man page which links
-#   to tc-cbq.8.
-Patch1:             0001-Add-cbq.8-as-an-alias-to-tc-cbq.8.patch
 
 License:            GPLv2+ and Public Domain
-BuildRequires:  gcc
+BuildRequires:      gcc
 BuildRequires:      bison
 BuildRequires:      elfutils-libelf-devel
 BuildRequires:      flex
 BuildRequires:      iptables-devel >= 1.4.5
+BuildRequires:      libcap-devel
 BuildRequires:      libdb-devel
 BuildRequires:      libmnl-devel
 BuildRequires:      libselinux-devel
@@ -29,10 +23,7 @@ BuildRequires:      pkgconfig
 BuildRequires:      linux-atm-libs-devel
 %endif
 %endif
-# For the UsrMove transition period
-Conflicts:          filesystem < 3
 Provides:           /sbin/ip
-Obsoletes:          %{name} < 4.5.0-3
 Recommends:         %{name}-tc
 
 %description
@@ -44,7 +35,6 @@ kernel.
 Summary:            Linux Traffic Control utility
 Group:              Applications/System
 License:            GPLv2+
-Obsoletes:          %{name} < 4.5.0-3
 Requires:           %{name}%{?_isa} = %{version}-%{release}
 Provides:           tc
 
@@ -76,10 +66,10 @@ The libnetlink static library.
 %autosetup -p1 -n %{name}2-%{version}
 
 %build
-export CFLAGS="%{optflags}"
-export LDFLAGS="%{build_ldflags}"
-export LIBDIR=/%{_libdir}
-export IPT_LIB_DIR=/%{_lib}/xtables
+export CFLAGS='%{optflags}'
+export LDFLAGS='%{build_ldflags}'
+export LIBDIR='%{_libdir}'
+export IPT_LIB_DIR='/%{_lib}/xtables'
 ./configure
 make %{?_smp_mflags}
 
@@ -92,41 +82,22 @@ export CONFDIR='%{_sysconfdir}/iproute2'
 export DOCDIR='%{_docdir}'
 make install
 
-install -m755 examples/cbq.init-%{cbq_version} ${DESTDIR}/${SBINDIR}/cbq
-
-install -d -m755 %{buildroot}%{_sysconfdir}/sysconfig/cbq
-for config in \
-    %{SOURCE1} \
-    %{SOURCE2}
-    do install -m644 ${config} %{buildroot}%{_sysconfdir}/sysconfig/cbq
-done
-
-# extra man pages from Patch1, seems like these are not mainline yet
-for mp in cbq genl ifcfg ifstat; do
-        install -m644 man/man8/${mp}.8 %{buildroot}%{_mandir}/man8
-done
-
 # libnetlink
 install -D -m644 include/libnetlink.h %{buildroot}%{_includedir}/libnetlink.h
 install -D -m644 lib/libnetlink.a %{buildroot}%{_libdir}/libnetlink.a
 
-# drop these files, iproute-doc package extracts files directly from _builddir
-rm -rf '%{buildroot}%{_docdir}'
-
 %files
 %dir %{_sysconfdir}/iproute2
 %{!?_licensedir:%global license %%doc}
 %license COPYING
-%doc README README.decnet README.distribution README.lnstat
+%doc README README.distribution README.lnstat
 %{_mandir}/man7/*
 %exclude %{_mandir}/man7/tc-*
 %{_mandir}/man8/*
 %exclude %{_mandir}/man8/tc*
-%exclude %{_mandir}/man8/cbq*
 %attr(644,root,root) %config(noreplace) %{_sysconfdir}/iproute2/*
 %{_sbindir}/*
 %exclude %{_sbindir}/tc
-%exclude %{_sbindir}/cbq
 
 %files tc
 %{!?_licensedir:%global license %%doc}
@@ -134,20 +105,16 @@ rm -rf '%{buildroot}%{_docdir}'
 %doc README.iproute2+tc
 %{_mandir}/man7/tc-*
 %{_mandir}/man8/tc*
-%{_mandir}/man8/cbq*
 %dir %{_libdir}/tc/
 %{_libdir}/tc/*
 %{_sbindir}/tc
-%{_sbindir}/cbq
-%dir %{_sysconfdir}/sysconfig/cbq
-%config(noreplace) %{_sysconfdir}/sysconfig/cbq/*
 %{_datadir}/bash-completion/completions/tc
 
 %if ! 0%{?_module_build}
 %files doc
 %{!?_licensedir:%global license %%doc}
 %license COPYING
-%doc examples
+%doc %{_docdir}/examples
 %endif
 
 %files devel
@@ -159,6 +126,28 @@ rm -rf '%{buildroot}%{_docdir}'
 %{_includedir}/iproute2/bpf_elf.h
 
 %changelog
+* Wed Mar 20 2019 Phil Sutter <psutter@redhat.com> - 5.0.0-2
+- Restore Provides: hint, at least pptp depends on it
+
+* Wed Mar 20 2019 Phil Sutter <psutter@redhat.com> - 5.0.0-1
+- New version 5.0.0
+- Get rid of old upgrade path hints
+
+* Fri Feb 01 2019 Phil Sutter <psutter@redhat.com> - 4.20.0-1
+- New version 4.20.0
+- Add upstream-suggested backports
+- Upstream dropped cbq script, remove it along with related configs
+- Add libcap support
+
+* Fri Aug 31 2018 Phil Sutter <psutter@redhat.com> - 4.18.0-3
+- iprule: Fix destination prefix output
+
+* Thu Aug 16 2018 Phil Sutter <psutter@redhat.com> - 4.18.0-2
+- Fix ss filter expressions
+
+* Tue Aug 14 2018 Phil Sutter <psutter@redhat.com> - 4.18.0-1
+- New version 4.18.0
+
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.17.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (iproute2-4.17.0.tar.xz) = ccd7fb70afd58f1fcd4e17c38a24607207da853c4d6118fda423efa6e51faad3ad03c4d6d58a579c40ef9c68aaf13b1c455e12b0c36e155712d3d4db3c2ff4b5
+SHA512 (iproute2-5.0.0.tar.xz) = 4b1649ccdfefbb5eace9d444843492db9d1357b9b3ee1567d6241283cde00ad3c9dbee6b8e507c4e9a5ca0a6378b71ca0c5fbf1e2ed2a9c7d479daf5d49eaed0