Initial import

diff --git a/packaging/ifenslave.tar.gz b/packaging/ifenslave.tar.gz
index 8732ba0..a88daff 100644 (file)
Binary files a/packaging/ifenslave.tar.gz and b/packaging/ifenslave.tar.gz differ

diff --git a/packaging/iputils.changes b/packaging/iputils.changes
index 597e698..b60273b 100644 (file)
--- a/packaging/iputils.changes
+++ b/packaging/iputils.changes
@@ -1,2 +1,3 @@
-* Fri Aug 31 19:01:20 UTC 2012 - tracy.graydon@intel.com
-- TIVI-153: Add iputils for IVI dev tools. Imported from MeeGo trunk
+* Tue Sep 18 19:37:22 UTC 2012 - tracy.graydon@intel.com
+- Initial import of iputils.  
+

diff --git a/packaging/iputils.spec b/packaging/iputils.spec
index dd6af42..afa6a63 100644 (file)
--- a/packaging/iputils.spec
+++ b/packaging/iputils.spec
@@ -6,7 +6,7 @@ License: BSD
 URL: http://www.skbuff.net/iputils
 Group: System Environment/Daemons
 
-Source0: http://www.skbuff.net/iputils/%{name}-s%{version}.tar.bz2
+Source0: %{name}-s%{version}.tar.bz2
 Source1: ifenslave.tar.gz
 Source3: rdisc.initd
 Source4: rdisc.service
@@ -32,23 +32,14 @@ Patch16: iputils-20101006-man.patch
 Patch17: iputils-20101006-eth.patch
 Patch18: iputils-20101006-rr.patch
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: docbook-utils perl-SGMLSpm
-BuildRequires: glibc-kernheaders >= 2.4-8.19
+BuildRequires: eglibc-headers
 BuildRequires: libidn-devel
 BuildRequires: openssl-devel
 BuildRequires: libcap-devel
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
-BuildRequires: systemd-units
-Conflicts: filesystem < 3
-Provides: /bin/ping
-Provides: /bin/ping6
-Provides: /sbin/arping
-Provides: /sbin/rdisc
+
 
 %description
 The iputils package contains basic utilities for monitoring a network,
@@ -171,10 +162,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %files
 %defattr(-,root,root,-)
 %doc RELNOTES README.bonding
-%{_unitdir}/rdisc.service
+/%{_unitdir}/rdisc.service
 %{_sbindir}/clockdiff
 %{_sbindir}/arping
-%{_sbindir}/arping
 %attr(0755,root,root) %caps(cap_net_raw=ep) %{_bindir}/ping
 %{_sbindir}/ifenslave
 %{_sbindir}/rdisc

diff --git a/rdisc.c b/rdisc.c
index 7e01d11..91538ed 100644 (file)
--- a/rdisc.c
+++ b/rdisc.c
@@ -231,7 +231,7 @@ static __inline__ int ismulticast(struct sockaddr_in *sin)
 
 static void prusage(void)
 {
-       (void) fprintf(stderr, usage);
+       (void) fprintf(stderr, "%s", usage);
        exit(1);
 }