From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jonatan Schlag To: development@lists.ipfire.org Subject: [PATCH v2 1/3] Remove the nc symlink from netcat package and rename to gnu-netcat (gnu-netcat is no longer our standard netcat) Date: Fri, 08 Apr 2016 15:18:01 +0200 Message-ID: <1460121483-828-2-git-send-email-jonatan.schlag@ipfire.org> In-Reply-To: <1460121483-828-1-git-send-email-jonatan.schlag@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2175864658126596711==" List-Id: --===============2175864658126596711== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Signed-off-by: Jonatan Schlag --- config/rootfiles/packages/gnu-netcat | 5 +++ config/rootfiles/packages/netcat | 6 --- lfs/gnu-netcat | 85 ++++++++++++++++++++++++++++++++++= ++ lfs/netcat | 84 ----------------------------------- make.sh | 2 +- 5 files changed, 91 insertions(+), 91 deletions(-) create mode 100644 config/rootfiles/packages/gnu-netcat delete mode 100644 config/rootfiles/packages/netcat create mode 100644 lfs/gnu-netcat delete mode 100644 lfs/netcat 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/netcat b/config/rootfiles/packages/net= cat 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/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 = # +# = # +# 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 . = # +# = # +############################################################################= ### + +############################################################################= ### +# Definitions +############################################################################= ### + +include Config + +VER =3D 0.7.1 + +THISAPP =3D netcat-$(VER) +DL_FILE =3D $(THISAPP).tar.gz +DL_FROM =3D $(URL_IPFIRE) +DIR_APP =3D $(DIR_SRC)/$(THISAPP) +TARGET =3D $(DIR_INFO)/$(THISAPP) +PROG =3D gnu-netcat +PAK_VER =3D 1 + +DEPS =3D "" + +############################################################################= ### +# Top-level Rules +############################################################################= ### + +objects =3D $(DL_FILE) + +$(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 =3D 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=3D/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/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 . = # -# = # -############################################################################= ### - -############################################################################= ### -# Definitions -############################################################################= ### - -include Config - -VER =3D 0.7.1 - -THISAPP =3D netcat-$(VER) -DL_FILE =3D $(THISAPP).tar.gz -DL_FROM =3D $(URL_IPFIRE) -DIR_APP =3D $(DIR_SRC)/$(THISAPP) -TARGET =3D $(DIR_INFO)/$(THISAPP) -PROG =3D netcat -PAK_VER =3D 1 - -DEPS =3D "" - -############################################################################= ### -# Top-level Rules -############################################################################= ### - -objects =3D $(DL_FILE) - -$(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 =3D 088def25efe04dcdd1f8369d8926ab34 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -dist:=20 - @$(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=3D/usr - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/make.sh b/make.sh index 22ff820..2130e37 100755 --- a/make.sh +++ b/make.sh @@ -680,6 +680,7 @@ buildipfire() { ipfiremake libevent2 ipfiremake portmap ipfiremake nfs + ipfiremake gnu-netcat ipfiremake nmap ipfiremake ncftp ipfiremake etherwake @@ -751,7 +752,6 @@ buildipfire() { ipfiremake apcupsd ipfiremake iperf ipfiremake iperf3 - ipfiremake netcat ipfiremake 7zip ipfiremake lynis ipfiremake streamripper --=20 2.1.4 --===============2175864658126596711==--