diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-07-17 16:14:15 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-07-17 16:14:15 -0300 |
| commit | 70877cfb7e290449b9f9c660e25345f462576c4c (patch) | |
| tree | 0f63651432b8448262549265a5420fff1ab665e8 /core/iputils/PKGBUILD | |
| parent | 509bf50c73444930b6f57c42678ec22e7de82c88 (diff) | |
| parent | 412d061bfbf23d1e908eed3f8405b1af46fb1ba8 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/electricsheep/PKGBUILD
community-testing/gnash/PKGBUILD
community-testing/performous/PKGBUILD
community/drbd/PKGBUILD
community/oss/PKGBUILD
community/pinot/PKGBUILD
core/glibc/PKGBUILD
core/kmod/PKGBUILD
core/pkg-config/PKGBUILD
core/systemd/PKGBUILD
extra/bitlbee/PKGBUILD
extra/mesa/PKGBUILD
extra/nettle/PKGBUILD
extra/xfce4-netload-plugin/PKGBUILD
kde-unstable/kdepim/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/lib32-mesa/PKGBUILD
multilib/lib32-mpg123/PKGBUILD
multilib/lib32-nettle/PKGBUILD
multilib/lib32-nouveau-dri/PKGBUILD
multilib/lib32-pcre/PKGBUILD
multilib/lib32-readline/PKGBUILD
multilib/zsnes/PKGBUILD
multilib/zsnes/zsnes.patch
testing/cryptsetup/PKGBUILD
testing/ekiga/PKGBUILD
testing/iputils/PKGBUILD
testing/poppler/PKGBUILD
testing/util-linux/PKGBUILD
testing/util-linux/util-linux.install
Diffstat (limited to 'core/iputils/PKGBUILD')
| -rw-r--r-- | core/iputils/PKGBUILD | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/core/iputils/PKGBUILD b/core/iputils/PKGBUILD index 865dd6036..15fabce81 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' 'mips64el') 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 |