diff --git a/iputils-ifenslave.patch b/iputils-ifenslave.patch new file mode 100644 index 0000000..662d69d --- /dev/null +++ b/iputils-ifenslave.patch @@ -0,0 +1,13 @@ +--- iputils/ifenslave.c.addr 2006-03-29 15:00:24.000000000 +0200 ++++ iputils/ifenslave.c 2006-03-29 15:02:01.000000000 +0200 +@@ -524,8 +524,8 @@ + if (ioctl(skfd, SIOCGIFADDR, &ifr) < 0) + return -1; + printf("The result of SIOCGIFADDR is %2.2x.%2.2x.%2.2x.%2.2x.\n", +- ifr.ifr_addr.sa_data[0], ifr.ifr_addr.sa_data[1], +- ifr.ifr_addr.sa_data[2], ifr.ifr_addr.sa_data[3]); ++ ifr.ifr_addr.sa_data[2], ifr.ifr_addr.sa_data[3], ++ ifr.ifr_addr.sa_data[4], ifr.ifr_addr.sa_data[5]); + + strcpy(ifr.ifr_name, ifname); + if (ioctl(skfd, SIOCGIFHWADDR, &ifr) < 0) diff --git a/iputils.spec b/iputils.spec index 9398f69..26d8b2c 100644 --- a/iputils.spec +++ b/iputils.spec @@ -1,7 +1,7 @@ Summary: Network monitoring tools including ping. Name: iputils Version: 20020927 -Release: 36 +Release: 37 License: BSD Group: System Environment/Daemons Source0: http://www.tux.org/pub/net/ip-routing/%{name}-ss020927.tar.gz @@ -26,9 +26,10 @@ Patch15: iputils-20020927-12-arping.patch Patch16: iputils-getaddrinfo.patch Patch17: iputils-flood.patch Patch18: iputils-ping-168166.patch -Patch19: iputils-ipv6-hoplimit2.patch +Patch19: iputils-ipv6-hoplimit.patch Patch20: iputils-gcc41.patch Patch21: iputils-ping_cleanup.patch +Patch22: iputils-ifenslave.patch Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-root BuildPreReq: docbook-utils perl-SGMLSpm @@ -66,6 +67,7 @@ the target machine is alive and receiving network traffic. %patch19 -p1 -b .hoplimit %patch20 -p1 -b .gcc41 %patch21 -p1 -b .cleanup +%patch22 -p1 -b .addr %build %ifarch s390 s390x @@ -75,7 +77,7 @@ export CFLAGS="$RPM_OPT_FLAGS -fpie" %endif export LDFLAGS="-pie" make -gcc -Wall -Wstrict-prototypes -O2 ifenslave.c -o ifenslave +gcc -Wall $RPM_OPT_FLAGS ifenslave.c -o ifenslave make -C doc man %install @@ -165,6 +167,10 @@ rm -rf ${RPM_BUILD_ROOT} %config(noreplace) %{_sysconfdir}/rc.d/init.d/rdisc %changelog +* Wed Mar 29 2006 Radek Vokál - 20020927-37 +- fix ifenslave, shows interface addresses +- add RPM_OPT_FLAGS to ifenslave + * Sun Mar 12 2006 Radek Vokál - 20020927-36 - fix ifenslave man page (#185223)