packages: iproute2/iproute2-LDFLAGS.patch, iproute2/iproute2-build.patch, i...

Tue Dec 29 09:42:59 CET 2009

Author: arekm                        Date: Tue Dec 29 08:42:59 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 2.6.31

---- Files affected:
packages/iproute2:
   iproute2-LDFLAGS.patch (1.3 -> 1.4) , iproute2-build.patch (1.12 -> 1.13) , iproute2.spec (1.184 -> 1.185) 

---- Diffs:

================================================================
Index: packages/iproute2/iproute2-LDFLAGS.patch
diff -u packages/iproute2/iproute2-LDFLAGS.patch:1.3 packages/iproute2/iproute2-LDFLAGS.patch:1.4

--- packages/iproute2/iproute2-LDFLAGS.patch:1.3	Thu May 17 20:52:19 2007
+++ packages/iproute2/iproute2-LDFLAGS.patch	Tue Dec 29 09:42:53 2009
@@ -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 @@
  
  %.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 $@ $<
+

================================================================
Index: packages/iproute2/iproute2-build.patch
diff -u packages/iproute2/iproute2-build.patch:1.12 packages/iproute2/iproute2-build.patch:1.13
--- packages/iproute2/iproute2-build.patch:1.12	Wed Mar 25 11:48:05 2009
+++ packages/iproute2/iproute2-build.patch	Tue Dec 29 09:42:53 2009
@@ -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 @@
  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

================================================================
Index: packages/iproute2/iproute2.spec
diff -u packages/iproute2/iproute2.spec:1.184 packages/iproute2/iproute2.spec:1.185
--- packages/iproute2/iproute2.spec:1.184	Wed Mar 25 11:48:18 2009
+++ packages/iproute2/iproute2.spec	Tue Dec 29 09:42:53 2009
@@ -17,12 +17,12 @@
 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
@@ -95,7 +95,7 @@
 a przestrzenią użytkownika.
 
 %prep
-%setup -q -n %{name}-%{version}-1
+%setup -q
 #rm -rf include/linux
 %patch0 -p1
 %patch1 -p1
@@ -190,6 +190,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.185  2009/12/29 08:42:53  arekm
+- up to 2.6.31
+
 Revision 1.184  2009/03/25 10:48:18  arekm
 - release 3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iproute2/iproute2-LDFLAGS.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iproute2/iproute2-build.patch?r1=1.12&r2=1.13&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iproute2/iproute2.spec?r1=1.184&r2=1.185&f=u

