[arch-commits] Commit in iputils/trunk (2 files)

[Stéphane Gaudreault]

    Date: Thursday, July 12, 2012 @ 06:23:52
  Author: stephane
Revision: 163461

upgpkg: iputils 20101006-4

Fix an integer overflow

Added:
  iputils/trunk/iputils-20101006-ping-integer-overflow.patch
Modified:
  iputils/trunk/PKGBUILD

----------------------------------------------+
 PKGBUILD                                     |   11 ++++++++---
 iputils-20101006-ping-integer-overflow.patch |   11 +++++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2012-07-12 07:52:05 UTC (rev 163460)
+++ PKGBUILD    2012-07-12 10:23:52 UTC (rev 163461)
@@ -5,7 +5,7 @@
 
 pkgname=iputils
 pkgver=20101006
-pkgrel=3
+pkgrel=4
 pkgdesc="IP Configuration Utilities (and Ping)"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -18,9 +18,11 @@
 replaces=('netkit-base')
 backup=(etc/xinetd.d/tftp)
 install=${pkgname}.install
-source=(http://www.skbuff.net/${pkgname}/${pkgname}-s${pkgver}.tar.bz2 
tftp.xinetd)
+source=(http://www.skbuff.net/${pkgname}/${pkgname}-s${pkgver}.tar.bz2 
tftp.xinetd
+        iputils-20101006-ping-integer-overflow.patch)
 sha1sums=('a08cc5423a7bf940205f2353fe3d129cd39ff242'
-          'fc2ae26f5609725e3f4aeaf4ab82dfa6d2e378fd')
+          'fc2ae26f5609725e3f4aeaf4ab82dfa6d2e378fd'
+          'ec78574d798b53e4f8bdd37e42514fc17ed71667')
 
 build() {
   cd "${srcdir}/${pkgname}-s${pkgver}"
@@ -28,6 +30,9 @@
   # Use our CFLAGS
   sed -i -e "/^CCOPT=/s|-O2|${CFLAGS}|" Makefile
 
+  # FS#28897
+  patch -Np1 -i ../iputils-20101006-ping-integer-overflow.patch 
+
   make
 
   cd doc

Added: iputils-20101006-ping-integer-overflow.patch
===================================================================
--- iputils-20101006-ping-integer-overflow.patch                                
(rev 0)
+++ iputils-20101006-ping-integer-overflow.patch        2012-07-12 10:23:52 UTC 
(rev 163461)
@@ -0,0 +1,11 @@
+--- iputils-s20101006/ping_common.c    2010-10-06 13:59:20.000000000 +0200
++++ iputils-s20101006-patched/ping_common.c    2012-03-09 16:42:46.878151032 
+0100
+@@ -590,7 +590,7 @@
+ 
+                       /* If we are here, recvmsg() is unable to wait for
+                        * required timeout. */
+-                      if (1000*next <= 1000000/(int)HZ) {
++                      if (((uint64_t)1000*next) <= (uint64_t)1000000/(int)HZ) 
{
+                               /* Very short timeout... So, if we wait for
+                                * something, we sleep for MININTERVAL.
+                                * Otherwise, spin! */