[arch-commits] Commit in net-tools/trunk (Makefile.patch PKGBUILD)

Ronald van Haren ronald at archlinux.org
Tue Aug 7 20:08:39 UTC 2012


    Date: Tuesday, August 7, 2012 @ 16:08:38
  Author: ronald
Revision: 164984

upgpkg: net-tools 1.60.20120804git-2

move route/ifconfig back to /sbin FS#31021

Added:
  net-tools/trunk/Makefile.patch
Modified:
  net-tools/trunk/PKGBUILD

----------------+
 Makefile.patch |   17 +++++++++++++++++
 PKGBUILD       |   16 +++++++++-------
 2 files changed, 26 insertions(+), 7 deletions(-)

Added: Makefile.patch
===================================================================
--- Makefile.patch	                        (rev 0)
+++ Makefile.patch	2012-08-07 20:08:38 UTC (rev 164984)
@@ -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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-08-07 19:26:08 UTC (rev 164983)
+++ PKGBUILD	2012-08-07 20:08:38 UTC (rev 164984)
@@ -4,7 +4,7 @@
 
 pkgname=net-tools
 pkgver=1.60.20120804git
-pkgrel=1
+pkgrel=2
 pkgdesc="Configuration tools for Linux networking"
 arch=(i686 x86_64)
 license=('GPL2')
@@ -13,19 +13,21 @@
 
 # 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)
+source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz
+	Makefile.patch)
 options=(!makeflags)
 install=net-tools.install
-sha1sums=('a3341086cb403a8d747b783693f72ee2dfd72d82')
-
+sha1sums=('a3341086cb403a8d747b783693f72ee2dfd72d82'
+          '4191ca56dc01d6aebe26c36c7cc060c638d5ebca')
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np0 -i ${srcdir}/Makefile.patch
   yes "" | make
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
-  make BASEDIR=$pkgdir update
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make BASEDIR=${pkgdir} update
 
   # the following is provided by yp-tools
   rm "${pkgdir}"/bin/{nis,yp}domainname




More information about the arch-commits mailing list