From 403b7c0bdb0e4da8ab343dc814a91d7aa75d066c Mon Sep 17 00:00:00 2001 From: Martin Nagy Date: Mon, 25 Feb 2008 10:21:33 +0000 Subject: [PATCH] - update to new upstream version --- .cvsignore | 2 +- iputils-20020927-unaligned.patch | 10 +++++----- iputils-20070202-open-max.patch | 15 ++++++++------- iputils.spec | 7 +++++-- sources | 2 +- 5 files changed, 20 insertions(+), 16 deletions(-) diff --git a/.cvsignore b/.cvsignore index 9d49ba8..3d6a978 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ -iputils-s20070202.tar.bz2 +iputils-s20071127.tar.bz2 rdisc.initd ifenslave.tar.gz diff --git a/iputils-20020927-unaligned.patch b/iputils-20020927-unaligned.patch index 3f8ccfd..ea82092 100644 --- a/iputils-20020927-unaligned.patch +++ b/iputils-20020927-unaligned.patch @@ -4,8 +4,8 @@ timeout = atoi(optarg); break; case 'I': -- device = optarg; -+ device = strdup(optarg); - break; - case 'f': - quit_on_reply=1; +- device = optarg; ++ device = strdup(optarg); + break; + case 'f': + quit_on_reply=1; diff --git a/iputils-20070202-open-max.patch b/iputils-20070202-open-max.patch index b172ac7..d8ce652 100644 --- a/iputils-20070202-open-max.patch +++ b/iputils-20070202-open-max.patch @@ -1,14 +1,14 @@ ---- iputils-s20070202/rdisc.c.open-max 2007-08-07 11:34:03.000000000 +0200 -+++ iputils-s20070202/rdisc.c 2007-08-07 11:41:30.000000000 +0200 -@@ -240,14 +240,25 @@ +diff -up iputils-s20071127/rdisc.c.open_max iputils-s20071127/rdisc.c +--- iputils-s20071127/rdisc.c.open_max 2008-02-25 11:15:37.000000000 +0100 ++++ iputils-s20071127/rdisc.c 2008-02-25 11:17:30.000000000 +0100 +@@ -240,14 +240,25 @@ void do_fork(void) { int t; pid_t pid; -+ long open_max; - ++ long open_max; + if (trace) return; - + if ((open_max = sysconf(_SC_OPEN_MAX)) == -1) { + if (errno == 0) { + (void) fprintf(stderr, "OPEN_MAX is not supported\n"); @@ -17,8 +17,9 @@ + (void) fprintf(stderr, "sysconf() error\n"); + } + exit(1); -+ } ++ } + + if ((pid=fork()) != 0) exit(0); diff --git a/iputils.spec b/iputils.spec index f005904..8f7ce81 100644 --- a/iputils.spec +++ b/iputils.spec @@ -1,7 +1,7 @@ Summary: Network monitoring tools including ping Name: iputils -Version: 20070202 -Release: 9%{?dist} +Version: 20071127 +Release: 1%{?dist} License: BSD URL: http://www.skbuff.net/iputils Group: System Environment/Daemons @@ -154,6 +154,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_sysconfdir}/rc.d/init.d/rdisc %changelog +* Mon Feb 25 2008 Martin Nagy - 20071127-1 +- update to new upstream version + * Mon Feb 18 2008 Martin Nagy - 20070202-9 - rebuild diff --git a/sources b/sources index f551458..83df913 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -1d38fb3cfc2b71496e43cf646bfc1d6e iputils-s20070202.tar.bz2 +12245e9927d60ff5cf4a99d265bcb7d3 iputils-s20071127.tar.bz2 b044213f027e70a2cc1aa882e21fba3b rdisc.initd 9071449369f52f374faf40811b1669ed ifenslave.tar.gz