[arch-commits] Commit in net-tools/trunk (3 files)
Ronald van Haren
ronald at archlinux.org
Fri Aug 19 08:34:09 UTC 2011
Date: Friday, August 19, 2011 @ 04:34:09
Author: ronald
Revision: 135836
upgpkg: net-tools 1.60.20110819cvs-1
update to current cvs; remove hostname from package
Modified:
net-tools/trunk/PKGBUILD
net-tools/trunk/net-tools-1.60-miiioctl.patch
net-tools/trunk/net-tools.patch
-------------------------------+
PKGBUILD | 37 ++++++++++++++++++-------------------
net-tools-1.60-miiioctl.patch | 14 +++++++-------
net-tools.patch | 22 ----------------------
3 files changed, 25 insertions(+), 48 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-08-19 07:59:18 UTC (rev 135835)
+++ PKGBUILD 2011-08-19 08:34:09 UTC (rev 135836)
@@ -1,28 +1,30 @@
# $Id$
-# Maintainer: judd <jvinet at zeroflux.org>
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: judd <jvinet at zeroflux.org>
+
pkgname=net-tools
-pkgver=1.60
-pkgrel=18
+pkgver=1.60.20110819cvs
+pkgrel=1
pkgdesc="Configuration tools for Linux networking"
arch=(i686 x86_64)
-license=('GPL')
+license=('GPL2')
url="http://www.tazenda.demon.co.uk/phil/net-tools"
depends=('glibc')
-source=(http://www.tazenda.demon.co.uk/phil/$pkgname/$pkgname-$pkgver.tar.bz2
- net-tools.patch gcc340.patch net-tools-1.60-2.6-compilefix.patch
+
+# http://www.tazenda.demon.co.uk/phil/$pkgname/$pkgname-$pkgver.tar.bz2
+# use cvs checkout instead
+source=(ftp://ftp.archlinux.org/other/net-tools/net-tools-1.60.20110819cvs.tar.bz2
net-tools-1.60-miiioctl.patch
- net-tools-1.60-nameif.patch
net-tools-1.60-nameif_strncpy.patch)
-options=(!makeflags)
+#options=(!makeflags)
install=net-tools.install
+sha1sums=('02946449191ff279f9f0f7fd7bc65ae21059a2bf'
+ '654a96bc6575efb4a2e04b49de45d448d240eb6e'
+ '7888000d8fe867e58b5b00fe2bcf6c3041d716b4')
build() {
cd $srcdir/$pkgname-$pkgver
- patch -Np1 -i ../net-tools.patch
- patch -Np1 -i ../net-tools-1.60-2.6-compilefix.patch
patch -Np1 -i ../net-tools-1.60-miiioctl.patch
- patch -Np1 -i ../gcc340.patch
- patch -Np1 -i ${srcdir}/net-tools-1.60-nameif.patch
patch -Np1 -i ${srcdir}/net-tools-1.60-nameif_strncpy.patch
yes "" | make
}
@@ -34,11 +36,8 @@
# 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
}
-md5sums=('888774accab40217dde927e21979c165'
- '7ef8d0c6818faa0fdeea94970a20e3fb'
- 'b52d899cba9956bb0055150506f41ac1'
- '51de6eabe2d6d6dc860f72c41cee636b'
- 'c16109863bc63f3dad4ef35305a340bb'
- '29a32617382fab1735acba4d920f1fcd'
- 'e66466b9304dac85eb42b32f1ec3b284')
Modified: net-tools-1.60-miiioctl.patch
===================================================================
--- net-tools-1.60-miiioctl.patch 2011-08-19 07:59:18 UTC (rev 135835)
+++ net-tools-1.60-miiioctl.patch 2011-08-19 08:34:09 UTC (rev 135836)
@@ -1,17 +1,17 @@
---- net-tools-1.60/include/mii.h.bar Tue Jul 31 11:49:39 2001
-+++ net-tools-1.60/include/mii.h Tue Jul 31 11:49:33 2001
-@@ -11,11 +11,9 @@
-
+--- net-tools-1.60.20110819cvs/include/mii.h 2011-08-19 10:14:00.743873299 +0200
++++ net-tools-1.60.20110819cvs/include/mii.h.new 2011-08-19 10:28:26.500524160 +0200
+@@ -14,11 +14,9 @@
/* network interface ioctl's for MII commands */
#ifndef SIOCGMIIPHY
+ #warning "SIOCGMIIPHY is not defined by your kernel source"
-#define SIOCGMIIPHY (SIOCDEVPRIVATE) /* Read from current PHY */
-#define SIOCGMIIREG (SIOCDEVPRIVATE+1) /* Read any PHY register */
-#define SIOCSMIIREG (SIOCDEVPRIVATE+2) /* Write any PHY register */
-#define SIOCGPARAMS (SIOCDEVPRIVATE+3) /* Read operational parameters */
-#define SIOCSPARAMS (SIOCDEVPRIVATE+4) /* Set operational parameters */
-+#define SIOCGMIIPHY 0x8947 /* Read from current PHY */
-+#define SIOCGMIIREG 0x8948 /* Read any PHY register */
-+#define SIOCSMIIREG 0x8949 /* Write any PHY register */
++#define SIOCGMIIPHY 0x8947 /* Read from current PHY */
++#define SIOCGMIIREG 0x8948 /* Read any PHY register */
++#define SIOCSMIIREG 0x8949 /* Write any PHY register */
#endif
#include <linux/types.h>
Modified: net-tools.patch
===================================================================
--- net-tools.patch 2011-08-19 07:59:18 UTC (rev 135835)
+++ net-tools.patch 2011-08-19 08:34:09 UTC (rev 135836)
@@ -1,25 +1,3 @@
-diff -Naur net-tools-1.60-orig/config.in net-tools-1.60/config.in
---- net-tools-1.60-orig/config.in 2000-05-21 07:32:12.000000000 -0700
-+++ net-tools-1.60/config.in 2004-05-31 12:36:00.000000000 -0700
-@@ -49,7 +49,7 @@
- *
- bool 'UNIX protocol family' HAVE_AFUNIX y
- bool 'INET (TCP/IP) protocol family' HAVE_AFINET y
--bool 'INET6 (IPv6) protocol family' HAVE_AFINET6 n
-+bool 'INET6 (IPv6) protocol family' HAVE_AFINET6 y
- bool 'Novell IPX/SPX protocol family' HAVE_AFIPX y
- bool 'Appletalk DDP protocol family' HAVE_AFATALK y
- bool 'AX25 (packet radio) protocol family' HAVE_AFAX25 y
-@@ -86,6 +86,6 @@
- *
- * Other Features.
- *
--bool 'IP Masquerading support' HAVE_FW_MASQUERADE n
--bool 'Build iptunnel and ipmaddr' HAVE_IP_TOOLS n
--bool 'Build mii-tool' HAVE_MII n
-+bool 'IP Masquerading support' HAVE_FW_MASQUERADE y
-+bool 'Build iptunnel and ipmaddr' HAVE_IP_TOOLS y
-+bool 'Build mii-tool' HAVE_MII y
diff -Naur net-tools-1.60-orig/mii-tool.c net-tools-1.60/mii-tool.c
--- net-tools-1.60-orig/mii-tool.c 2000-05-21 07:31:17.000000000 -0700
+++ net-tools-1.60/mii-tool.c 2004-05-31 12:35:21.000000000 -0700
More information about the arch-commits
mailing list