diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-11-30 17:45:13 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-11-30 17:45:13 +0100 |
| commit | 704027491dc998e68dc1ac8e173bb0647ec8512e (patch) | |
| tree | 4dc3df4ac72df2b10f24db64fba455ab1d643aa3 /core/iputils | |
| parent | cd972a1ebaf9446976ea495f013947a8937c15b0 (diff) | |
| parent | 51867161079ab52d5152105142a3bc965c63ca03 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/erlang/PKGBUILD
community/virtkey/PKGBUILD
community/yaws/PKGBUILD
core/openldap/PKGBUILD
extra/avahi/PKGBUILD
extra/gdb/PKGBUILD
Diffstat (limited to 'core/iputils')
| -rw-r--r-- | core/iputils/PKGBUILD | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/core/iputils/PKGBUILD b/core/iputils/PKGBUILD index f6a80cf44..9c0b8a54d 100644 --- a/core/iputils/PKGBUILD +++ b/core/iputils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 171270 2012-11-16 23:40:29Z stephane $ +# $Id: PKGBUILD 172113 2012-11-29 11:07:07Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=iputils -pkgver=20121114 +pkgver=20121126 pkgrel=1 pkgdesc="Network monitoring tools, including ping" arch=('i686' 'x86_64' 'mips64el') @@ -19,17 +19,13 @@ 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-20121114-free-unintialized.patch) -sha1sums=('6061bf2ddbf0339b0084eddc33716465b742b82d' - 'fc2ae26f5609725e3f4aeaf4ab82dfa6d2e378fd' - '7f1262f4bed7fa122ea86f09cb81d817adbd8164') + tftp.xinetd) +sha1sums=('3e46391f53381080d5e1961f1b2b0ccd9a158ab2' + 'fc2ae26f5609725e3f4aeaf4ab82dfa6d2e378fd') build() { cd "${srcdir}/${pkgname}-s${pkgver}" - patch -Np1 -i ../iputils-20121114-free-unintialized.patch - # Use our CFLAGS sed -i -e "/^CCOPT=/s|-O2|${CFLAGS}|" Makefile |