Patche dla iproute2

[Pepe]

On Mon, 29 Sep 2003 00:44:43 +0200
Pepe <pepe w apollo.net.pl> wrote:

> Patche w załącznikach

No i nie przeszły.

Raz jeszcze.

iproute2.spec.patch
-- cut --
-diff -urN SPECS/iproute2.spec.orig SPECS/iproute2.spec
--- SPECS/iproute2.spec.orig	Mon Sep 29 00:29:37 2003
+++ SPECS/iproute2.spec	Mon Sep 29 00:30:09 2003
@@ -33,7 +33,8 @@
 Patch7:		htb3.6_tc.patch
 Patch8:		%{name}-no_libresolv.patch
 Patch9:		%{name}-2.2.4-now-ss001007-esfq.diff
-%{!?_without_tc:BuildRequires:	db-devel}
+Patch10:	%{name}-stats.patch
+Patch11:	%{name}-disable_arpd.patch
 BuildRequires:	bison
 %{!?_without_tetex:BuildRequires:	latex2html}
 %{!?_without_tetex:BuildRequires:	psutils}
@@ -90,12 +91,14 @@
 #%%patch4 -p1
 %if %{_kernel24}
 %patch7 -p1
+%patch10 -p1
 %else
 %patch5 -p1
 %endif
 %patch6 -p1
 %patch8 -p1
 %{!?_without_tc_esfq:%patch9 -p1}
+%patch11 -p1
 
 %build
 WRRDEF=""
@@ -103,16 +106,17 @@
 
 %{__make} \
 	CC="%{__cc}" \
-	OPT="%{rpmcflags} ${WRRDEF}" \
+	OPT="-march=%{_arch} ${WRRDEF}" \
 	KERNEL_INCLUDE="%{_kernelsrcdir}/include" \
-	%{?_without_tc:SUBDIRS="lib ip" LDFLAGS="%{rpmldflags}"}
+	LDFLAGS="%{rpmldflags}" \
+	%{?_without_tc:SUBDIRS="lib ip misc"}
 %{!?_without_tetex:%{__make} -C doc}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sbindir},%{_sysconfdir},%{_mandir}/man8,%{_libdir},%{_includedir}}
 
-install ip/{ip,rtmon,routel} %{!?_without_tc:tc/tc} $RPM_BUILD_ROOT%{_sbindir}
+install ip/{ip,rtmon,routel} %{!?_without_tc:tc/tc} misc/{rtacct,rtstat} $RPM_BUILD_ROOT%{_sbindir}
 install etc/iproute2/rt_protos \
 	etc/iproute2/rt_realms \
 	etc/iproute2/rt_scopes \
- cut --


iproute2-make.patch.patch
-- cut --
-diff -urN SOURCES/iproute2-make.patch.orig SOURCES/iproute2-make.patch
--- SOURCES/iproute2-make.patch.orig	Mon Sep 29 00:33:01 2003
+++ SOURCES/iproute2-make.patch	Mon Sep 29 00:33:06 2003
@@ -1,6 +1,18 @@
---- iproute2/Makefile~	Tue Aug  7 15:58:27 2001
-+++ iproute2/Makefile	Tue Aug  7 15:58:55 2001
-@@ -28,7 +28,7 @@
+diff -urN iproute2/Makefile.orig iproute2/Makefile
+--- iproute2/Makefile.orig	Wed Jan 16 00:30:32 2002
++++ iproute2/Makefile	Wed Sep 24 18:54:04 2003
+@@ -25,16 +25,16 @@
+ 
+ ifeq ($(LIBC_INCLUDE)/socketbits.h,$(wildcard $(LIBC_INCLUDE)/socketbits.h))
+   ifeq ($(LIBC_INCLUDE)/net/if_packet.h,$(wildcard $(LIBC_INCLUDE)/net/if_packet.h))
+-    GLIBCFIX=-I../include-glibc -include ../include-glibc/glibc-bugs.h
++    GLIBCFIX=-include ../include-glibc/glibc-bugs.h
+   endif
+ endif
+ ifeq ($(LIBC_INCLUDE)/bits/socket.h,$(wildcard $(LIBC_INCLUDE)/bits/socket.h))
+-  GLIBCFIX=-I../include-glibc -I/usr/include/db3 -include ../include-glibc/glibc-bugs.h
++  GLIBCFIX=-include ../include-glibc/glibc-bugs.h
+ endif
  
  
  CC = gcc
- cut --


iproute2-disable_arpd.patch
-- cut --
-diff -urN iproute2/misc/Makefile.orig iproute2/misc/Makefile
--- iproute2/misc/Makefile.orig	Sat Sep 27 15:18:41 2003
+++ iproute2/misc/Makefile	Sat Sep 27 15:18:55 2003
@@ -6,7 +6,7 @@
 RTSTATOBJ=rtstat.o
 
 ALLOBJ=$(SSOBJ) $(NSTATOBJ) $(IFSTATOBJ) $(RTACCTOBJ) $(ARPDOBJ) $(RTSTATOBJ)
-TARGETS=ss nstat ifstat rtacct arpd rtstat
+TARGETS=ss nstat ifstat rtacct rtstat
 
 all: $(TARGETS)
 
- cut --


iproute2-stats.patch
-- cut --
-- cut --
diff -urN iproute2/ip/ipaddress.c.orig iproute2/ip/ipaddress.c
--- iproute2/ip/ipaddress.c.orig	Sat Sep 27 03:56:06 2003
+++ iproute2/ip/ipaddress.c	Sat Sep 27 04:02:40 2003
@@ -220,9 +220,9 @@
 			s = &slocal;
 		}
 		fprintf(fp, "%s", _SL_);
-		fprintf(fp, "    RX: bytes  packets  errors  dropped overrun mcast   %s%s",
+		fprintf(fp, "    RX: bytes      packets  errors  dropped overrun mcast   %s%s",
 			s->rx_compressed ? "compressed" : "", _SL_);
-		fprintf(fp, "    %-10lu %-8lu %-7lu %-7lu %-7lu %-7lu",
+		fprintf(fp, "    %-14llu %-8lu %-7lu %-7lu %-7lu %-7lu",
 			s->rx_bytes, s->rx_packets, s->rx_errors,
 			s->rx_dropped, s->rx_over_errors,
 			s->multicast
@@ -232,7 +232,7 @@
 		if (show_stats > 1) {
 			fprintf(fp, "%s", _SL_);
 			fprintf(fp, "    RX errors: length  crc     frame   fifo    missed%s", _SL_);
-			fprintf(fp, "               %-7lu  %-7lu %-7lu %-7lu %-7lu",
+			fprintf(fp, "               %-7lu %-7lu %-7lu %-7lu %-7lu",
 				s->rx_length_errors,
 				s->rx_crc_errors,
 				s->rx_frame_errors,
@@ -241,9 +241,9 @@
 				);
 		}
 		fprintf(fp, "%s", _SL_);
-		fprintf(fp, "    TX: bytes  packets  errors  dropped carrier collsns %s%s",
+		fprintf(fp, "    TX: bytes      packets  errors  dropped carrier collsns %s%s",
 			s->tx_compressed ? "compressed" : "", _SL_);
-		fprintf(fp, "    %-10lu %-8lu %-7lu %-7lu %-7lu %-7lu",
+		fprintf(fp, "    %-14llu %-8lu %-7lu %-7lu %-7lu %-7lu",
 			s->tx_bytes, s->tx_packets, s->tx_errors,
 			s->tx_dropped, s->tx_carrier_errors, s->collisions);
 		if (s->tx_compressed)
@@ -251,7 +251,7 @@
 		if (show_stats > 1) {
 			fprintf(fp, "%s", _SL_);
 			fprintf(fp, "    TX errors: aborted fifo    window  heartbeat%s", _SL_);
-			fprintf(fp, "               %-7lu  %-7lu %-7lu %-7lu",
+			fprintf(fp, "               %-7lu %-7lu %-7lu %-7lu",
 				s->tx_aborted_errors,
 				s->tx_fifo_errors,
 				s->tx_window_errors,

-- 
Pepe