From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 36ba4ebe992fd023f9c86efd8a8d66fa0aa751ad
Date: Fri, 08 Apr 2016 16:58:06 +0100 [thread overview]
Message-ID: <20160408155807.A56231081BA6@git01.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 18079 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via 36ba4ebe992fd023f9c86efd8a8d66fa0aa751ad (commit)
via b395d3289d0008b4fd274346f6cb5b50096b6f71 (commit)
via 45b7ed8519225a084a395c1ec7740646635ee9f8 (commit)
via 33a24fccc2840a48c89e99a388cb3923e7e6b4cd (commit)
from 78d49152a8838474eba0ab103ad7897aa2de7b53 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 36ba4ebe992fd023f9c86efd8a8d66fa0aa751ad
Merge: b395d32 78d4915
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Apr 8 16:16:57 2016 +0100
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
commit b395d3289d0008b4fd274346f6cb5b50096b6f71
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Fri Apr 8 15:18:03 2016 +0200
New package ncat.
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 45b7ed8519225a084a395c1ec7740646635ee9f8
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Fri Apr 8 15:18:02 2016 +0200
Build nmap without ncat.
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 33a24fccc2840a48c89e99a388cb3923e7e6b4cd
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Fri Apr 8 15:18:01 2016 +0200
Remove the nc symlink from netcat package and rename to gnu-netcat (gnu-netcat is no longer our standard netcat)
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/packages/{netcat => gnu-netcat} | 1 -
config/rootfiles/packages/ncat | 5 +++++
config/rootfiles/packages/nmap | 8 ++------
lfs/{netcat => gnu-netcat} | 7 ++++---
lfs/{nmap => ncat} | 24 +++++++++++++-----------
lfs/nmap | 6 +++---
make.sh | 3 ++-
7 files changed, 29 insertions(+), 25 deletions(-)
rename config/rootfiles/packages/{netcat => gnu-netcat} (92%)
create mode 100644 config/rootfiles/packages/ncat
rename lfs/{netcat => gnu-netcat} (96%)
copy lfs/{nmap => ncat} (86%)
Difference in files:
diff --git a/config/rootfiles/packages/gnu-netcat b/config/rootfiles/packages/gnu-netcat
new file mode 100644
index 0000000..f043ed2
--- /dev/null
+++ b/config/rootfiles/packages/gnu-netcat
@@ -0,0 +1,5 @@
+usr/bin/netcat
+#usr/info/netcat.info
+#usr/man/man1/netcat.1
+#usr/share/locale/it/LC_MESSAGES/netcat.mo
+#usr/share/locale/sk/LC_MESSAGES/netcat.mo
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/config/rootfiles/packages/netcat b/config/rootfiles/packages/netcat
deleted file mode 100644
index c236959..0000000
--- a/config/rootfiles/packages/netcat
+++ /dev/null
@@ -1,6 +0,0 @@
-usr/bin/nc
-usr/bin/netcat
-#usr/info/netcat.info
-#usr/man/man1/netcat.1
-#usr/share/locale/it/LC_MESSAGES/netcat.mo
-#usr/share/locale/sk/LC_MESSAGES/netcat.mo
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/gnu-netcat b/lfs/gnu-netcat
new file mode 100644
index 0000000..77ddf5e
--- /dev/null
+++ b/lfs/gnu-netcat
@@ -0,0 +1,85 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2016 IPFire Team <info(a)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 = 0.7.1
+
+THISAPP = netcat-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+PROG = gnu-netcat
+PAK_VER = 1
+
+DEPS = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 088def25efe04dcdd1f8369d8926ab34
+
+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 zxf $(DIR_DL)/$(DL_FILE)
+ 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/lfs/ncat b/lfs/ncat
new file mode 100644
index 0000000..6f1b703
--- /dev/null
+++ b/lfs/ncat
@@ -0,0 +1,86 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2016 IPFire Team <info(a)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 = nmap-$(VER).tar.bz2
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/nmap-$(VER)
+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 = 0764f4dabe7cccda3c49fc3990b62a8a
+
+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/lfs/netcat b/lfs/netcat
deleted file mode 100644
index d07669b..0000000
--- a/lfs/netcat
+++ /dev/null
@@ -1,84 +0,0 @@
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
-# #
-# 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 = 0.7.1
-
-THISAPP = netcat-$(VER)
-DL_FILE = $(THISAPP).tar.gz
-DL_FROM = $(URL_IPFIRE)
-DIR_APP = $(DIR_SRC)/$(THISAPP)
-TARGET = $(DIR_INFO)/$(THISAPP)
-PROG = netcat
-PAK_VER = 1
-
-DEPS = ""
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = 088def25efe04dcdd1f8369d8926ab34
-
-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 zxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && ./configure --prefix=/usr
- cd $(DIR_APP) && make $(MAKETUNING)
- cd $(DIR_APP) && make install
- @rm -rf $(DIR_APP)
- @$(POSTBUILD)
diff --git a/lfs/nmap b/lfs/nmap
index a7870da..5907f5c 100644
--- a/lfs/nmap
+++ b/lfs/nmap
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2015 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2016 IPFire Team <info(a)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 #
@@ -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)
diff --git a/make.sh b/make.sh
index 22ff820..e8def81 100755
--- a/make.sh
+++ b/make.sh
@@ -680,6 +680,8 @@ buildipfire() {
ipfiremake libevent2
ipfiremake portmap
ipfiremake nfs
+ ipfiremake gnu-netcat
+ ipfiremake ncat
ipfiremake nmap
ipfiremake ncftp
ipfiremake etherwake
@@ -751,7 +753,6 @@ buildipfire() {
ipfiremake apcupsd
ipfiremake iperf
ipfiremake iperf3
- ipfiremake netcat
ipfiremake 7zip
ipfiremake lynis
ipfiremake streamripper
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2016-04-08 15:58 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160408155807.A56231081BA6@git01.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox