- fixes build errors due to unused variables
This commit is contained in:
parent
28b536373e
commit
cb93d032f0
45
iputils-20101006-unused.patch
Normal file
45
iputils-20101006-unused.patch
Normal file
@ -0,0 +1,45 @@
|
|||||||
|
diff -up iputils-s20101006/clockdiff.c.unused iputils-s20101006/clockdiff.c
|
||||||
|
--- iputils-s20101006/clockdiff.c.unused 2011-02-09 16:17:33.988298995 +0100
|
||||||
|
+++ iputils-s20101006/clockdiff.c 2011-02-09 16:17:52.192299138 +0100
|
||||||
|
@@ -126,7 +126,7 @@ measure(struct sockaddr_in * addr)
|
||||||
|
int msgcount;
|
||||||
|
int cc, count;
|
||||||
|
fd_set ready;
|
||||||
|
- long sendtime, recvtime, histime, histime1;
|
||||||
|
+ long sendtime, recvtime, histime;
|
||||||
|
long min1, min2, diff;
|
||||||
|
long delta1, delta2;
|
||||||
|
struct timeval tv1, tout;
|
||||||
|
@@ -240,7 +240,6 @@ empty:
|
||||||
|
rtt_sigma = (rtt_sigma *3 + abs(diff-rtt))/4;
|
||||||
|
msgcount++;
|
||||||
|
histime = ntohl(((__u32*)(icp+1))[1]);
|
||||||
|
- histime1 = ntohl(((__u32*)(icp+1))[2]);
|
||||||
|
/*
|
||||||
|
* a hosts using a time format different from
|
||||||
|
* ms. since midnight UT (as per RFC792) should
|
||||||
|
diff -up iputils-s20101006/ping6.c.unused iputils-s20101006/ping6.c
|
||||||
|
--- iputils-s20101006/ping6.c.unused 2011-02-09 16:14:11.413299738 +0100
|
||||||
|
+++ iputils-s20101006/ping6.c 2011-02-09 16:46:39.158299066 +0100
|
||||||
|
@@ -1215,7 +1215,7 @@ void pr_niquery_reply_name(struct ni_hdr
|
||||||
|
}
|
||||||
|
while (p < end) {
|
||||||
|
int fqdn = 1;
|
||||||
|
- int len;
|
||||||
|
+ int buf_len;
|
||||||
|
int i;
|
||||||
|
|
||||||
|
memset(buf, 0xff, sizeof(buf));
|
||||||
|
@@ -1230,10 +1230,10 @@ void pr_niquery_reply_name(struct ni_hdr
|
||||||
|
}
|
||||||
|
if (p + ret < end && *(p + ret) == '\0')
|
||||||
|
fqdn = 0;
|
||||||
|
- len = strlen(buf);
|
||||||
|
+ buf_len = strlen(buf);
|
||||||
|
|
||||||
|
putchar(' ');
|
||||||
|
- for (i = 0; i < strlen(buf); i++)
|
||||||
|
+ for (i = 0; i < buf_len; i++)
|
||||||
|
putchar_safe(buf[i]);
|
||||||
|
if (fqdn)
|
||||||
|
putchar('.');
|
@ -1,7 +1,7 @@
|
|||||||
Summary: Network monitoring tools including ping
|
Summary: Network monitoring tools including ping
|
||||||
Name: iputils
|
Name: iputils
|
||||||
Version: 20101006
|
Version: 20101006
|
||||||
Release: 6%{?dist}
|
Release: 7%{?dist}
|
||||||
License: BSD
|
License: BSD
|
||||||
URL: http://www.skbuff.net/iputils
|
URL: http://www.skbuff.net/iputils
|
||||||
Group: System Environment/Daemons
|
Group: System Environment/Daemons
|
||||||
@ -27,6 +27,7 @@ Patch11: iputils-20071127-infiniband.patch
|
|||||||
Patch12: iputils-20100418-convtoint.patch
|
Patch12: iputils-20100418-convtoint.patch
|
||||||
Patch13: iputils-20100418-flowlabel.patch
|
Patch13: iputils-20100418-flowlabel.patch
|
||||||
Patch14: iputils-20101006-drop_caps.patch
|
Patch14: iputils-20101006-drop_caps.patch
|
||||||
|
Patch15: iputils-20101006-unused.patch
|
||||||
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
BuildRequires: docbook-utils perl-SGMLSpm
|
BuildRequires: docbook-utils perl-SGMLSpm
|
||||||
@ -66,6 +67,7 @@ the target machine is alive and receiving network traffic.
|
|||||||
%patch12 -p1 -b .convtoint
|
%patch12 -p1 -b .convtoint
|
||||||
%patch13 -p1 -b .flowlabel
|
%patch13 -p1 -b .flowlabel
|
||||||
%patch14 -p1 -b .drop_caps
|
%patch14 -p1 -b .drop_caps
|
||||||
|
%patch15 -p1 -b .unused
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%ifarch s390 s390x
|
%ifarch s390 s390x
|
||||||
@ -170,6 +172,9 @@ rm -rf ${RPM_BUILD_ROOT}
|
|||||||
%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/sysconfig/rdisc
|
%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/sysconfig/rdisc
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Feb 09 2011 Jiri Skala <jskala@redhat.com> - 20101006-7
|
||||||
|
- fixes build errors due to unused variables
|
||||||
|
|
||||||
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 20101006-6
|
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 20101006-6
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user