[Lunar-commits] <moonbase-other> Merge branch 'net-tools'

[v4hn]

commit fb3c058d30eb8662885327a58f73b395551acd5d
Author: v4hn <me at v4hn.de>
Date: Sun, 19 Jan 2014 15:13:41 -0800
URL: https://github.com/lunar-linux/moonbase-other/commit/fb3c058d30eb8662885327a58f73b395551acd5d

Merge branch 'net-tools'
---
  net/net-tools/BUILD     | +13/-29   
  net/net-tools/DETAILS   | +7/-4     
  net/net-tools/PRE_BUILD | +13/-0    
  3 files changed, 33 insertions(+), 33 deletions(-)

--- a/net/net-tools/BUILD
+++ b/net/net-tools/BUILD
@@ -1,33 +1,17 @@
-(
-
-  patch_it $SOURCE2 1 &&
-  patch_it $SOURCE3 0 &&
-  patch_it $SOURCE4 1 &&
-  patch_it $SOURCE5 1 &&
-  sedit "s/-O2/$CFLAGS/" Makefile &&
-  sedit "s/LOPTS = /LOPTS = $LDFLAGS -s/" Makefile  &&
-  sedit "s:linux/if_tr.h:netinet/if_tr.h:" lib/tr.c &&
-
-  # Do not add debug data to protect against hacking
-  # and stop chkrootkit from reporting false positive
-  sedit "s/-g//" Makefile &&
-
-  if [ -f $CONFIG_CACHE/net-tools.config.h ]; then
-    cp $CONFIG_CACHE/net-tools.config.h config.h
+if [ -f $CONFIG_CACHE/net-tools.config.h ]; then
+  cp $CONFIG_CACHE/net-tools.config.h config.h
+else
+  if [ "$(get_module_config AUTOCONF)" == "y" ]; then
+    NET_TOOLS_AUTOCONF=1 ./configure.sh config.in
   else
-    if [ "$(get_module_config AUTOCONF)" == "y" ]; then
-      NET_TOOLS_AUTOCONF=1 ./configure.sh config.in
-    else
-      ./configure.sh config.in
+    ./configure.sh config.in
     fi &&
-    cp config.h $CONFIG_CACHE/net-tools.config.h
-  fi &&
-
-  make            &&
-  prepare_install &&
+  cp config.h $CONFIG_CACHE/net-tools.config.h
+fi &&
 
-  make BASEDIR=/ install &&
-  install -m 755 $SCRIPT_DIRECTORY/ifup   /sbin &&
-  install -m 755 $SCRIPT_DIRECTORY/ifdown /sbin
+make            &&
+prepare_install &&
 
-) > $C_FIFO 2>&1
+make BASEDIR=/usr install &&
+install -m 755 $SCRIPT_DIRECTORY/ifup   /usr/sbin &&
+install -m 755 $SCRIPT_DIRECTORY/ifdown /usr/sbin
--- a/net/net-tools/DETAILS
+++ b/net/net-tools/DETAILS
@@ -3,25 +3,28 @@
           SOURCE=$MODULE-$VERSION.tar.bz2
          SOURCE2=$MODULE-$VERSION-gcc-3.3-fix1.patch.bz2
          SOURCE3=gcc34_net-tools_lunar.patch
-     SOURCE4=$MODULE-autoconf.patch.gz
-     SOURCE5=$MODULE-$VERSION-fixes.patch.gz
+         SOURCE4=$MODULE-autoconf.patch.gz
+         SOURCE5=$MODULE-$VERSION-fixes.patch.gz
+         SOURCE6=$MODULE-1.60-no-hostname.patch
    SOURCE_URL[0]=http://www.tazenda.demon.co.uk/phil/net-tools/
   SOURCE2_URL[0]=$PATCH_URL
      SOURCE3_URL=$PATCH_URL
      SOURCE4_URL=$PATCH_URL
      SOURCE5_URL=$PATCH_URL
+     SOURCE6_URL=$PATCH_URL
       SOURCE_VFY=sha1:944fb70641505d5d1139dba3aeb81ba124574b83
      SOURCE2_VFY=sha1:44ee3a0c517a4e67d8d746cd05683bd9f10836b7
      SOURCE3_VFY=sha1:b23cc7946f2b4e8cfac1adfa6a1ea29e11ba18fa
      SOURCE4_VFY=sha1:cdd26d5729491a5a12a45b657e6ca4f85cbda7a5
      SOURCE5_VFY=sha1:61336ad568a415385f24788b30039f746977d28c
+     SOURCE6_VFY=sha1:245a22d8a1d4f56c031da30fb17593b261cc30cd
         WEB_SITE=http://www.tazenda.demon.co.uk/phil/net-tools
-      MAINTAINER=kc8apf at kc8apf.net
          ENTERED=20010922
-         UPDATED=20080303
+         UPDATED=20140119
            SHORT="net-tools contains essential tools for networking."
 PSAFE=no
 LUNAR_RESTART_SERVICES=off
+
 cat << EOF
 The Net-tools package contains the arp, hostname, ifconfig, netstat,
 plipconfig rarp, route, and slattach programs.
--- /dev/null
+++ b/net/net-tools/PRE_BUILD
@@ -0,0 +1,13 @@
+default_pre_build &&
+patch_it $SOURCE2 1 &&
+patch_it $SOURCE3 0 &&
+patch_it $SOURCE4 1 &&
+patch_it $SOURCE5 1 &&
+patch_it $SOURCE6 1 &&
+sedit "s/-O2/$CFLAGS/" Makefile &&
+sedit "s/LOPTS = /LOPTS = $LDFLAGS -s/" Makefile  &&
+sedit "s:linux/if_tr.h:netinet/if_tr.h:" lib/tr.c &&
+
+# Do not add debug data to protect against hacking
+# and stop chkrootkit from reporting false positive
+sedit "s/-g//" Makefile