From 1ed995034acd07688fe8e78b1d40901bcc662155 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Sun, 15 Jul 2012 00:03:24 +0000
Subject: Sun Jul 15 00:03:24 UTC 2012

---
 core/iputils/PKGBUILD                                     | 13 +++++++++----
 core/iputils/iputils-20101006-ping-integer-overflow.patch | 11 +++++++++++
 2 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 core/iputils/iputils-20101006-ping-integer-overflow.patch

(limited to 'core/iputils')

diff --git a/core/iputils/PKGBUILD b/core/iputils/PKGBUILD
index efc4eda5c..e72795dd3 100644
--- a/core/iputils/PKGBUILD
+++ b/core/iputils/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 162361 2012-06-25 20:10:09Z stephane $
+# $Id: PKGBUILD 163489 2012-07-13 11:24:04Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=iputils
 pkgver=20101006
-pkgrel=3
+pkgrel=4
 pkgdesc="IP Configuration Utilities (and Ping)"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -18,9 +18,11 @@ conflicts=('netkit-base' 'arping' 'netkit-tftpd')
 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 @@ build() {
   # 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
diff --git a/core/iputils/iputils-20101006-ping-integer-overflow.patch b/core/iputils/iputils-20101006-ping-integer-overflow.patch
new file mode 100644
index 000000000..720e5e888
--- /dev/null
+++ b/core/iputils/iputils-20101006-ping-integer-overflow.patch
@@ -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! */
-- 
cgit v1.2.3-54-g00ecf