diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-13 19:51:35 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-13 19:51:35 -0300 |
| commit | a552e7fe41f2145b6e785ce03c6b2d8920ab7b43 (patch) | |
| tree | c938070c363db70f111d058c4fccc781ff0dea0b /core/net-tools | |
| parent | 0a15db3fa6f40e080010ab6c553b1ce9e32db4a9 (diff) | |
| parent | 7c64c5039335c73eaa1a402c417235e8ca9a5109 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/emesene/PKGBUILD
community/minidlna/PKGBUILD
community/uzbl/PKGBUILD
community/virtualbox/PKGBUILD
extra/lirc/PKGBUILD
libre/pacman/PKGBUILD
multilib-testing/lib32-mesa/PKGBUILD
testing/mesa/PKGBUILD
testing/subversion/PKGBUILD
Diffstat (limited to 'core/net-tools')
| -rw-r--r-- | core/net-tools/PKGBUILD | 25 | ||||
| -rw-r--r-- | core/net-tools/net-tools.install | 12 |
2 files changed, 25 insertions, 12 deletions
diff --git a/core/net-tools/PKGBUILD b/core/net-tools/PKGBUILD index 9cec6c2be..d46f0605e 100644 --- a/core/net-tools/PKGBUILD +++ b/core/net-tools/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 126212 2011-06-02 16:50:35Z bisson $ +# $Id: PKGBUILD 127037 2011-06-10 00:48:19Z bisson $ # Maintainer: judd <jvinet@zeroflux.org> pkgname=net-tools pkgver=1.60 -pkgrel=16 +pkgrel=18 pkgdesc="Configuration tools for Linux networking" arch=(i686 x86_64 'mips64el') license=('GPL') @@ -14,13 +14,7 @@ source=(http://www.tazenda.demon.co.uk/phil/$pkgname/$pkgname-$pkgver.tar.bz2 net-tools-1.60-nameif.patch net-tools-1.60-nameif_strncpy.patch) options=(!makeflags) -md5sums=('888774accab40217dde927e21979c165' - '7ef8d0c6818faa0fdeea94970a20e3fb' - 'b52d899cba9956bb0055150506f41ac1' - '51de6eabe2d6d6dc860f72c41cee636b' - 'c16109863bc63f3dad4ef35305a340bb' - '29a32617382fab1735acba4d920f1fcd' - 'e66466b9304dac85eb42b32f1ec3b284') +install=net-tools.install build() { cd $srcdir/$pkgname-$pkgver @@ -37,7 +31,14 @@ package() { cd $srcdir/$pkgname-$pkgver make BASEDIR=$pkgdir update - # the following is provided by yp-tools and coreutils - rm "${pkgdir}"/bin/{{,dns,nis,yp}domainname,hostname} - rm "${pkgdir}"/usr/share/man/man1/{{,dns,nis,yp}domainname,hostname}.1 + # the following is provided by yp-tools + rm "${pkgdir}"/bin/{nis,yp}domainname + rm "${pkgdir}"/usr/share/man/man1/{nis,yp}domainname.1 } +md5sums=('888774accab40217dde927e21979c165' + '7ef8d0c6818faa0fdeea94970a20e3fb' + 'b52d899cba9956bb0055150506f41ac1' + '51de6eabe2d6d6dc860f72c41cee636b' + 'c16109863bc63f3dad4ef35305a340bb' + '29a32617382fab1735acba4d920f1fcd' + 'e66466b9304dac85eb42b32f1ec3b284') diff --git a/core/net-tools/net-tools.install b/core/net-tools/net-tools.install new file mode 100644 index 000000000..9eee9e51b --- /dev/null +++ b/core/net-tools/net-tools.install @@ -0,0 +1,12 @@ +post_upgrade() { + if [ "$(vercmp $2 1.60-16)" -lt 0 ]; then + echo "hostname and {,yp,nis}domainname has moved:" + echo "----------" + echo "hostname is now in coreutils" + echo "domainname is now in yp-tools" + echo "their functionality might have changed slightly" + echo "" + echo "dnsdomainname remains in net-tools" + echo "----------" + fi +} |