[arch-commits] Commit in net-tools/repos (10 files)

Ronald van Haren ronald at archlinux.org
Tue Aug 7 20:09:18 UTC 2012


    Date: Tuesday, August 7, 2012 @ 16:09:18
  Author: ronald
Revision: 164985

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  net-tools/repos/testing-i686/Makefile.patch
    (from rev 164984, net-tools/trunk/Makefile.patch)
  net-tools/repos/testing-i686/PKGBUILD
    (from rev 164984, net-tools/trunk/PKGBUILD)
  net-tools/repos/testing-i686/net-tools.install
    (from rev 164984, net-tools/trunk/net-tools.install)
  net-tools/repos/testing-x86_64/Makefile.patch
    (from rev 164984, net-tools/trunk/Makefile.patch)
  net-tools/repos/testing-x86_64/PKGBUILD
    (from rev 164984, net-tools/trunk/PKGBUILD)
  net-tools/repos/testing-x86_64/net-tools.install
    (from rev 164984, net-tools/trunk/net-tools.install)
Deleted:
  net-tools/repos/testing-i686/PKGBUILD
  net-tools/repos/testing-i686/net-tools.install
  net-tools/repos/testing-x86_64/PKGBUILD
  net-tools/repos/testing-x86_64/net-tools.install

----------------------------------+
 testing-i686/Makefile.patch      |   17 ++++++++
 testing-i686/PKGBUILD            |   76 ++++++++++++++++++-------------------
 testing-i686/net-tools.install   |   24 +++++------
 testing-x86_64/Makefile.patch    |   17 ++++++++
 testing-x86_64/PKGBUILD          |   76 ++++++++++++++++++-------------------
 testing-x86_64/net-tools.install |   24 +++++------
 6 files changed, 136 insertions(+), 98 deletions(-)

Copied: net-tools/repos/testing-i686/Makefile.patch (from rev 164984, net-tools/trunk/Makefile.patch)
===================================================================
--- testing-i686/Makefile.patch	                        (rev 0)
+++ testing-i686/Makefile.patch	2012-08-07 20:09:18 UTC (rev 164985)
@@ -0,0 +1,17 @@
+--- Makefile.old	2012-08-07 22:07:58.235437087 +0200
++++ Makefile	2012-08-07 22:10:21.192104345 +0200
+@@ -239,12 +239,12 @@
+ 	install -m 0755 -d ${BASEDIR}/bin
+ 	install -m 0755 arp        ${BASEDIR}/sbin
+ 	install -m 0755 hostname   ${BASEDIR}/bin
+-	install -m 0755 ifconfig   ${BASEDIR}/bin
++	install -m 0755 ifconfig   ${BASEDIR}/sbin
+ 	install -m 0755 nameif     ${BASEDIR}/sbin
+ 	install -m 0755 netstat    ${BASEDIR}/bin
+ 	install -m 0755 plipconfig $(BASEDIR)/sbin
+ 	install -m 0755 rarp       ${BASEDIR}/sbin
+-	install -m 0755 route      ${BASEDIR}/bin
++	install -m 0755 route      ${BASEDIR}/sbin
+ 	install -m 0755 slattach   $(BASEDIR)/sbin
+ ifeq ($(HAVE_IP_TOOLS),1)
+ 	install -m 0755 ipmaddr    $(BASEDIR)/sbin

Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2012-08-07 20:08:38 UTC (rev 164984)
+++ testing-i686/PKGBUILD	2012-08-07 20:09:18 UTC (rev 164985)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: judd <jvinet at zeroflux.org>
-
-pkgname=net-tools
-pkgver=1.60.20120804git
-pkgrel=1
-pkgdesc="Configuration tools for Linux networking"
-arch=(i686 x86_64)
-license=('GPL2')
-url="http://net-tools.sourceforge.net/"
-depends=('glibc')
-
-# http://www.tazenda.demon.co.uk/phil/$pkgname/$pkgname-$pkgver.tar.bz2
-# use git checkout instead
-source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz)
-options=(!makeflags)
-install=net-tools.install
-sha1sums=('a3341086cb403a8d747b783693f72ee2dfd72d82')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  yes "" | make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make BASEDIR=$pkgdir update
-
-  # the following is provided by yp-tools
-  rm "${pkgdir}"/bin/{nis,yp}domainname
-  rm "${pkgdir}"/usr/share/man/man1/{nis,yp}domainname.1
-
-  # hostname is provided by inetutils
-  rm "${pkgdir}"/bin/{hostname,dnsdomainname,domainname}
-  rm -rf "${pkgdir}"/usr/share/man/man1
-}

Copied: net-tools/repos/testing-i686/PKGBUILD (from rev 164984, net-tools/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD	                        (rev 0)
+++ testing-i686/PKGBUILD	2012-08-07 20:09:18 UTC (rev 164985)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: judd <jvinet at zeroflux.org>
+
+pkgname=net-tools
+pkgver=1.60.20120804git
+pkgrel=2
+pkgdesc="Configuration tools for Linux networking"
+arch=(i686 x86_64)
+license=('GPL2')
+url="http://net-tools.sourceforge.net/"
+depends=('glibc')
+
+# http://www.tazenda.demon.co.uk/phil/$pkgname/$pkgname-$pkgver.tar.bz2
+# use git checkout instead
+source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz
+	Makefile.patch)
+options=(!makeflags)
+install=net-tools.install
+sha1sums=('a3341086cb403a8d747b783693f72ee2dfd72d82'
+          '4191ca56dc01d6aebe26c36c7cc060c638d5ebca')
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np0 -i ${srcdir}/Makefile.patch
+  yes "" | make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make BASEDIR=${pkgdir} update
+
+  # the following is provided by yp-tools
+  rm "${pkgdir}"/bin/{nis,yp}domainname
+  rm "${pkgdir}"/usr/share/man/man1/{nis,yp}domainname.1
+
+  # hostname is provided by inetutils
+  rm "${pkgdir}"/bin/{hostname,dnsdomainname,domainname}
+  rm -rf "${pkgdir}"/usr/share/man/man1
+}

Deleted: testing-i686/net-tools.install
===================================================================
--- testing-i686/net-tools.install	2012-08-07 20:08:38 UTC (rev 164984)
+++ testing-i686/net-tools.install	2012-08-07 20:09:18 UTC (rev 164985)
@@ -1,12 +0,0 @@
-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
-}

Copied: net-tools/repos/testing-i686/net-tools.install (from rev 164984, net-tools/trunk/net-tools.install)
===================================================================
--- testing-i686/net-tools.install	                        (rev 0)
+++ testing-i686/net-tools.install	2012-08-07 20:09:18 UTC (rev 164985)
@@ -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
+}

Copied: net-tools/repos/testing-x86_64/Makefile.patch (from rev 164984, net-tools/trunk/Makefile.patch)
===================================================================
--- testing-x86_64/Makefile.patch	                        (rev 0)
+++ testing-x86_64/Makefile.patch	2012-08-07 20:09:18 UTC (rev 164985)
@@ -0,0 +1,17 @@
+--- Makefile.old	2012-08-07 22:07:58.235437087 +0200
++++ Makefile	2012-08-07 22:10:21.192104345 +0200
+@@ -239,12 +239,12 @@
+ 	install -m 0755 -d ${BASEDIR}/bin
+ 	install -m 0755 arp        ${BASEDIR}/sbin
+ 	install -m 0755 hostname   ${BASEDIR}/bin
+-	install -m 0755 ifconfig   ${BASEDIR}/bin
++	install -m 0755 ifconfig   ${BASEDIR}/sbin
+ 	install -m 0755 nameif     ${BASEDIR}/sbin
+ 	install -m 0755 netstat    ${BASEDIR}/bin
+ 	install -m 0755 plipconfig $(BASEDIR)/sbin
+ 	install -m 0755 rarp       ${BASEDIR}/sbin
+-	install -m 0755 route      ${BASEDIR}/bin
++	install -m 0755 route      ${BASEDIR}/sbin
+ 	install -m 0755 slattach   $(BASEDIR)/sbin
+ ifeq ($(HAVE_IP_TOOLS),1)
+ 	install -m 0755 ipmaddr    $(BASEDIR)/sbin

Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2012-08-07 20:08:38 UTC (rev 164984)
+++ testing-x86_64/PKGBUILD	2012-08-07 20:09:18 UTC (rev 164985)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: judd <jvinet at zeroflux.org>
-
-pkgname=net-tools
-pkgver=1.60.20120804git
-pkgrel=1
-pkgdesc="Configuration tools for Linux networking"
-arch=(i686 x86_64)
-license=('GPL2')
-url="http://net-tools.sourceforge.net/"
-depends=('glibc')
-
-# http://www.tazenda.demon.co.uk/phil/$pkgname/$pkgname-$pkgver.tar.bz2
-# use git checkout instead
-source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz)
-options=(!makeflags)
-install=net-tools.install
-sha1sums=('a3341086cb403a8d747b783693f72ee2dfd72d82')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  yes "" | make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make BASEDIR=$pkgdir update
-
-  # the following is provided by yp-tools
-  rm "${pkgdir}"/bin/{nis,yp}domainname
-  rm "${pkgdir}"/usr/share/man/man1/{nis,yp}domainname.1
-
-  # hostname is provided by inetutils
-  rm "${pkgdir}"/bin/{hostname,dnsdomainname,domainname}
-  rm -rf "${pkgdir}"/usr/share/man/man1
-}

Copied: net-tools/repos/testing-x86_64/PKGBUILD (from rev 164984, net-tools/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2012-08-07 20:09:18 UTC (rev 164985)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: judd <jvinet at zeroflux.org>
+
+pkgname=net-tools
+pkgver=1.60.20120804git
+pkgrel=2
+pkgdesc="Configuration tools for Linux networking"
+arch=(i686 x86_64)
+license=('GPL2')
+url="http://net-tools.sourceforge.net/"
+depends=('glibc')
+
+# http://www.tazenda.demon.co.uk/phil/$pkgname/$pkgname-$pkgver.tar.bz2
+# use git checkout instead
+source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz
+	Makefile.patch)
+options=(!makeflags)
+install=net-tools.install
+sha1sums=('a3341086cb403a8d747b783693f72ee2dfd72d82'
+          '4191ca56dc01d6aebe26c36c7cc060c638d5ebca')
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np0 -i ${srcdir}/Makefile.patch
+  yes "" | make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make BASEDIR=${pkgdir} update
+
+  # the following is provided by yp-tools
+  rm "${pkgdir}"/bin/{nis,yp}domainname
+  rm "${pkgdir}"/usr/share/man/man1/{nis,yp}domainname.1
+
+  # hostname is provided by inetutils
+  rm "${pkgdir}"/bin/{hostname,dnsdomainname,domainname}
+  rm -rf "${pkgdir}"/usr/share/man/man1
+}

Deleted: testing-x86_64/net-tools.install
===================================================================
--- testing-x86_64/net-tools.install	2012-08-07 20:08:38 UTC (rev 164984)
+++ testing-x86_64/net-tools.install	2012-08-07 20:09:18 UTC (rev 164985)
@@ -1,12 +0,0 @@
-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
-}

Copied: net-tools/repos/testing-x86_64/net-tools.install (from rev 164984, net-tools/trunk/net-tools.install)
===================================================================
--- testing-x86_64/net-tools.install	                        (rev 0)
+++ testing-x86_64/net-tools.install	2012-08-07 20:09:18 UTC (rev 164985)
@@ -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
+}




More information about the arch-commits mailing list