[arch-commits] Commit in iputils/trunk (PKGBUILD iputils-20121011-flood.patch)

[Stéphane Gaudreault]

    Date: Monday, November 5, 2012 @ 10:35:18
  Author: stephane
Revision: 170232

upgpkg: iputils 20121011-2

patch for ping -f (fix FS#32306)

Added:
  iputils/trunk/iputils-20121011-flood.patch
Modified:
  iputils/trunk/PKGBUILD

------------------------------+
 PKGBUILD                     |   11 ++++++++---
 iputils-20121011-flood.patch |   22 ++++++++++++++++++++++
 2 files changed, 30 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-11-05 15:19:18 UTC (rev 170231)
+++ PKGBUILD	2012-11-05 15:35:18 UTC (rev 170232)
@@ -5,7 +5,7 @@
 
 pkgname=iputils
 pkgver=20121011
-pkgrel=1
+pkgrel=2
 pkgdesc="IP Configuration Utilities (and Ping)"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -19,10 +19,12 @@
 backup=(etc/xinetd.d/tftp)
 install=${pkgname}.install
 source=(http://www.skbuff.net/${pkgname}/${pkgname}-s${pkgver}.tar.bz2 tftp.xinetd
-        iputils-20101006-ping-integer-overflow.patch)
+        iputils-20101006-ping-integer-overflow.patch
+        iputils-20121011-flood.patch)
 sha1sums=('3e85179746fd93000d6267bd55addfe97f321ba7'
           'fc2ae26f5609725e3f4aeaf4ab82dfa6d2e378fd'
-          'ec78574d798b53e4f8bdd37e42514fc17ed71667')
+          'ec78574d798b53e4f8bdd37e42514fc17ed71667'
+          '2343edf0dce28030e43305cefedd60806bb58eae')
 
 build() {
   cd "${srcdir}/${pkgname}-s${pkgver}"
@@ -33,6 +35,9 @@
   # FS#28897
   patch -Np1 -i ../iputils-20101006-ping-integer-overflow.patch 
 
+  # FS#32306
+  patch -Np1 -i ../iputils-20121011-flood.patch
+
   make
 
   cd doc

Added: iputils-20121011-flood.patch
===================================================================
--- iputils-20121011-flood.patch	                        (rev 0)
+++ iputils-20121011-flood.patch	2012-11-05 15:35:18 UTC (rev 170232)
@@ -0,0 +1,22 @@
+--- iputils-s20121011/ping_common.h	2012-11-05 10:07:40.065281888 +0100
++++ iputils-s20121011-new/ping_common.h	2012-11-05 10:07:22.001268362 +0100
+@@ -141,7 +141,7 @@ static inline void write_stdout(const ch
+ 	do {
+ 		cc = write(STDOUT_FILENO, str + o, len - o);
+ 		o += cc;
+-	} while (len >= o || cc < 0);
++	} while (len > o || cc < 0);
+ }
+ 
+ /*
+--- iputils-s20121011/ping_common.c	2012-11-05 10:07:40.066281889 +0100
++++ iputils-s20121011-new/ping_common.c	2012-11-05 10:07:22.007268368 +0100
+@@ -776,7 +776,7 @@ restamp:
+ 		if (!csfailed)
+ 			write_stdout("\b \b", 3);
+ 		else
+-			write_stdout("\bC", 1);
++			write_stdout("\bC", 2);
+ 	} else {
+ 		int i;
+ 		__u8 *cp, *dp;