Remove the nc symlink from netcat package and rename to gnu-netcat (gnu-netcat is...

Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/packages/netcat b/config/rootfiles/packages/gnu-netcat
similarity index 92%
rename from config/rootfiles/packages/netcat
rename to config/rootfiles/packages/gnu-netcat
index c236959351e4564dc0ee1d701c7db75ff772f5a3..f043ed26c14468f0fc2a670cd50b647b1180c1ff 100644 (file)
--- a/config/rootfiles/packages/netcat
+++ b/config/rootfiles/packages/gnu-netcat
@@ -1,4 +1,3 @@
-usr/bin/nc
 usr/bin/netcat
 #usr/info/netcat.info
 #usr/man/man1/netcat.1

diff --git a/lfs/netcat b/lfs/gnu-netcat
similarity index 96%
rename from lfs/netcat
rename to lfs/gnu-netcat
index d07669b6d8520376df9daf206086cc7d5b886741..77ddf5efc83fc10c98233f053c84d88801854fd0 100644 (file)
--- a/lfs/netcat
+++ b/lfs/gnu-netcat
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2016 IPFire Team  <info@ipfire.org>                           #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -31,7 +31,7 @@ DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
-PROG       = netcat
+PROG       = gnu-netcat
 PAK_VER    = 1
 
 DEPS       = ""
@@ -54,7 +54,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
-dist: 
+dist:
        @$(PAK)
 
 ###############################################################################
@@ -80,5 +80,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && ./configure --prefix=/usr
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
+       rm -f /usr/bin/nc
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index 22ff82072305bf5748e32a1d37aded3010923b9b..2130e372644cb6ce5a0b4e10bdf5356a20637d43 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -680,6 +680,7 @@ buildipfire() {
   ipfiremake libevent2
   ipfiremake portmap
   ipfiremake nfs
+  ipfiremake gnu-netcat
   ipfiremake nmap
   ipfiremake ncftp
   ipfiremake etherwake
@@ -751,7 +752,6 @@ buildipfire() {
   ipfiremake apcupsd
   ipfiremake iperf
   ipfiremake iperf3
-  ipfiremake netcat
   ipfiremake 7zip
   ipfiremake lynis
   ipfiremake streamripper