From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer <michael.tremer@ipfire.org> 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: Tue, 05 Apr 2016 23:09:54 +0100 Message-ID: <1459894194.30749.350.camel@ipfire.org> In-Reply-To: <1459783198-524-4-git-send-email-jonatan.schlag@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8252205421141778275==" List-Id: <development.lists.ipfire.org> --===============8252205421141778275== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 whi= ch it should). -Michael On Mon, 2016-04-04 at 17:19 +0200, Jonatan Schlag wrote: > Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> > --- > =C2=A0config/rootfiles/packages/ncat |=C2=A0=C2=A05 +++ > =C2=A0lfs/ncat=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0| 86 > ++++++++++++++++++++++++++++++++++++++++++ > =C2=A0make.sh=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0|=C2=A0=C2=A03 +- > =C2=A03 files changed, 93 insertions(+), 1 deletion(-) > =C2=A0create mode 100644 config/rootfiles/packages/ncat > =C2=A0create mode 100644 lfs/ncat >=20 > 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 @@ > +##########################################################################= ### > ## > +#=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0 > =C2=A0# > +# IPFire.org - A linux based > firewall=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0# > +# Copyright (C) 2016 IPFire Team=C2=A0=C2=A0<info(a)ipfire.org>=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 > =C2=A0# > +#=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0 > =C2=A0# > +# This program is free software: you can redistribute it and/or > modify=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0# > +# it under the terms of the GNU General Public License as published > by=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0# > +# the Free Software Foundation, either version 3 of the License, > or=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0# > +# (at your option) any later > version.=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0# > +#=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0 > =C2=A0# > +# This program is distributed in the hope that it will be > useful,=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0# > +# but WITHOUT ANY WARRANTY; without even the implied warranty > of=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0# > +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.=C2=A0=C2=A0See > the=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0# > +# GNU General Public License for more > details.=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0# > +#=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0 > =C2=A0# > +# You should have received a copy of the GNU General Public > License=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0# > +# along with this program.=C2=A0=C2=A0If not, see <http://www.gnu.org/lice= nses/>.=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 > =C2=A0# > +#=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0 > =C2=A0# > +##########################################################################= ### > ## > + > +##########################################################################= ### > ## > +# Definitions > +##########################################################################= ### > ## > + > +include Config > + > +VER=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D 7.12 > + > +THISAPP=C2=A0=C2=A0=C2=A0=C2=A0=3D ncat-$(VER) > +DL_FILE=C2=A0=C2=A0=C2=A0=C2=A0=3D $(THISAPP).tar.bz2 > +DL_FROM=C2=A0=C2=A0=C2=A0=C2=A0=3D $(URL_IPFIRE) > +DIR_APP=C2=A0=C2=A0=C2=A0=C2=A0=3D $(DIR_SRC)/$(THISAPP) > +TARGET=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D $(DIR_INFO)/$(THISAPP) > +PROG=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D ncat > +PAK_VER=C2=A0=C2=A0=C2=A0=C2=A0=3D 1 > + > +DEPS=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D "" > + > +##########################################################################= ### > ## > +# Top-level Rules > +##########################################################################= ### > ## > + > +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) > + > +##########################################################################= ### > ## > +# 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=3D/usr --without-nmapfe -- > without-zenmap --without-ndiff --without-nping -without-liblua --without-nm= ap- > 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() { > =C2=A0=C2=A0=C2=A0ipfiremake libevent2 > =C2=A0=C2=A0=C2=A0ipfiremake portmap > =C2=A0=C2=A0=C2=A0ipfiremake nfs > +=C2=A0=C2=A0ipfiremake netcat > +=C2=A0=C2=A0ipfiremake ncat > =C2=A0=C2=A0=C2=A0ipfiremake nmap > =C2=A0=C2=A0=C2=A0ipfiremake ncftp > =C2=A0=C2=A0=C2=A0ipfiremake etherwake > @@ -749,7 +751,6 @@ buildipfire() { > =C2=A0=C2=A0=C2=A0ipfiremake gutenprint > =C2=A0=C2=A0=C2=A0ipfiremake apcupsd > =C2=A0=C2=A0=C2=A0ipfiremake iperf > -=C2=A0=C2=A0ipfiremake netcat > =C2=A0=C2=A0=C2=A0ipfiremake 7zip > =C2=A0=C2=A0=C2=A0ipfiremake lynis > =C2=A0=C2=A0=C2=A0ipfiremake streamripper --===============8252205421141778275== Content-Type: application/pgp-signature Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="signature.asc" MIME-Version: 1.0 LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjIKCmlRSWNCQUFC Q2dBR0JRSlhCRGV5QUFvSkVJQjU4UDl2a0FrSEp6VVAvMEpML2xuMjdvTEUzbDRwUlkvWXl3TkcK SVkrZm85RzE2aGF3ZDd1dG92dFlldWNEQTFsL1JxdEx6NDJWUk15WW1nUFFPRWVXRDBqNGxUU0FW SkVHUDVQUQpnMGFUZHRtRXFCQUFSaXA0b3ZwK05lS0lydGZMRmFiN3UxUXkreUF1VkdOajNiZ1dQ dHAwSFpBL1huWjVZUHg3CjBHNW1lU2owcnpRQVJPTCsyUnhscFhZR0xaeVpjbHBFa0RUczJ6ZHdm Y2VQUFFrQk5iVllSTHFTR0VTdXUvNXAKTzludldHd3JPa1h0RjBvWXNvVkdPRzFVOFI3MGhmbVNu blFhU1A0bUdQTXcxc2hONWxuKytqTVY2VmtMdU9hdgo1a2k1R2dUbUhFNEYzQmxJRzJPRXlTbUMz ODNYazlzUTI5TG9mMHllaEF1RFRqVW94cUtGeG9xRlMvcGRSSlA2ClV1aHMyb2VpM3M2WnFMNGpM ejFqWFBzckh6K1o0cWYzK1hLWXYwSW1RVTJtKzJBY0V2SndUaXFQRTJsT3VhRzcKUWpOeDlKWlE0 REdKK0VLSCtsaXpBUHFpeG9jTHVoQ3FjcSs1VURxRVRjWUpJK1BHclRvMjZXMG5FR2kvNmJwUQpl TElwOHlxY1lTSFJaLzNDb1Ryc3RtMTJWZUJaZUdLRWxlZEMzQitTMEZYUHFoQ21VUDNLdGlIUk5t OUtTVDQ2CnZVTkZHYzJYeitSZlM1dXJ2ZFhvRjFZd1hVa3hNVHFmTU9LME1ORFBaYjFYSGtSTDIy NzdpR3dBRjlRbklpMWMKRjBUdHoyN3E0OVhORFBxY1B1NXR4WTYxcjNKUEYzcnJFYjNjQWRhUWwx M2QwNU1sblRsKzZhTWVqT1FaSEEragpmWEV2R3NQRGVXN0l1N0kzNWt2cAo9SkdqMwotLS0tLUVO RCBQR1AgU0lHTkFUVVJFLS0tLS0K --===============8252205421141778275==--