commit iputils for openSUSE:Factory
Hello community, here is the log from the commit of package iputils for openSUSE:Factory checked in at Sun Apr 25 18:41:32 CEST 2010. -------- --- iputils/iputils.changes 2009-12-22 22:22:06.000000000 +0100 +++ /mounts/work_src_done/STABLE/iputils/iputils.changes 2010-04-23 16:30:46.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Apr 23 16:16:33 CEST 2010 - ms@suse.de + +- ifenslave: fixed detach/attach code of bonds (bnc #595474) +- ifenslave: fixed output of the IP address - in hex: (bnc #595474) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- iputils-ss021109-ifenslave-strncpy.diff New: ---- iputils-ifenslave-1.1.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ iputils.spec ++++++ --- /var/tmp/diff_new_pack.3nrFf7/_old 2010-04-25 18:40:53.000000000 +0200 +++ /var/tmp/diff_new_pack.3nrFf7/_new 2010-04-25 18:40:53.000000000 +0200 @@ -21,13 +21,14 @@ Name: iputils Summary: IPv4and IPv6 Networking Utilities Version: ss021109 -Release: 293 +Release: 294 License: BSD3c ; GPLv2+ Group: Productivity/Networking/Other Provides: nkitb Obsoletes: nkitb Url: ftp://ftp.tux.org/people/alexey-kuznetsov/ip-routing Source: iputils-%{version}-try.tar.bz2 +Source1: iputils-ifenslave-1.1.0.tar.bz2 Patch: %name-%version.diff Patch1: %name-%version-rdisc-server.patch Patch2: %name-%version-sec-traceroute6-setuid-retvalcheck.diff @@ -47,7 +48,6 @@ Patch16: %name-ss021109-traceroute6-ttab.diff Patch17: %name-%version-open_max.diff Patch18: %name-%version-ping-interrupt.diff -Patch19: %name-%version-ifenslave-strncpy.diff Prefix: %_prefix BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -62,7 +62,7 @@ Alexey Kuznetsov <kuznet@ms2.inr.ac.ru> %prep -%setup -q -n %name +%setup -q -n %name -b1 %patch -p1 %patch1 -p1 %patch2 -p1 @@ -82,7 +82,6 @@ %patch16 %patch17 -p1 %patch18 -%patch19 mkdir linux touch linux/autoconf.h ++++++ iputils-headers.patch ++++++ --- /var/tmp/diff_new_pack.3nrFf7/_old 2010-04-25 18:40:53.000000000 +0200 +++ /var/tmp/diff_new_pack.3nrFf7/_new 2010-04-25 18:40:53.000000000 +0200 @@ -13,16 +13,6 @@ #include <sys/uio.h> #include <netdb.h> ---- ifenslave.c -+++ ifenslave.c -@@ -140,7 +140,6 @@ - #include <sys/types.h> - #include <sys/socket.h> - #include <sys/ioctl.h> --#include <linux/if.h> - #include <net/if_arp.h> - #include <linux/if_ether.h> - #include <linux/if_bonding.h> --- rarpd.c +++ rarpd.c @@ -24,10 +24,11 @@ ++++++ iputils-ifenslave.patch ++++++ --- /var/tmp/diff_new_pack.3nrFf7/_old 2010-04-25 18:40:53.000000000 +0200 +++ /var/tmp/diff_new_pack.3nrFf7/_new 2010-04-25 18:40:53.000000000 +0200 @@ -1,13 +1,13 @@ --- ifenslave.c +++ ifenslave.c -@@ -644,8 +644,8 @@ +@@ -520,8 +520,8 @@ static int if_getconfig(char *ifname) 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]); +- 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] & 0xff, ifr.ifr_addr.sa_data[3] & 0xff, ++ ifr.ifr_addr.sa_data[4] & 0xff, ifr.ifr_addr.sa_data[5] & 0xff); strcpy(ifr.ifr_name, ifname); if (ioctl(skfd, SIOCGIFHWADDR, &ifr) < 0) ++++++ iputils-ss021109.diff ++++++ ++++ 788 lines (skipped) ++++ between iputils/iputils-ss021109.diff ++++ and /mounts/work_src_done/STABLE/iputils/iputils-ss021109.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de