- up to 2.6.31

Changed files:
    iproute2-LDFLAGS.patch -> 1.4
    iproute2-build.patch -> 1.13
    iproute2.spec -> 1.185

diff --git a/iproute2-LDFLAGS.patch b/iproute2-LDFLAGS.patch
index a9d1e5cb67a9831b0064557d43c351a65aec23c8..29eac28817c1744d3aef8d6e2380cff18482a551 100644 (file)
--- a/iproute2-LDFLAGS.patch
+++ b/iproute2-LDFLAGS.patch
@@ -1,20 +1,3 @@
-diff -ur iproute2-2.6.18-061002.org/genl/Makefile iproute2-2.6.18-061002/genl/Makefile
---- iproute2-2.6.18-061002.org/genl/Makefile   2006-10-02 22:13:34.000000000 +0200
-+++ iproute2-2.6.18-061002/genl/Makefile       2006-10-03 09:09:13.940918661 +0200
-@@ -9,11 +9,10 @@
- 
- GENLLIB :=
- 
--LDFLAGS += -Wl,-export-dynamic
--LDLIBS  += -lm -ldl
- 
- all: genl
- 
- genl: $(GENLOBJ) $(LIBNETLINK) $(LIBUTIL) $(GENLLIB)
-+      $(LD) $(LDFLAGS) $(CFLAGS) -Wl,-export-dynamic -o $@ $^ $(LDLIBS) -lm -ldl
- 
- install: all
-       install -m 0755 -s genl $(DESTDIR)$(SBINDIR)
 diff -ur iproute2-2.6.18-061002.org/netem/Makefile iproute2-2.6.18-061002/netem/Makefile
 --- iproute2-2.6.18-061002.org/netem/Makefile  2006-10-02 22:13:34.000000000 +0200
 +++ iproute2-2.6.18-061002/netem/Makefile      2006-10-03 09:00:45.533018231 +0200
@@ -27,36 +10,4 @@ diff -ur iproute2-2.6.18-061002.org/netem/Makefile iproute2-2.6.18-061002/netem/
  
  %.dist: %
        ./$* > $@
-diff -ur iproute2-2.6.18-061002.org/tc/Makefile iproute2-2.6.18-061002/tc/Makefile
---- iproute2-2.6.18-061002.org/tc/Makefile     2006-10-02 22:13:34.000000000 +0200
-+++ iproute2-2.6.18-061002/tc/Makefile 2006-10-03 09:00:45.533018231 +0200
-@@ -52,18 +52,17 @@
- 
- LDLIBS += -L. -ltc -lm -ldl
- 
--LDFLAGS += -Wl,-export-dynamic
--
- YACC := bison
- LEX := flex
- 
- %.so: %.c
--      $(CC) $(CFLAGS) -shared -fpic $< -o $@
-+      $(CC) $(LDFLAGS) $(CFLAGS) -shared -fpic $< -o $@
- 
- 
- all: libtc.a tc $(TCSO)
- 
- tc: $(TCOBJ) $(LIBNETLINK) $(LIBUTIL) $(TCLIB)
-+      $(LD) $(LDFLAGS) $(CFLAGS) -Wl,-export-dynamic -o $@ $^ $(LDLIBS)
- 
- libtc.a: $(TCLIB)
-       $(AR) rcs $@ $(TCLIB)
-@@ -80,7 +79,7 @@
-       rm -f emp_ematch.yacc.output
- 
- q_atm.so: q_atm.c
--      $(CC) $(CFLAGS) -shared -fpic -o q_atm.so q_atm.c -latm
-+      $(CC) $(LDFLAGS) $(CFLAGS) -shared -fpic -o q_atm.so q_atm.c -latm
- 
- %.yacc.c: %.y
-       $(YACC) $(YACCFLAGS) -o $@ $<
+

diff --git a/iproute2-build.patch b/iproute2-build.patch
index b862f2627e14c18ebe6f765fb7eb85729f34b6d5..8e027a3394d5575bee20cfd7f175aaf3430254f3 100644 (file)
--- a/iproute2-build.patch
+++ b/iproute2-build.patch
@@ -1,10 +1,10 @@
 diff -urNbB iproute2-2.6.14-051107.org/configure iproute2-2.6.14-051107/configure
 --- iproute2-2.6.14-051107.org/configure       2005-01-18 00:26:46.000000000 +0100
 +++ iproute2-2.6.14-051107/configure   2005-11-10 16:04:15.024922750 +0100
-@@ -8,7 +8,7 @@
- echo "TC schedulers"
+@@ -5,7 +5,7 @@
  
- echo -n " ATM "
+ function check_atm
+ {
 -cat >/tmp/atmtest.c <<EOF
 +cat >atmtest.c <<EOF
  #include <atm.h>
@@ -19,15 +19,15 @@ diff -urNbB iproute2-2.6.14-051107.org/configure iproute2-2.6.14-051107/configur
  if [ $? -eq 0 ]
  then
      echo "TC_CONFIG_ATM:=y" >>Config
-@@ -24,7 +24,7 @@
+@@ -21,7 +21,7 @@
  else
      echo no
  fi
 -rm -f /tmp/atmtest.c /tmp/atmtest
 +rm -f atmtest*
+ }
  
- echo -n " IPT "
- 
+ function check_xt
 diff -urNbB iproute2-2.6.14-051107.org/Makefile iproute2-2.6.14-051107/Makefile
 --- iproute2-2.6.14-051107.org/Makefile        2005-07-09 00:08:47.000000000 +0200
 +++ iproute2-2.6.14-051107/Makefile    2005-11-10 16:04:15.024922750 +0100

diff --git a/iproute2.spec b/iproute2.spec
index 44eee58ebc142893e8d153d141de096de78a37fa..fc1f7d103e13172b71d46fdaefe31b10e09ad913 100644 (file)
--- a/iproute2.spec
+++ b/iproute2.spec
@@ -16,12 +16,12 @@ Summary(pl.UTF-8):  Narzędzie do kontrolowania Sieci w kernelach
 Summary(pt_BR.UTF-8):  Ferramentas para roteamento avançado e configuração de interfaces de rede
 Name:          iproute2
 # do not use ,,2.6.X'' as version here, put whole number like 2.6.8
-Version:       2.6.29
-Release:       3
+Version:       2.6.31
+Release:       1
 License:       GPL
 Group:         Networking/Admin
-Source0:       http://devresources.linux-foundation.org/dev/iproute2/download/%{name}-%{version}-1.tar.bz2
-# Source0-md5: c1bc258a6c345905e79935ac7a3cc582
+Source0:       http://devresources.linux-foundation.org/dev/iproute2/download/%{name}-%{version}.tar.bz2
+# Source0-md5: 230f35282a95451622f3e8394f9cd80a
 Source1:       libnetlink.3
 Patch0:                %{name}-build.patch
 Patch1:                %{name}-arp.patch
@@ -94,7 +94,7 @@ Ta biblioteka udostępnia interfejs do interfejsu netlink między jądrem
 a przestrzenią użytkownika.
 
 %prep
-%setup -q -n %{name}-%{version}-1
+%setup -q
 #rm -rf include/linux
 %patch0 -p1
 %patch1 -p1