From patchwork Mon May 17 21:56:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Peter_M=C3=BCller?= X-Patchwork-Id: 4328 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 4FkXyP4cxDz3wbb for ; Mon, 17 May 2021 21:56:13 +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 4FkXyP0Hd9z1L0; Mon, 17 May 2021 21:56:13 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4FkXyN6l9Xz2yZm; Mon, 17 May 2021 21:56:12 +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 4FkXyM40z7z2xb4 for ; Mon, 17 May 2021 21:56:11 +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)) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4FkXyL3PYZzjb for ; Mon, 17 May 2021 21:56:10 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1621288570; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=M5jt22KqqFCjDxn8b010V2obSwpRRzqWZpCTxeWXBhc=; b=IrD4hh6drge8oSyJiVRvbmpKjC1zcgTiHflLCmtbFIf7fbU/GVWza/7Cp+qwml5ZEmfde5 O+9vFVH3wb/JfmBw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1621288570; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=M5jt22KqqFCjDxn8b010V2obSwpRRzqWZpCTxeWXBhc=; b=RhB59fu2afyMURpoDP1anV+Jb05BJW7DF7Fhp0OcfOzkUa93/U4KiFlwAn2HYlcK9BNWzl OyMrHrmkMLA69YNjcC6nmnODJD1phaNdXpA3aN/NAGNQ3TJyJKB+rKBHyGzlxhWin34YQc EGOI9KA0a6oWsnTAtrhnPC3md6rrwLJw2t/7+t5Q7KXNemGCMJGT1f6Vyt8UttIvSa8Wei heElaraJ4xPsHFV8ugrvdDEKCxqWwo6rZb25EAEZKvbDvIXLuC3mp+3mh6k0sc14NgV+qM +qvX45jSH7tHzW2OXFRmQys+4QkObxsLThLwuBWDZNsD4qPJolJkMosasYZjOw== Subject: [PATCH v2 02/11] Drop orphaned dependency add-on libmicrohttpd To: development@lists.ipfire.org References: <52820aff-40b7-1aae-17a8-34c97276fe60@ipfire.org> <44b9848d-7f27-2258-4115-daa395ad9e8c@ipfire.org> From: =?utf-8?q?Peter_M=C3=BCller?= Message-ID: <695af3d4-68c4-a1f8-2fd8-4008eb3f9b31@ipfire.org> Date: Mon, 17 May 2021 23:56:09 +0200 MIME-Version: 1.0 In-Reply-To: <44b9848d-7f27-2258-4115-daa395ad9e8c@ipfire.org> Content-Language: en-US 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" This was solely needed by "motion". It can be safely removed now. Signed-off-by: Peter Müller --- config/rootfiles/packages/libmicrohttpd | 6 -- lfs/libmicrohttpd | 96 ------------------------- make.sh | 1 - 3 files changed, 103 deletions(-) delete mode 100644 config/rootfiles/packages/libmicrohttpd delete mode 100644 lfs/libmicrohttpd diff --git a/config/rootfiles/packages/libmicrohttpd b/config/rootfiles/packages/libmicrohttpd deleted file mode 100644 index 62717ed94..000000000 --- a/config/rootfiles/packages/libmicrohttpd +++ /dev/null @@ -1,6 +0,0 @@ -#usr/include/microhttpd.h -#usr/lib/libmicrohttpd.la -#usr/lib/libmicrohttpd.so -usr/lib/libmicrohttpd.so.12 -usr/lib/libmicrohttpd.so.12.58.0 -#usr/lib/pkgconfig/libmicrohttpd.pc diff --git a/lfs/libmicrohttpd b/lfs/libmicrohttpd deleted file mode 100644 index 8c1cecd89..000000000 --- a/lfs/libmicrohttpd +++ /dev/null @@ -1,96 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2020 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 = 0.9.73 - -THISAPP = libmicrohttpd-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = libmicrohttpd -PAK_VER = 3 - -DEPS = - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 2b15949b1633e4fa487e08cdcc97f0e3 - -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 axf $(DIR_DL)/$(DL_FILE) - - cd $(DIR_APP) && ./configure \ - --prefix=/usr \ - --libexecdir=/usr/lib/lighthttpd \ - --enable-static=no \ - --disable-nls \ - --enable-gcc-hardening \ - --enable-linker-hardening \ - --disable-doc \ - --disable-examples \ - --disable-sendfile \ - --enable-https - - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/make.sh b/make.sh index 4cf58dff8..9a5e4dfe4 100755 --- a/make.sh +++ b/make.sh @@ -1512,7 +1512,6 @@ buildipfire() { lfsmake2 perl-DBD-SQLite lfsmake2 perl-File-ReadBackwards lfsmake2 openvmtools - lfsmake2 libmicrohttpd lfsmake2 joe lfsmake2 monit lfsmake2 nut