[3/3] New package ncat (ncat is the new standard netcat) and change the build order of netcat

Message ID	1459783198-524-4-git-send-email-jonatan.schlag@ipfire.org
State	Superseded
Headers	From: Jonatan Schlag <jonatan.schlag@ipfire.org> To: development@lists.ipfire.org Subject: [PATCH 3/3] New package ncat (ncat is the new standard netcat) and change the build order of netcat Date: Mon, 4 Apr 2016 17:19:58 +0200 Message-Id: <1459783198-524-4-git-send-email-jonatan.schlag@ipfire.org> In-Reply-To: <1459783198-524-1-git-send-email-jonatan.schlag@ipfire.org> References: <1459783198-524-1-git-send-email-jonatan.schlag@ipfire.org> Precedence: list Errors-To: development-bounces@lists.ipfire.org Sender: "Development" <development-bounces@lists.ipfire.org>

Message ID

1459783198-524-4-git-send-email-jonatan.schlag@ipfire.org

State

Superseded

Headers

From: Jonatan Schlag <jonatan.schlag@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 3/3] New package ncat (ncat is the new standard netcat) and
	change the build order of netcat
Date: Mon,  4 Apr 2016 17:19:58 +0200
Message-Id: <1459783198-524-4-git-send-email-jonatan.schlag@ipfire.org>
In-Reply-To: <1459783198-524-1-git-send-email-jonatan.schlag@ipfire.org>
References: <1459783198-524-1-git-send-email-jonatan.schlag@ipfire.org>
Precedence: list
Errors-To: development-bounces@lists.ipfire.org
Sender: "Development" <development-bounces@lists.ipfire.org>

Message

Jonatan Schlag April 5, 2016, 1:19 a.m. UTC

  Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
---
 config/rootfiles/packages/ncat |  5 +++
 lfs/ncat                       | 86 ++++++++++++++++++++++++++++++++++++++++++
 make.sh                        |  3 +-
 3 files changed, 93 insertions(+), 1 deletion(-)
 create mode 100644 config/rootfiles/packages/ncat
 create mode 100644 lfs/ncat

Comments

Michael Tremer April 6, 2016, 8:09 a.m. UTC | #1

Hi,

why is it necessary to change the name of the tarball? It can be the same as in
lfs/nmap without any conflicts (as long as the checksum matches of course which
it should).

-Michael

On Mon, 2016-04-04 at 17:19 +0200, Jonatan Schlag wrote:
> Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
> ---
>  config/rootfiles/packages/ncat |  5 +++
>  lfs/ncat                       | 86
> ++++++++++++++++++++++++++++++++++++++++++
>  make.sh                        |  3 +-
>  3 files changed, 93 insertions(+), 1 deletion(-)
>  create mode 100644 config/rootfiles/packages/ncat
>  create mode 100644 lfs/ncat
> 
> diff --git a/config/rootfiles/packages/ncat b/config/rootfiles/packages/ncat
> new file mode 100644
> index 0000000..f1cf714
> --- /dev/null
> +++ b/config/rootfiles/packages/ncat
> @@ -0,0 +1,5 @@
> +usr/bin/nc
> +usr/bin/ncat
> +#usr/share/man/man1/ncat.1
> +#usr/share/ncat
> +#usr/share/ncat/ca-bundle.crt
> diff --git a/lfs/ncat b/lfs/ncat
> new file mode 100644
> index 0000000..bf02605
> --- /dev/null
> +++ b/lfs/ncat
> @@ -0,0 +1,86 @@
> +#############################################################################
> ##
> +#                                                                            
>  #
> +# IPFire.org - A linux based
> firewall                                         #
> +# 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        #
> +# the Free Software Foundation, either version 3 of the License,
> or           #
> +# (at your option) any later
> version.                                         #
> +#                                                                            
>  #
> +# This program is distributed in the hope that it will be
> useful,             #
> +# but WITHOUT ANY WARRANTY; without even the implied warranty
> of              #
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
> the               #
> +# GNU General Public License for more
> details.                                #
> +#                                                                            
>  #
> +# You should have received a copy of the GNU General Public
> License           #
> +# along with this program.  If not, see <http://www.gnu.org/licenses/>.      
>  #
> +#                                                                            
>  #
> +#############################################################################
> ##
> +
> +#############################################################################
> ##
> +# Definitions
> +#############################################################################
> ##
> +
> +include Config
> +
> +VER        = 7.12
> +
> +THISAPP    = ncat-$(VER)
> +DL_FILE    = $(THISAPP).tar.bz2
> +DL_FROM    = $(URL_IPFIRE)
> +DIR_APP    = $(DIR_SRC)/$(THISAPP)
> +TARGET     = $(DIR_INFO)/$(THISAPP)
> +PROG       = ncat
> +PAK_VER    = 1
> +
> +DEPS       = ""
> +
> +#############################################################################
> ##
> +# Top-level Rules
> +#############################################################################
> ##
> +
> +objects = $(DL_FILE)
> +
> +$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
> +
> +$(DL_FILE)_MD5 = 893d3722ecbd92ab523cb092c07e31d7
> +
> +install : $(TARGET)
> +
> +check : $(patsubst %,$(DIR_CHK)/%,$(objects))
> +
> +download :$(patsubst %,$(DIR_DL)/%,$(objects))
> +
> +md5 : $(subst %,%_MD5,$(objects))
> +
> +dist:
> +	@$(PAK)
> +
> +#############################################################################
> ##
> +# Downloading, checking, md5sum
> +#############################################################################
> ##
> +
> +$(patsubst %,$(DIR_CHK)/%,$(objects)) :
> +	@$(CHECK)
> +
> +$(patsubst %,$(DIR_DL)/%,$(objects)) :
> +	@$(LOAD)
> +
> +$(subst %,%_MD5,$(objects)) :
> +	@$(MD5)
> +
> +#############################################################################
> ##
> +# Installation Details
> +#############################################################################
> ##
> +
> +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
> +	@$(PREBUILD)
> +	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
> +	cd $(DIR_APP) && mkdir -p build
> +	cd $(DIR_APP) && ./configure --prefix=/usr --without-nmapfe --
> without-zenmap --without-ndiff --without-nping -without-liblua --without-nmap-
> update
> +	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
> +	cd $(DIR_APP)/ncat && make install
> +	ln -f -s /usr/bin/ncat /usr/bin/nc
> +	@rm -rf $(DIR_APP)
> +	@$(POSTBUILD)
> diff --git a/make.sh b/make.sh
> index b32dfd2..ff1e404 100755
> --- a/make.sh
> +++ b/make.sh
> @@ -679,6 +679,8 @@ buildipfire() {
>    ipfiremake libevent2
>    ipfiremake portmap
>    ipfiremake nfs
> +  ipfiremake netcat
> +  ipfiremake ncat
>    ipfiremake nmap
>    ipfiremake ncftp
>    ipfiremake etherwake
> @@ -749,7 +751,6 @@ buildipfire() {
>    ipfiremake gutenprint
>    ipfiremake apcupsd
>    ipfiremake iperf
> -  ipfiremake netcat
>    ipfiremake 7zip
>    ipfiremake lynis
>    ipfiremake streamripper

Jonatan Schlag April 6, 2016, 8:26 p.m. UTC | #2

Hi,
it is necessary because the log files are named like  
$(THISAPP)-$(VER).  When in Ncat and Nmap
$(THISAPP)-$(VER) = nmap-7.12 is or the strings in both lfs files  
(ncat and nmap ) are the same, the log files are named identically. So  
the log file of the nmap package overrides the log file of the ncat  
package  .This should not happen.
The easiest solution till now was to change the name of the source  
tarball to ncat.

Or a way which I discover just now. Maybe it is a solution to change this to

VER        = 7.12

THISAPP    = ncat-$(VER)
DL_FILE    = nmap-$(VER).tar.bz2
DL_FROM  = $(URL_IPFIRE)
DIR_APP    = $(DIR_SRC)/nmap-$(VER)
TARGET     = $(DIR_INFO)/nmap-$(VER)
I will try this solution and if it works will send a new patch set.  
This solution is much more elegant :-).

Regards Jonatan

Michael Tremer – Mi, 6. April 2016 0:09
> Hi,
>
> why is it necessary to change the name of the tarball? It can be the  
> same as in
> lfs/nmap without any conflicts (as long as the checksum matches of  
> course which
> it should).
>
> -Michael
>
> On Mon, 2016-04-04 at 17:19 +0200, Jonatan Schlag wrote:
> > Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
> > ---
> >  config/rootfiles/packages/ncat |  5 +++
> >  lfs/ncat                       | 86
> > ++++++++++++++++++++++++++++++++++++++++++
> >  make.sh                        |  3 +-
> >  3 files changed, 93 insertions(+), 1 deletion(-)
> >  create mode 100644 config/rootfiles/packages/ncat
> >  create mode 100644 lfs/ncat
> > > diff --git a/config/rootfiles/packages/ncat  
> b/config/rootfiles/packages/ncat
> > new file mode 100644
> > index 0000000..f1cf714
> > --- /dev/null
> > +++ b/config/rootfiles/packages/ncat
> > @@ -0,0 +1,5 @@
> > +usr/bin/nc
> > +usr/bin/ncat
> > +#usr/share/man/man1/ncat.1
> > +#usr/share/ncat
> > +#usr/share/ncat/ca-bundle.crt
> > diff --git a/lfs/ncat b/lfs/ncat
> > new file mode 100644
> > index 0000000..bf02605
> > --- /dev/null
> > +++ b/lfs/ncat
> > @@ -0,0 +1,86 @@
> >  
> +#############################################################################
> > ##
> > +#                                                                  
>            >  #
> > +# IPFire.org - A linux based
> > firewall                                         #
> > +# 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        #
> > +# the Free Software Foundation, either version 3 of the License,
> > or           #
> > +# (at your option) any later
> > version.                                         #
> > +#                                                                  
>            >  #
> > +# This program is distributed in the hope that it will be
> > useful,             #
> > +# but WITHOUT ANY WARRANTY; without even the implied warranty
> > of              #
> > +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
> > the               #
> > +# GNU General Public License for more
> > details.                                #
> > +#                                                                  
>            >  #
> > +# You should have received a copy of the GNU General Public
> > License           #
> > +# along with this program.  If not, see <www.gnu.org/licenses/>.      >  #
> > +#                                                                  
>            >  #
> >  
> +#############################################################################
> > ##
> > +
> >  
> +#############################################################################
> > ##
> > +# Definitions
> >  
> +#############################################################################
> > ##
> > +
> > +include Config
> > +
> > +VER        = 7.12
> > +
> > +THISAPP    = ncat-$(VER)
> > +DL_FILE    = $(THISAPP).tar.bz2
> > +DL_FROM    = $(URL_IPFIRE)
> > +DIR_APP    = $(DIR_SRC)/$(THISAPP)
> > +TARGET     = $(DIR_INFO)/$(THISAPP)
> > +PROG       = ncat
> > +PAK_VER    = 1
> > +
> > +DEPS       = ""
> > +
> >  
> +#############################################################################
> > ##
> > +# Top-level Rules
> >  
> +#############################################################################
> > ##
> > +
> > +objects = $(DL_FILE)
> > +
> > +$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
> > +
> > +$(DL_FILE)_MD5 = 893d3722ecbd92ab523cb092c07e31d7
> > +
> > +install : $(TARGET)
> > +
> > +check : $(patsubst %,$(DIR_CHK)/%,$(objects))
> > +
> > +download :$(patsubst %,$(DIR_DL)/%,$(objects))
> > +
> > +md5 : $(subst %,%_MD5,$(objects))
> > +
> > +dist:
> > +	@$(PAK)
> > +
> >  
> +#############################################################################
> > ##
> > +# Downloading, checking, md5sum
> >  
> +#############################################################################
> > ##
> > +
> > +$(patsubst %,$(DIR_CHK)/%,$(objects)) :
> > +	@$(CHECK)
> > +
> > +$(patsubst %,$(DIR_DL)/%,$(objects)) :
> > +	@$(LOAD)
> > +
> > +$(subst %,%_MD5,$(objects)) :
> > +	@$(MD5)
> > +
> >  
> +#############################################################################
> > ##
> > +# Installation Details
> >  
> +#############################################################################
> > ##
> > +
> > +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
> > +	@$(PREBUILD)
> > +	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
> > +	cd $(DIR_APP) && mkdir -p build
> > +	cd $(DIR_APP) && ./configure --prefix=/usr --without-nmapfe --
> > without-zenmap --without-ndiff --without-nping -without-liblua  
> --without-nmap-
> > update
> > +	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
> > +	cd $(DIR_APP)/ncat && make install
> > +	ln -f -s /usr/bin/ncat /usr/bin/nc
> > +	@rm -rf $(DIR_APP)
> > +	@$(POSTBUILD)
> > diff --git a/make.sh b/make.sh
> > index b32dfd2..ff1e404 100755
> > --- a/make.sh
> > +++ b/make.sh
> > @@ -679,6 +679,8 @@ buildipfire() {
> >    ipfiremake libevent2
> >    ipfiremake portmap
> >    ipfiremake nfs
> > +  ipfiremake netcat
> > +  ipfiremake ncat
> >    ipfiremake nmap
> >    ipfiremake ncftp
> >    ipfiremake etherwake
> > @@ -749,7 +751,6 @@ buildipfire() {
> >    ipfiremake gutenprint
> >    ipfiremake apcupsd
> >    ipfiremake iperf
> > -  ipfiremake netcat
> >    ipfiremake 7zip
> >    ipfiremake lynis
> >    ipfiremake streamripper
>

Jonatan Schlag April 7, 2016, 2:50 a.m. UTC | #3

Hi,
I tested my second solution and the solution works perfectly :-)

THISAPP = ncat-$(VER)
DL_FILE = nmap-$(VER).tar.bz2 # name of the download file
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/nmap-$(VER)   #name of the directory in the tarball
TARGET = $(DIR_INFO)/ncat-$(VER)  # name of the logfile

I will send a new patch for this today or tomorrow.

Regards Jonatan

PS.: The comments are for me. I have to write a little bit  
documentation about this, although I will forget everything. In this  
Mail, they are safe till I write the documentation.

Michael Tremer April 7, 2016, 7:03 a.m. UTC | #4

Yes, just change TARGET and you are fine :)

-Michael

On Wed, 2016-04-06 at 16:50 +0000, Jonatan Schlag wrote:
> Hi,
> I tested my second solution and the solution works perfectly :-)
> 
> THISAPP = ncat-$(VER)
> DL_FILE = nmap-$(VER).tar.bz2 # name of the download file
> DL_FROM = $(URL_IPFIRE)
> DIR_APP = $(DIR_SRC)/nmap-$(VER)   #name of the directory in the tarball
> TARGET = $(DIR_INFO)/ncat-$(VER)  # name of the logfile
> 
> I will send a new patch for this today or tomorrow.
> 
> Regards Jonatan
> 
> PS.: The comments are for me. I have to write a little bit  
> documentation about this, although I will forget everything. In this  
> Mail, they are safe till I write the documentation.
>