zbudowalo sie pomyslnie na 2.6.2. (latka na ping6 sie rozrosla).
niestety pakiet jest jeszcze powiazany ze zrodlami
kernela, wiec trzeba bedzie przysiasc nad nim
zeby bazowal tylko na gkh.
--- iputils.spec.orig 2003-09-28 23:44:05.000000000 +0200
+++ iputils.spec 2004-01-27 05:11:15.759449568 +0100
@@ -1,27 +1,31 @@
# $Revision: 1.57 $, $Date: 2003/09/28 21:44:05 $
+#
+# TODO:
+# - add glibc-kernel-headers support.
#
# Conditional build
-# _without_docs - don't build documentation
-#
+%bcond_without docs # don't build documentation
+
Summary: Utilities for IPv4/IPv6 networking
Summary(pl): Użytki przeznaczone dla pracy z siecią IPv4/IPv6
Summary(ru): îÁÂĎŇ ÂÁÚĎ×ŮČ ÓĹÔĹ×ŮČ ŐÔÉĚÉÔ (ping, tracepath etc.)
Summary(uk): îÁÂŚŇ ÂÁÚĎ×ÉČ ÍĹŇĹÖĹ×ÉČ ŐÔÉĚŚÔ (ping, tracepath etc.)
Name: iputils
-Version: ss020927
-Release: 1
+Version: ss021109
+Release: 0.1
Epoch: 1
License: BSD
Group: Networking/Admin
-Source0: ftp://ftp.inr.ac.ru/ip-routing/%{name}-%{version}.tar.gz
-# Source0-md5: b5493f7a2997130a4f86c486c9993b86
-Patch0: %{name}-no_cr_in_errors.patch
+Source0: ftp://ftp.inr.ac.ru/ip-routing/%{name}-%{version}-try.tar.bz2
+Patch0: %{name}-ping6-no_cr_in_errors.patch
Patch1: %{name}-ping_sparcfix.patch
Patch2: %{name}-pmake.patch
-Patch3: %{name}-20001007-rh7.patch
-%{!?_without_docs:BuildRequires: docbook-dtd30-sgml}
-%{!?_without_docs:BuildRequires: docbook-dtd31-sgml}
-%{!?_without_docs:BuildRequires: docbook-utils >= 0.6.10}
+Patch3: %{name}-Makefile.patch
+%if %{with docs}
+BuildRequires: docbook-dtd30-sgml}
+BuildRequires: docbook-dtd31-sgml}
+BuildRequires: docbook-utils >= 0.6.10}
+%endif
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -72,7 +76,7 @@
%prep
%setup -q -n %{name}
-%patch0 -p1
+%patch0 -p0
%patch1 -p1
%patch2 -p1
%patch3 -p1
@@ -83,7 +87,7 @@
CCOPT="%{rpmcflags} -D_GNU_SOURCE -DHAVE_SIN6_SCOPEID=1" \
LDLIBS=""
-%{!?_without_docs: %{__make} html}
+%{?with_docs: %{__make} html}
%{__make} man
%install
@@ -103,7 +107,7 @@
%files
%defattr(644,root,root,755)
-%doc RELNOTES Modules %{!?_without_docs: doc/*.html}
+%doc RELNOTES %{?with_docs: doc/*.html}
%attr(0755,root,root) %{_sbindir}/tracepat*
%attr(0755,root,root) %{_sbindir}/rdisc
%attr(4754,root,adm) %{_sbindir}/traceroute6
@@ -114,7 +118,6 @@
%{_mandir}/man8/rdisc.8*
%{_mandir}/man8/tracepath*.8*
%{_mandir}/man8/traceroute6.8*
-%{_mandir}/man8/pg3.8*
%files ping
%defattr(644,root,root,755)
--- ping6.c.orig 2002-09-20 17:08:11.000000000 +0200
+++ ping6.c 2004-01-27 03:52:42.704942760 +0100
@@ -788,38 +788,40 @@
printf("Destination unreachable: ");
switch (code) {
case ICMPV6_NOROUTE:
- printf("No route");
+ printf("No route\n");
break;
case ICMPV6_ADM_PROHIBITED:
- printf("Administratively prohibited");
+ printf("Administratively prohibited\n");
break;
case ICMPV6_NOT_NEIGHBOUR:
- printf("Not neighbour");
+ printf("Not neighbour\n");
break;
case ICMPV6_ADDR_UNREACH:
- printf("Address unreachable");
+ printf("Address unreachable\n");
break;
case ICMPV6_PORT_UNREACH:
- printf("Port unreachable");
+ printf("Port unreachable\n");
break;
default:
- printf("Unknown code %d", code);
+ printf("Unknown code %d\n", code);
break;
}
break;
case ICMPV6_PKT_TOOBIG:
printf("Packet too big: mtu=%u", info);
if (code)
- printf(", code=%d", code);
+ printf(", code=%d\n", code);
+ else
+ putchar('\n');
break;
case ICMPV6_TIME_EXCEED:
printf("Time exceeded: ");
if (code == ICMPV6_EXC_HOPLIMIT)
- printf("Hop limit");
+ printf("Hop limit\n");
else if (code == ICMPV6_EXC_FRAGTIME)
- printf("Defragmentation failure");
+ printf("Defragmentation failure\n");
else
- printf("code %d", code);
+ printf("code %d\n", code);
break;
case ICMPV6_PARAMPROB:
printf("Parameter problem: ");
@@ -831,25 +833,25 @@
printf("Unknown option ");
else
printf("code %d ", code);
- printf ("at %u", info);
+ printf ("at %u\n", info);
break;
case ICMPV6_ECHO_REQUEST:
- printf("Echo request");
+ printf("Echo request\n");
break;
case ICMPV6_ECHO_REPLY:
- printf("Echo reply");
+ printf("Echo reply\n");
break;
case ICMPV6_MGM_QUERY:
- printf("MLD Query");
+ printf("MLD Query\n");
break;
case ICMPV6_MGM_REPORT:
- printf("MLD Report");
+ printf("MLD Report\n");
break;
case ICMPV6_MGM_REDUCTION:
- printf("MLD Reduction");
+ printf("MLD Reduction\n");
break;
default:
- printf("unknown icmp type");
+ printf("unknown icmp type\n");
}
return 0;
diff -uNr iputils.orig/doc/Makefile iputils/doc/Makefile
--- iputils.orig/doc/Makefile 2004-01-27 04:54:56.000000000 +0100
+++ iputils/doc/Makefile 2004-01-27 04:55:17.031198416 +0100
@@ -2,7 +2,7 @@
HTMLFILES=$(subst .sgml,.html,$(SGMLFILES)) index.html
MANFILES=$(subst .sgml,.8,$(SGMLFILES))
-all: html
+all:
html: $(HTMLFILES) iputils.html
diff -uNr iputils.orig/Makefile iputils/Makefile
--- iputils.orig/Makefile 2002-11-09 04:01:11.000000000 +0100
+++ iputils/Makefile 2004-01-27 04:55:39.396798328 +0100
@@ -17,11 +17,6 @@
GLIBCFIX=-Iinclude-glibc -include include-glibc/glibc-bugs.h
endif
-ifeq ($(KERNEL_INCLUDE)/linux/pfkeyv2.h,$(wildcard $(KERNEL_INCLUDE)/linux/pfkeyv2.h))
- SUBDIRS=libipsec setkey
- LDLIBS+=-Llibipsec -lipsec
- IPSECDEF=-DDO_IPSEC -Ilibipsec
-endif
#options if you compile with libc5, and without a bind>=4.9.4 libresolv
@@ -37,7 +32,7 @@
IPV6_TARGETS=tracepath6 traceroute6 ping6
TARGETS=$(IPV4_TARGETS) $(IPV6_TARGETS)
-all: check-kernel subdirs $(TARGETS)
+all: check-kernel $(TARGETS)
tftpd: tftpd.o tftpsubs.o
__________________________________________________________
nie pytaj co inni zrobili dla pld, pomysl ile sam zrobiles
