diff options
| author | root <root@rshg054.dnsready.net> | 2012-07-14 00:01:45 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-07-14 00:01:45 +0000 |
| commit | e0f65a739c6445de07de1585e72c230958d8f011 (patch) | |
| tree | d6cfcd449768dbc82f5d5d539ea02333340652b7 /testing/iputils | |
| parent | 2aa5510e030a6ac8ec723dfd915a394b888e21c1 (diff) | |
Sat Jul 14 00:01:45 UTC 2012
Diffstat (limited to 'testing/iputils')
| -rw-r--r-- | testing/iputils/PKGBUILD | 13 | ||||
| -rw-r--r-- | testing/iputils/iputils-20101006-ping-integer-overflow.patch | 11 |
2 files changed, 20 insertions, 4 deletions
diff --git a/testing/iputils/PKGBUILD b/testing/iputils/PKGBUILD index f5c5d4e3c..6b5348b45 100644 --- a/testing/iputils/PKGBUILD +++ b/testing/iputils/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 162019 2012-06-18 20:29:20Z stephane $ +# $Id: PKGBUILD 163462 2012-07-12 10:24:03Z 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/testing/iputils/iputils-20101006-ping-integer-overflow.patch b/testing/iputils/iputils-20101006-ping-integer-overflow.patch new file mode 100644 index 000000000..720e5e888 --- /dev/null +++ b/testing/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! */ |