diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-11-08 09:54:57 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-11-08 09:54:57 +0100 |
| commit | ca63f47c4736ce7a6f6b544c50cf29d2ffe563c1 (patch) | |
| tree | e3ef58d850012b4943c980af55864f0fb768bcbc /core/iputils | |
| parent | b28838efa921982fb5ab1ec277a2df13a9890983 (diff) | |
| parent | a8fff09ba6d0f8b78b43e63541b1254763d4f48e (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/apvlv/PKGBUILD
community/haddock/PKGBUILD
community/ibus-pinyin/PKGBUILD
core/libtirpc/PKGBUILD
extra/htop/PKGBUILD
extra/rhythmbox/PKGBUILD
Diffstat (limited to 'core/iputils')
| -rw-r--r-- | core/iputils/PKGBUILD | 13 | ||||
| -rw-r--r-- | core/iputils/iputils-20121011-flood.patch | 22 |
2 files changed, 31 insertions, 4 deletions
diff --git a/core/iputils/PKGBUILD b/core/iputils/PKGBUILD index ffe6511a2..457144791 100644 --- a/core/iputils/PKGBUILD +++ b/core/iputils/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 169611 2012-10-24 12:55:26Z stephane $ +# $Id: PKGBUILD 170249 2012-11-06 11:26:55Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=iputils pkgver=20121011 -pkgrel=1 +pkgrel=2 pkgdesc="IP Configuration Utilities (and Ping)" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -19,10 +19,12 @@ replaces=('netkit-base') 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 @@ build() { # FS#28897 patch -Np1 -i ../iputils-20101006-ping-integer-overflow.patch + # FS#32306 + patch -Np1 -i ../iputils-20121011-flood.patch + make cd doc diff --git a/core/iputils/iputils-20121011-flood.patch b/core/iputils/iputils-20121011-flood.patch new file mode 100644 index 000000000..5ced2d115 --- /dev/null +++ b/core/iputils/iputils-20121011-flood.patch @@ -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; |