[2/6] libdnet: Removal from IPFire

Message ID 20220407110449.1923450-2-adolf.belka@ipfire.org
State Accepted
Commit 03216bd01c57262e1fa753ee4ed86cf050fc2212
Headers
Series [1/6] libart: Removal from IPFire |

Commit Message

Adolf Belka April 7, 2022, 11:04 a.m. UTC
  Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
---
 config/rootfiles/common/libdnet | 26 -----------
 lfs/libdnet                     | 80 ---------------------------------
 make.sh                         |  1 -
 3 files changed, 107 deletions(-)
 delete mode 100644 config/rootfiles/common/libdnet
 delete mode 100644 lfs/libdnet
  

Comments

Michael Tremer April 7, 2022, 3:54 p.m. UTC | #1
Acked-by: Michael Tremer <michael.tremer@ipfire.org>

> On 7 Apr 2022, at 12:04, Adolf Belka <adolf.belka@ipfire.org> wrote:
> 
> Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
> ---
> config/rootfiles/common/libdnet | 26 -----------
> lfs/libdnet                     | 80 ---------------------------------
> make.sh                         |  1 -
> 3 files changed, 107 deletions(-)
> delete mode 100644 config/rootfiles/common/libdnet
> delete mode 100644 lfs/libdnet
> 
> diff --git a/config/rootfiles/common/libdnet b/config/rootfiles/common/libdnet
> deleted file mode 100644
> index 26288de23..000000000
> --- a/config/rootfiles/common/libdnet
> +++ /dev/null
> @@ -1,26 +0,0 @@
> -usr/bin/dnet-config
> -#usr/include/dnet
> -#usr/include/dnet.h
> -#usr/include/dnet/addr.h
> -#usr/include/dnet/arp.h
> -#usr/include/dnet/blob.h
> -#usr/include/dnet/eth.h
> -#usr/include/dnet/fw.h
> -#usr/include/dnet/icmp.h
> -#usr/include/dnet/intf.h
> -#usr/include/dnet/ip.h
> -#usr/include/dnet/ip6.h
> -#usr/include/dnet/os.h
> -#usr/include/dnet/rand.h
> -#usr/include/dnet/route.h
> -#usr/include/dnet/sctp.h
> -#usr/include/dnet/tcp.h
> -#usr/include/dnet/tun.h
> -#usr/include/dnet/udp.h
> -usr/lib/libdnet.la
> -#usr/lib/libdnet.so
> -usr/lib/libdnet.so.1
> -usr/lib/libdnet.so.1.0.1
> -#usr/man/man3/dnet.3
> -#usr/man/man8/dnet.8
> -usr/sbin/dnet
> diff --git a/lfs/libdnet b/lfs/libdnet
> deleted file mode 100644
> index 073685791..000000000
> --- a/lfs/libdnet
> +++ /dev/null
> @@ -1,80 +0,0 @@
> -###############################################################################
> -#                                                                             #
> -# IPFire.org - A linux based firewall                                         #
> -# Copyright (C) 2007-2018  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        = 1.14
> -
> -THISAPP    = libdnet-libdnet-$(VER)
> -DL_FILE    = $(THISAPP).tar.gz
> -DL_FROM    = $(URL_IPFIRE)
> -DIR_APP    = $(DIR_SRC)/$(THISAPP)
> -TARGET     = $(DIR_INFO)/$(THISAPP)
> -
> -###############################################################################
> -# Top-level Rules
> -###############################################################################
> -
> -objects = $(DL_FILE)
> -
> -$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
> -
> -$(DL_FILE)_BLAKE2 = 97e241fc374fc9489e70d440db5e19199f4e653650af85e24af56bbbc0167db1c451349c43fcb630a26c61f8ca15c58f5c879e0d82654e275189ca3e140bb22a
> -
> -install : $(TARGET)
> -
> -check : $(patsubst %,$(DIR_CHK)/%,$(objects))
> -
> -download :$(patsubst %,$(DIR_DL)/%,$(objects))
> -
> -b2 : $(subst %,%_BLAKE2,$(objects))
> -
> -###############################################################################
> -# Downloading, checking, b2sum
> -###############################################################################
> -
> -$(patsubst %,$(DIR_CHK)/%,$(objects)) :
> -	@$(CHECK)
> -
> -$(patsubst %,$(DIR_DL)/%,$(objects)) :
> -	@$(LOAD)
> -
> -$(subst %,%_BLAKE2,$(objects)) :
> -	@$(B2SUM)
> -
> -###############################################################################
> -# Installation Details
> -###############################################################################
> -
> -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
> -	@$(PREBUILD)
> -	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
> -	$(UPDATE_AUTOMAKE)
> -	cd $(DIR_APP) && ./configure \
> -			--prefix=/usr \
> -			--disable-static
> -	cd $(DIR_APP) && make
> -	cd $(DIR_APP) && make install
> -	@rm -rf $(DIR_APP)
> -	@$(POSTBUILD)
> diff --git a/make.sh b/make.sh
> index 21d385d78..207515e56 100755
> --- a/make.sh
> +++ b/make.sh
> @@ -1438,7 +1438,6 @@ buildipfire() {
>   lfsmake2 pango
>   lfsmake2 rrdtool
>   lfsmake2 setup
> -  lfsmake2 libdnet
>   lfsmake2 jansson
>   lfsmake2 yaml
>   lfsmake2 libhtp
> -- 
> 2.35.1
>
  

Patch

diff --git a/config/rootfiles/common/libdnet b/config/rootfiles/common/libdnet
deleted file mode 100644
index 26288de23..000000000
--- a/config/rootfiles/common/libdnet
+++ /dev/null
@@ -1,26 +0,0 @@ 
-usr/bin/dnet-config
-#usr/include/dnet
-#usr/include/dnet.h
-#usr/include/dnet/addr.h
-#usr/include/dnet/arp.h
-#usr/include/dnet/blob.h
-#usr/include/dnet/eth.h
-#usr/include/dnet/fw.h
-#usr/include/dnet/icmp.h
-#usr/include/dnet/intf.h
-#usr/include/dnet/ip.h
-#usr/include/dnet/ip6.h
-#usr/include/dnet/os.h
-#usr/include/dnet/rand.h
-#usr/include/dnet/route.h
-#usr/include/dnet/sctp.h
-#usr/include/dnet/tcp.h
-#usr/include/dnet/tun.h
-#usr/include/dnet/udp.h
-usr/lib/libdnet.la
-#usr/lib/libdnet.so
-usr/lib/libdnet.so.1
-usr/lib/libdnet.so.1.0.1
-#usr/man/man3/dnet.3
-#usr/man/man8/dnet.8
-usr/sbin/dnet
diff --git a/lfs/libdnet b/lfs/libdnet
deleted file mode 100644
index 073685791..000000000
--- a/lfs/libdnet
+++ /dev/null
@@ -1,80 +0,0 @@ 
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  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        = 1.14
-
-THISAPP    = libdnet-libdnet-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_BLAKE2 = 97e241fc374fc9489e70d440db5e19199f4e653650af85e24af56bbbc0167db1c451349c43fcb630a26c61f8ca15c58f5c879e0d82654e275189ca3e140bb22a
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-b2 : $(subst %,%_BLAKE2,$(objects))
-
-###############################################################################
-# Downloading, checking, b2sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
-	@$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
-	@$(LOAD)
-
-$(subst %,%_BLAKE2,$(objects)) :
-	@$(B2SUM)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	$(UPDATE_AUTOMAKE)
-	cd $(DIR_APP) && ./configure \
-			--prefix=/usr \
-			--disable-static
-	cd $(DIR_APP) && make
-	cd $(DIR_APP) && make install
-	@rm -rf $(DIR_APP)
-	@$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 21d385d78..207515e56 100755
--- a/make.sh
+++ b/make.sh
@@ -1438,7 +1438,6 @@  buildipfire() {
   lfsmake2 pango
   lfsmake2 rrdtool
   lfsmake2 setup
-  lfsmake2 libdnet
   lfsmake2 jansson
   lfsmake2 yaml
   lfsmake2 libhtp