From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jonatan Schlag To: development@lists.ipfire.org Subject: Re: [PATCH 3/3] New package ncat (ncat is the new standard netcat) and change the build order of netcat Date: Wed, 06 Apr 2016 10:26:23 +0000 Message-ID: <20160406102623.Horde.HP9fj6fZA4iXVDYdvLBR7Xf@owncloud.helmsklamm.local.familyschlag> In-Reply-To: <1459894194.30749.350.camel@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8151003058210039291==" List-Id: --===============8151003058210039291== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hi, it is necessary because the log files are named like =20 $(THISAPP)-$(VER). When in Ncat and Nmap $(THISAPP)-$(VER) =3D nmap-7.12 is or the strings in both lfs files =20 (ncat and nmap ) are the same, the log files are named identically. So =20 the log file of the nmap package overrides the log file of the ncat =20 package .This should not happen. The easiest solution till now was to change the name of the source =20 tarball to ncat. Or a way which I discover just now. Maybe it is a solution to change this to VER =3D 7.12 THISAPP =3D ncat-$(VER) DL_FILE =3D nmap-$(VER).tar.bz2 DL_FROM =3D $(URL_IPFIRE) DIR_APP =3D $(DIR_SRC)/nmap-$(VER) TARGET =3D $(DIR_INFO)/nmap-$(VER) I will try this solution and if it works will send a new patch set. =20 This solution is much more elegant :-). Regards Jonatan Michael Tremer =E2=80=93 Mi, 6. April 2016 0:09 > Hi, > > why is it necessary to change the name of the tarball? It can be the =20 > same as in > lfs/nmap without any conflicts (as long as the checksum matches of =20 > course which > it should). > > -Michael > > On Mon, 2016-04-04 at 17:19 +0200, Jonatan Schlag wrote: > > Signed-off-by: Jonatan Schlag > > --- > > 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 =20 > 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 @@ > > =20 > +##########################################################################= ### > > ## > > +# =20 > > # > > +# IPFire.org - A linux based > > firewall # > > +# Copyright (C) 2016 IPFire Team =20 > > # > > +# =20 > > # > > +# 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. # > > +# =20 > > # > > +# 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. # > > +# =20 > > # > > +# You should have received a copy of the GNU General Public > > License # > > +# along with this program. If not, see . > = # > > +# =20 > > # > > =20 > +##########################################################################= ### > > ## > > + > > =20 > +##########################################################################= ### > > ## > > +# Definitions > > =20 > +##########################################################################= ### > > ## > > + > > +include Config > > + > > +VER =3D 7.12 > > + > > +THISAPP =3D ncat-$(VER) > > +DL_FILE =3D $(THISAPP).tar.bz2 > > +DL_FROM =3D $(URL_IPFIRE) > > +DIR_APP =3D $(DIR_SRC)/$(THISAPP) > > +TARGET =3D $(DIR_INFO)/$(THISAPP) > > +PROG =3D ncat > > +PAK_VER =3D 1 > > + > > +DEPS =3D "" > > + > > =20 > +##########################################################################= ### > > ## > > +# Top-level Rules > > =20 > +##########################################################################= ### > > ## > > + > > +objects =3D $(DL_FILE) > > + > > +$(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) > > + > > +$(DL_FILE)_MD5 =3D 893d3722ecbd92ab523cb092c07e31d7 > > + > > +install : $(TARGET) > > + > > +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) > > + > > +download :$(patsubst %,$(DIR_DL)/%,$(objects)) > > + > > +md5 : $(subst %,%_MD5,$(objects)) > > + > > +dist: > > + @$(PAK) > > + > > =20 > +##########################################################################= ### > > ## > > +# Downloading, checking, md5sum > > =20 > +##########################################################################= ### > > ## > > + > > +$(patsubst %,$(DIR_CHK)/%,$(objects)) : > > + @$(CHECK) > > + > > +$(patsubst %,$(DIR_DL)/%,$(objects)) : > > + @$(LOAD) > > + > > +$(subst %,%_MD5,$(objects)) : > > + @$(MD5) > > + > > =20 > +##########################################################################= ### > > ## > > +# Installation Details > > =20 > +##########################################################################= ### > > ## > > + > > +$(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=3D/usr --without-nmapfe -- > > without-zenmap --without-ndiff --without-nping -without-liblua =20 > --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 > --===============8151003058210039291==--