diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-17 10:46:15 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-17 10:46:15 +0100 |
commit | e30ba9d4c857530c2fbb3cc82236a49676d5ebc9 (patch) | |
tree | 966498ac914356462e691b8e550ab1f1d069074c /core/iproute2 | |
parent | 69f67102b7a02871e32a079ffb789d5fca72a746 (diff) | |
parent | c6f4cd18ab706868be0eff10327a0dcd58cecdf3 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/cantata/PKGBUILD
community/ffmpeg-compat/PKGBUILD
community/v8/PKGBUILD
core/e2fsprogs/PKGBUILD
core/groff/PKGBUILD
core/openssl/PKGBUILD
extra/avidemux/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/glpk/PKGBUILD
extra/gstreamer0.10-ugly/PKGBUILD
extra/mediastreamer/PKGBUILD
extra/netcdf/PKGBUILD
extra/octave/PKGBUILD
extra/opal/PKGBUILD
extra/sox/PKGBUILD
extra/x264/PKGBUILD
Diffstat (limited to 'core/iproute2')
-rw-r--r-- | core/iproute2/PKGBUILD | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/iproute2/PKGBUILD b/core/iproute2/PKGBUILD index 30dedb414..f2bbab89d 100644 --- a/core/iproute2/PKGBUILD +++ b/core/iproute2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 170003 2012-10-30 23:08:39Z thomas $ +# $Id: PKGBUILD 178093 2013-02-16 07:50:45Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=iproute2 -pkgver=3.6.0 -pkgrel=2 +pkgver=3.7.0 +pkgrel=1 pkgdesc="IP Routing Utilities" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') @@ -21,7 +21,7 @@ backup=('etc/iproute2/ematch_map' 'etc/iproute2/rt_dsfield' 'etc/iproute2/rt_pro 'etc/iproute2/rt_realms' 'etc/iproute2/rt_scopes' 'etc/iproute2/rt_tables') source=(http://www.kernel.org/pub/linux/utils/net/$pkgname/$pkgname-$pkgver.tar.xz iproute2-fhs.patch) -sha1sums=('6fa16fd2158d0f289ef454cad46555ead1c33c2d' +sha1sums=('9b45ede534fd49d2ec5a7fe0f69e1926ef767a76' '35b8cf2dc94b73eccad427235c07596146cd6f6c') build() { |