From patchwork Thu Apr 7 11:04:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 5460 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4KYz7M4QJqz3x1w for ; Thu, 7 Apr 2022 11:05:19 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4KYz7M0LRdz1Yh; Thu, 7 Apr 2022 11:05:19 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4KYz7M0PTHz2ySg; Thu, 7 Apr 2022 11:05:19 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4KYz7K2rWBz2xNf for ; Thu, 7 Apr 2022 11:05:17 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4KYz7K116Gz22; Thu, 7 Apr 2022 11:05:17 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1649329517; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=f2FqhmmxSt3EinxuGbZi2NKLOlHqapvJD1yc7D7XTSE=; b=48l6X5CbJpOh93ybpaKanA7myCv8VOlXJDYvCSrkxWA98vSMwrFXGRNZIMiodDnZ8xSCnR WNQ0INSDXcZzvIAg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1649329517; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=f2FqhmmxSt3EinxuGbZi2NKLOlHqapvJD1yc7D7XTSE=; b=GW1GxgQaC0NqwQWq/xkQJgVJfJNP8w11exrOr8zFDj2Y9INNJo3JM+cw0QljxXGzigOqb5 0pgKvRmMvhBSonm/4c6Z9B2zN+irhF5v+QD4ycf31eyS3I+9DcwgTA6OGzhLV4wCutHujO AVG2DZv82DJcmwayN5mOsisrjmuYsf3tBFoRdmeZQ8oI8ICmG5bBpHYQqgnFweAkUDaJVT pq2mmVJ40yHGJrjSjiDw4npuhnTDXgc4v2d8toyfbNc3qB4UzvmSmmqmoJGijIgTENPlFD sY80Bon0TsAfk55h8cHRrLVJsImzajgsIOJv9tNngVU++6O+pElCTyWkq0Vesg== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 2/6] libdnet: Removal from IPFire Date: Thu, 7 Apr 2022 13:04:45 +0200 Message-Id: <20220407110449.1923450-2-adolf.belka@ipfire.org> In-Reply-To: <20220407110449.1923450-1-adolf.belka@ipfire.org> References: <20220407110449.1923450-1-adolf.belka@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Adolf Belka Acked-by: Michael Tremer --- 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 # -# # -# 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 = 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