diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-13 11:26:30 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-13 11:26:30 -0300 |
| commit | ea319c11ce5dcbe5994f166ea099b115bbffe960 (patch) | |
| tree | 365b7a8276a93d738840c4481a1ff5e327920738 /core | |
| parent | 37936150d275890b518542e93a435ab5815d722b (diff) | |
| parent | 21c295a86a10a3cd59802b2cf3ab7c24ebf0c608 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/conntrack-tools/01-config-file-path.patch
community-testing/conntrack-tools/PKGBUILD
community-testing/gambas3/PKGBUILD
community-testing/gigi/PKGBUILD
community-testing/glob2/PKGBUILD
community-testing/megaglest/PKGBUILD
community-testing/openimageio/PKGBUILD
community/gtk2hs-buildtools/PKGBUILD
community/haddock/PKGBUILD
community/haskell-dataenc/PKGBUILD
community/haskell-ghc-paths/PKGBUILD
community/haskell-haskeline/PKGBUILD
community/haskell-hslogger/PKGBUILD
community/haskell-tar/PKGBUILD
community/haskell-terminfo/PKGBUILD
community/haskell-utf8-string/PKGBUILD
community/haskell-x11-xft/PKGBUILD
community/libnetfilter_acct/PKGBUILD
community/libnetfilter_conntrack/PKGBUILD
community/libnetfilter_queue/PKGBUILD
community/libnfnetlink/PKGBUILD
community/sfk/PKGBUILD
extra/cabal-install/PKGBUILD
extra/claws-mail/PKGBUILD
extra/haskell-http/PKGBUILD
extra/haskell-mtl/PKGBUILD
extra/haskell-network/PKGBUILD
extra/haskell-parsec/PKGBUILD
extra/haskell-text/PKGBUILD
extra/haskell-transformers/PKGBUILD
extra/haskell-zlib/PKGBUILD
extra/nx/PKGBUILD
extra/ocaml/PKGBUILD
multilib/gcc-multilib/PKGBUILD
multilib/lib32-dbus-core/PKGBUILD
multilib/lib32-gnutls/PKGBUILD
multilib/lib32-libtiff/PKGBUILD
multilib/lib32-libxcb/PKGBUILD
multilib/libtool-multilib/PKGBUILD
social/squirm/PKGBUILD
staging/kdebindings-python/PKGBUILD
testing/curl/PKGBUILD
testing/dnsutils/PKGBUILD
testing/dnsutils/remove-bind.patch
testing/mesa/PKGBUILD
testing/openldap/PKGBUILD
testing/pam/PKGBUILD
testing/subversion/PKGBUILD
testing/systemd/PKGBUILD
testing/sysvinit/PKGBUILD
Diffstat (limited to 'core')
| -rw-r--r-- | core/dnsutils/PKGBUILD | 8 | ||||
| -rw-r--r-- | core/dnsutils/remove-bind.patch | 2 | ||||
| -rw-r--r-- | core/iputils/PKGBUILD | 4 | ||||
| -rw-r--r-- | core/iputils/iputils.install | 5 |
4 files changed, 9 insertions, 10 deletions
diff --git a/core/dnsutils/PKGBUILD b/core/dnsutils/PKGBUILD index ae29490bd..223d8aa31 100644 --- a/core/dnsutils/PKGBUILD +++ b/core/dnsutils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 166636 2012-09-13 23:21:14Z bisson $ +# $Id: PKGBUILD 168406 2012-10-11 06:22:42Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: kevin <kevin@archlinux.org> # Contributor: mario <mario_vazq@hotmail.com> pkgname=dnsutils -_pkgver=9.9.1-P3 +_pkgver=9.9.2 pkgver=${_pkgver//-/.} pkgrel=1 pkgdesc='DNS utilities: dig host nslookup' @@ -15,8 +15,8 @@ options=('!makeflags') depends=('openssl' 'krb5' 'idnkit' 'dnssec-anchors') source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz" 'remove-bind.patch') -sha1sums=('1c890f69f627ffbc76460c766bafefde408ed799' - 'b465ef6160b004838f04de9978fe1be8422af777') +sha1sums=('eb9fa7b497d67ce61a120cb96c302381bc385324' + 'bb13bd54134e4d787469be25461a3cc3f5cb57f4') replaces=('bind-tools' 'host') diff --git a/core/dnsutils/remove-bind.patch b/core/dnsutils/remove-bind.patch index 19d650964..8d4b49848 100644 --- a/core/dnsutils/remove-bind.patch +++ b/core/dnsutils/remove-bind.patch @@ -6,7 +6,7 @@ diff -aur old/bin/Makefile.in new/bin/Makefile.in top_srcdir = @top_srcdir@ -SUBDIRS = named rndc dig dnssec tests tools nsupdate \ -- check confgen @PKCS11_TOOLS@ +- check confgen @PYTHON_TOOLS@ @PKCS11_TOOLS@ +SUBDIRS = dig TARGETS = diff --git a/core/iputils/PKGBUILD b/core/iputils/PKGBUILD index 15fabce81..c3db8818b 100644 --- a/core/iputils/PKGBUILD +++ b/core/iputils/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 163489 2012-07-13 11:24:04Z stephane $ +# $Id: PKGBUILD 168366 2012-10-09 12:53: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=4 +pkgrel=7 pkgdesc="IP Configuration Utilities (and Ping)" arch=('i686' 'x86_64' 'mips64el') license=('GPL') diff --git a/core/iputils/iputils.install b/core/iputils/iputils.install index 2481fb396..8e5159e83 100644 --- a/core/iputils/iputils.install +++ b/core/iputils/iputils.install @@ -1,7 +1,6 @@ post_install() { - setcap cap_net_raw=ep usr/bin/ping - setcap cap_net_raw=ep usr/bin/ping6 - echo " >> Traceroute is now provided by core/traceroute" + setcap cap_net_raw=ep usr/bin/ping 2>/dev/null || chmod +s usr/bin/ping + setcap cap_net_raw=ep usr/bin/ping6 2>/dev/null || chmod +s usr/bin/ping6 } post_upgrade() { |