Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3bc8e4972d404a4d73c5f1410b04597437110fd0
commit 3bc8e4972d404a4d73c5f1410b04597437110fd0 Author: DeX77 <[email protected]> Date: Sun Jan 8 17:50:53 2017 +0100 net-tools-1.60.g90da8a0-1-x86_64 * version bump ( time for a upstream release ) diff --git a/source/base/net-tools/FrugalBuild b/source/base/net-tools/FrugalBuild index 4361ca6..bbadee2 100644 --- a/source/base/net-tools/FrugalBuild +++ b/source/base/net-tools/FrugalBuild @@ -3,8 +3,8 @@ # Contributor: Miklos Vajna <[email protected]> pkgname=net-tools -pkgver=1.60.20130219 -pkgrel=3 +pkgver=1.60.g90da8a0 +pkgrel=1 pkgdesc="Important tools for controlling the network subsystem" url="http://www.tazenda.demon.co.uk/phil/net-tools/"; depends=('glibc>=2.22-7') @@ -12,15 +12,17 @@ makedepends=('bluez') groups=('base' 'chroot-core') conflicts=('hotplug') archs=('x86_64') -up2date="Flasttar http://ftp.frugalware.org/pub/other/sources/$pkgname"; options=('nomirror') -source=(http://ftp.frugalware.org/pub/other/sources/$pkgname/$pkgname-$pkgver.tar.xz config.patch makefile.patch) -sha1sums=('a86c887c5147cdcce0bbcb9bba2338b1e4b4db5a' \ - '496b1263bbef9243c63a03c3153701e07031e965' \ - '9f57251f1a5326bc656d6dab5f9db8e3bb6f1ecc') +_F_scm_type="git" +_F_scm_url="git://git.code.sf.net/p/net-tools/code" +Finclude scm +source=(config.patch makefile.patch) +sha1sums=('496b1263bbef9243c63a03c3153701e07031e965' \ + 'f5a4700f401b9565a9bd202489680c0121d92162') build() { + Funpack_scm Fcd Fpatchall yes '' | make config || Fdie diff --git a/source/base/net-tools/makefile.patch b/source/base/net-tools/makefile.patch index 82a719a..9fde5ea 100644 --- a/source/base/net-tools/makefile.patch +++ b/source/base/net-tools/makefile.patch @@ -1,18 +1,24 @@ -diff -ur a/Makefile b/Makefile ---- a/Makefile 2013-02-19 03:28:11.000000000 -0600 -+++ b/Makefile 2013-04-21 16:01:51.910460760 -0500 -@@ -198,12 +198,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 +diff --git a/Makefile b/Makefile +index bf67bc6..1986147 100644 +--- a/Makefile ++++ b/Makefile +@@ -206,17 +206,12 @@ mii-tool: $(NET_LIB) mii-tool.o + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ mii-tool.o $(NLIB) $(LDLIBS) + + installbin: +- @echo +- @echo "######################################################" +- @echo "Notice: ifconfig and route are now installed into /bin" +- @echo "######################################################" +- @echo + install -m 0755 -d ${BASEDIR}${SBINDIR} + install -m 0755 -d ${BASEDIR}${BINDIR} +- install -m 0755 ifconfig ${BASEDIR}${BINDIR} ++ install -m 0755 ifconfig ${BASEDIR}${SBINDIR} + install -m 0755 nameif ${BASEDIR}${SBINDIR} + install -m 0755 netstat ${BASEDIR}${BINDIR} +- install -m 0755 route ${BASEDIR}${BINDIR} ++ install -m 0755 route ${BASEDIR}${SBINDIR} + ifeq ($(HAVE_ARP_TOOLS),1) + install -m 0755 arp ${BASEDIR}${SBINDIR} + install -m 0755 rarp ${BASEDIR}${SBINDIR} _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
