Hi, this is the next patch series for libvirt. The changes in this series concern Nmap, Netcat and Ncat and I want to explain a little bit what I did and why I did these changes in this way. 1. The nc symlink set the standard netcat. At the moment this is gnu-netcat but this conflicts with libvirt. So we build gnu-netcat without the nc symlink. We could simply drop this package completely and replace it with Ncat but I do not like this because both implementations are not! 100 % compatible. If we drop the (gnu-)netcat package this could cause much trouble for example if users wrote her own script which requires gnu-netcat. I keep the name netcat, but maybe we should change this to gnu-netcat, I do not know and want to hear what your opinion on this :-). 2. Build Nmap without Ncat , because we want to build ncat in a separate package. This is important because the Nmap package is big and if a user only needs ncat, it is senseless to install the whole Nmap package. 3. The new package Ncat is the new standard netcat. The only thing what I want to say is that I had to rename the source package (nmap-7.12) to ncat-7.12. The log files are named like the source packages, I f we used nmap-7.12 for Nmap and ncat and both are built from this package the log file conflict with the log file of the other package.
This should be everything, if something is not clear or not ok just wrote back.
Regards Jonatan
Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org --- config/rootfiles/packages/netcat | 1 - lfs/netcat | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/config/rootfiles/packages/netcat b/config/rootfiles/packages/netcat index c236959..f043ed2 100644 --- a/config/rootfiles/packages/netcat +++ b/config/rootfiles/packages/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/netcat index d07669b..4434f17 100644 --- a/lfs/netcat +++ b/lfs/netcat @@ -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)
Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org --- config/rootfiles/packages/nmap | 8 ++------ lfs/nmap | 4 ++-- 2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/config/rootfiles/packages/nmap b/config/rootfiles/packages/nmap index 3370600..b91f954 100644 --- a/config/rootfiles/packages/nmap +++ b/config/rootfiles/packages/nmap @@ -1,4 +1,3 @@ -usr/bin/ncat usr/bin/ndiff usr/bin/nmap usr/bin/nping @@ -15,7 +14,6 @@ usr/lib/python2.7/site-packages/ndiff.pyc #usr/share/man/hu/man1/nmap.1 #usr/share/man/it/man1/nmap.1 #usr/share/man/ja/man1/nmap.1 -#usr/share/man/man1/ncat.1 #usr/share/man/man1/ndiff.1 #usr/share/man/man1/nmap.1 #usr/share/man/man1/nping.1 @@ -40,8 +38,6 @@ usr/lib/python2.7/site-packages/ndiff.pyc #usr/share/man/zh #usr/share/man/zh/man1 #usr/share/man/zh/man1/nmap.1 -#usr/share/ncat -#usr/share/ncat/ca-bundle.crt #usr/share/nmap usr/share/nmap/nmap-mac-prefixes usr/share/nmap/nmap-os-db @@ -53,7 +49,7 @@ usr/share/nmap/nmap-services usr/share/nmap/nmap.dtd usr/share/nmap/nmap.xsl usr/share/nmap/nse_main.lua -usr/share/nmap/nselib +#usr/share/nmap/nselib usr/share/nmap/nselib/afp.lua usr/share/nmap/nselib/ajp.lua usr/share/nmap/nselib/amqp.lua @@ -71,7 +67,7 @@ usr/share/nmap/nselib/citrixxml.lua usr/share/nmap/nselib/comm.lua usr/share/nmap/nselib/creds.lua usr/share/nmap/nselib/cvs.lua -usr/share/nmap/nselib/data +#usr/share/nmap/nselib/data usr/share/nmap/nselib/data/dns-srv-names usr/share/nmap/nselib/data/drupal-modules.lst usr/share/nmap/nselib/data/favicon-db diff --git a/lfs/nmap b/lfs/nmap index a7870da..fb0edde 100644 --- a/lfs/nmap +++ b/lfs/nmap @@ -54,7 +54,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
md5 : $(subst %,%_MD5,$(objects))
-dist: +dist: @$(PAK)
############################################################################### @@ -77,7 +77,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr --without-nmapfe --without-zenmap + cd $(DIR_APP) && ./configure --prefix=/usr --without-nmapfe --without-zenmap --without-ncat cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_APP) && make install @rm -rf $(DIR_APP)
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
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
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
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.
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.
-
Jonatan Schlag -
Michael Tremer