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 c23695935..f043ed26c 100644 --- 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 d07669b6d..77ddf5efc 100644 --- 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 # # # # 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 22ff82072..2130e3726 100755 --- 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