-# _without_embed - don't build uClibc version
-%define mainver 2.4.7
-%define snapshot ss010803
-Summary: Utility to control Networking behavior in 2.2.X kernels
-Summary(pl): Narzêdzie do kontrolowania Sieci w kernelach 2.2
+#
+# TODO:
+# - fix build @ uClibc
+# - remove -DCONFIG_CLS_U32_PERF=1 when llh will be fixed
+#
+# Conditional build
+%bcond_without doc # don't build documentation
+%bcond_without tc # don't build tc program (it breaks static linkage)
+%bcond_without atm # don't required ATM.
+%bcond_with uClibc # do some hacks to build with uClibc
+%bcond_with iec_complaint # fix bitrate calculations
+#
+Summary: Utility to control Networking behavior in.X kernels
+Summary(es): Herramientas para encaminamiento avanzado y configuración de interfaces de red
+Summary(pl): Narzêdzie do kontrolowania Sieci w kernelach
+Summary(pt_BR): Ferramentas para roteamento avançado e configuração de interfaces de rede
Name: iproute2
-Version: %{mainver}.%{snapshot}
-Release: 4
-Vendor: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
+%define sdate 041019
+# do not use ,,2.6.X'' as version here, put whole number like 2.6.8
+Version: 2.6.9
+Release: 0.1
License: GPL
+Vendor: Stephen Hemminger <shemminger@osdl.org>
Group: Networking/Admin
-Source0: ftp://ftp.inr.ac.ru/ip-routing/%{name}-%{mainver}-now-%{snapshot}.tar.gz
-Patch0: %{name}-make.patch
-Patch1: %{name}-uClibc.patch
-Patch2: %{name}-fix-2_2.patch
-Patch3: %{name}-label.patch
-Patch4: %{name}-latest.patch
-Patch5: %{name}-htb2_tc.patch
-BuildRequires: tetex-dvips
-BuildRequires: tetex-latex
+Source0: http://developer.osdl.org/dev/iproute2/download/%{name}-%{version}-%{sdate}.tar.gz
+# Source0-md5: 4b3f335b0139cb909c6a2ae8bf72e548
+Patch0: %{name}-build.patch
+Patch1: %{name}-arp.patch
+# extensions
+Patch10: %{name}-2.2.4-wrr.patch
+Patch11: %{name}-2.2.4-esfq.patch
+Patch13: %{name}-rates-1024-fix.patch
+Patch14: %{name}-match-nfmark-in-u32.patch
+URL: http://developer.osdl.org/dev/iproute2/
+BuildRequires: bison
+BuildRequires: db-devel
+%if %{with atm}
+BuildRequires: linux-atm-devel
+%endif
+BuildRequires: linux-libc-headers >= 7:2.6.7.0-9
+%if %{with doc}
BuildRequires: psutils
-%if %{!?_without_embed:1}%{?_without_embed:0}
-BuildRequires: uClibc-devel
-BuildRequires: uClibc-static
+BuildRequires: sgml-tools
+BuildRequires: tetex-dvips
+BuildRequires: tetex-fonts-jknappen
+BuildRequires: tetex-format-latex
+BuildRequires: tetex-metafont
+BuildRequires: tetex-tex-babel
%endif
Obsoletes: iproute
+Obsoletes: ifstat
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define _sbindir /sbin
-%define _sysconfdir /etc/iproute2
-
-%define embed_path /usr/lib/embed
-%define embed_cc %{_arch}-uclibc-cc
-%define embed_cflags %{rpmcflags} -Os
-%define uclibc_prefix /usr/%{_arch}-linux-uclibc
+%define _sbindir /sbin
+%define _sysconfdir /etc/iproute2
%description
-This package contains the ip, tc and the rtmon tool that allow control
-of routing and other aspects of networking.
+Linux maintains compatibility with the basic configuration
+utilities of the network (ifconfig, route) but a new utility is
+required to exploit the new characteristics and features of the
+kernel. This package includes the new utilities.
+
+%description -l es
+Linux mantiene compatibilidad con los utilitarios estándares de
+configuración de la red, pero se necesitan nuevos utilitarios para
+usar los recursos y características del nuevo núcleo. Este paquete
+incluye los nuevos utilitarios.
%description -l pl
Ten pakiet zawiera programy pozwalaj±ce na kontrolê routingu i innych
aspektów dotycz±cych sieci.
-%package embed
-Summary: Utility to control Networking behavior in 2.2.X kernels
-Summary(pl): Narzêdzie do kontrolowania Sieci w kernelach 2.2
-Group: Networking/Admin
+%description -l pt_BR
+O Linux mantém compatibilidade com os utilitários padrão de
+configuração da rede, mas novos utilitários são necessários para fazer
+uso das características e recursos da nova kernel. This package
+includes the new utilities.
-%description embed
-Embedded iproute2.
+%package -n libnetlink-devel
+Summary: Library for the netlink interface
+Summary(pl): Biblioteka do interfejsu netlink
+Group: Development/Libraries
-%description embed -l pl
-iproute2 dla systemów osadzonych.
+%description -n libnetlink-devel
+This library provides an interface for kernel-user netlink interface.
+
+%description -n libnetlink-devel -l pl
+Ta biblioteka udostêpnia interfejs do interfejsu netlink miêdzy j±drem
+a przestrzeni± u¿ytkownika.
%prep
-%setup -q -n %{name}
+%setup -q
+rm -rf include-glibc
%patch0 -p1
%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%build
+%patch10 -p1
+%patch11 -p1
+%{?with_iec_complaint:%patch13 -p1}
+%patch14 -p1
-%if %{!?_without_embed:1}%{?_without_embed:0}
-%{__make} \
- OPT="%{embed_cflags}" GLIBCFIX="" \
- KERNEL_INCLUDE="%{_kernelsrcdir}/include" \
- CC=%{embed_cc} \
- ADDLIB="inet_ntop.o inet_pton.o dnet_ntop.o dnet_pton.o ipx_ntop.o ipx_pton.o" \
- SUBDIRS="lib ip"
-# someday we might also need rtmon and rtacct, but not today ;)
-mv -f ip/ip ip-embed-shared
+%build
+rm -rf include/linux
%{__make} \
- OPT="%{embed_cflags}" GLIBCFIX="" \
- KERNEL_INCLUDE="%{_kernelsrcdir}/include" \
- LDFLAGS="-static" \
- CC=%{embed_cc} \
- ADDLIB="inet_ntop.o inet_pton.o dnet_ntop.o dnet_pton.o ipx_ntop.o ipx_pton.o" \
- SUBDIRS="lib ip"
-
-mv -f ip/ip ip-embed-static
-%{__make} clean
-%endif
+ %{?with_uClibc:CC="%{_target_cpu}-uclibc-gcc"}%{!?with_uClibc:CC="%{__cc}"} \
+ OPT="%{rpmcflags} -DCONFIG_CLS_U32_PERF=1" \
+ %{!?with_tc:SUBDIRS="lib ip misc" LDFLAGS="%{rpmldflags}"}
-%{__make} \
- CC="%{__cc}" \
- OPT="%{rpmcflags}" \
- KERNEL_INCLUDE="%{_kernelsrcdir}/include"
-%{__make} -C doc
+%{?with_doc:%{__make} -C doc}
%install
rm -rf $RPM_BUILD_ROOT
-%if %{!?_without_embed:1}%{?_without_embed:0}
-install -d $RPM_BUILD_ROOT%{embed_path}/{shared,static}
-install ip-embed-shared $RPM_BUILD_ROOT%{embed_path}/shared/ip
-install ip-embed-static $RPM_BUILD_ROOT%{embed_path}/static/ip
-%endif
+install -d $RPM_BUILD_ROOT{%{_sbindir},%{_sysconfdir},%{_mandir}/man8,%{_libdir},%{_includedir}}
-install -d $RPM_BUILD_ROOT{%{_sbindir},%{_sysconfdir}}
-install ip/{ip,rtmon,rtacct,routel} tc/tc $RPM_BUILD_ROOT%{_sbindir}
+install ip/{ip,rtmon,routel} %{?with_tc:tc/tc} misc/{ifstat,lnstat,nstat,rtacct,ss} $RPM_BUILD_ROOT%{_sbindir}
install etc/iproute2/rt_protos \
etc/iproute2/rt_realms \
etc/iproute2/rt_scopes \
etc/iproute2/rt_tables \
$RPM_BUILD_ROOT%{_sysconfdir}
-gzip -9nf READ* RELNOTES doc/*.ps
+install man/man8/* $RPM_BUILD_ROOT%{_mandir}/man8
+echo ".so tc-pbfifo.8" > $RPM_BUILD_ROOT%{_mandir}/man8/tc-bfifo.8
+echo ".so tc-pbfifo.8" > $RPM_BUILD_ROOT%{_mandir}/man8/tc-pfifo.8
+
+install lib/libnetlink.a $RPM_BUILD_ROOT%{_libdir}
+install include/libnetlink.h $RPM_BUILD_ROOT%{_includedir}
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc {README,README.iproute2+tc,RELNOTES}.gz
-%doc doc/*.ps.gz
+%doc README README.iproute2+tc RELNOTES %{?with_doc:doc/*.ps}
%attr(755,root,root) %{_sbindir}/*
%dir %{_sysconfdir}
%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/*
+%{_mandir}/man8/*
-%if %{!?_without_embed:1}%{?_without_embed:0}
-%files embed
+%files -n libnetlink-devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{embed_path}/*/*
-%endif
+%{_libdir}/lib*.a
+%{_includedir}/*.h
projects / packages / iproute2.git / blobdiff