From patchwork Tue Sep 24 09:43:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 8154 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 (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R10" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4XCZfm3LSwz3x1v for ; Tue, 24 Sep 2024 09:43:12 +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 RSA-PSS (4096 bits) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "E6" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4XCZfh4Qc9z6xB; Tue, 24 Sep 2024 09:43:08 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4XCZfh1xFTz34Lc; Tue, 24 Sep 2024 09:43:08 +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 (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R10" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4XCZff2Vb7z33Lc for ; Tue, 24 Sep 2024 09:43:06 +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 RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4XCZfd6RNYz1lq; Tue, 24 Sep 2024 09:43:05 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1727170986; 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=A8bdH1f1Hgk0DsNR+sVRnqMue/duTfOPNE1Htqu5f3E=; b=UdXUHOFisdc/sirkHngso/r608V6pSZslvJjyC75t0If1i5h4T6l78ikqg03+VwE8fe9/u pmN87ZJqz3S9sdCw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1727170986; 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=A8bdH1f1Hgk0DsNR+sVRnqMue/duTfOPNE1Htqu5f3E=; b=vMk4KZ9Vho7WxObvvnCJXOMNYM8tvyOe5aVUPlYLYR9RFhOEFqDATBCte5duTYy57tnKRl nBzprGOuWGqTUIcPiNDhy5ggB6PFGhih6bVFyEUQupCJxc/GtCazUWaNFfezhtgBLUEDRW tk1J9iSURaMQkr1OxIKg1UCHKEPuMpUSRZEt6n5L8dibbFc/Nmux44aPRbnRqdKXuEGNju maEU8JPR1fvDV6mcGZnnBRdeQ4qcowVp9rXb4RuuxwfxK77mFhe+3y2jB/8J0AeSDzOndy cHu5sBZ9ESYAaJ5TPrMjBk1dkhWbGsy5BM3f8/5ftgPXjywnvFA2eQE8vnZYDg== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 2/2] miniupnpc: Required for build of transmission to replace bundled version Date: Tue, 24 Sep 2024 11:43:01 +0200 Message-ID: <20240924094301.2130-2-adolf.belka@ipfire.org> In-Reply-To: <20240924094301.2130-1-adolf.belka@ipfire.org> References: <20240924094301.2130-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Message-ID-Hash: RH6FU77KLKOROPDSBLOZLGCS3KJUGMGN X-Message-ID-Hash: RH6FU77KLKOROPDSBLOZLGCS3KJUGMGN X-MailFrom: adolf.belka@ipfire.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: IPFire development talk Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: - miniupnpc is required for the build of transmiossion but the bundled version was not working properly with version 4.0.6 and we prefer to not use bundled versions. - Only used for the build so rootfile is 100% commented out. No miniupnpc installed on IPFire. Signed-off-by: Adolf Belka --- config/rootfiles/common/miniupnpc | 19 ++++++++ lfs/miniupnpc | 77 +++++++++++++++++++++++++++++++ make.sh | 1 + 3 files changed, 97 insertions(+) create mode 100644 config/rootfiles/common/miniupnpc create mode 100644 lfs/miniupnpc diff --git a/config/rootfiles/common/miniupnpc b/config/rootfiles/common/miniupnpc new file mode 100644 index 000000000..616ea6131 --- /dev/null +++ b/config/rootfiles/common/miniupnpc @@ -0,0 +1,19 @@ +#usr/bin/external-ip +#usr/bin/upnp-listdevices +#usr/bin/upnpc +#usr/include/miniupnpc +#usr/include/miniupnpc/igd_desc_parse.h +#usr/include/miniupnpc/miniupnpc.h +#usr/include/miniupnpc/miniupnpc_declspec.h +#usr/include/miniupnpc/miniupnpctypes.h +#usr/include/miniupnpc/miniwget.h +#usr/include/miniupnpc/portlistingparse.h +#usr/include/miniupnpc/upnpcommands.h +#usr/include/miniupnpc/upnpdev.h +#usr/include/miniupnpc/upnperrors.h +#usr/include/miniupnpc/upnpreplyparse.h +#usr/lib/libminiupnpc.a +#usr/lib/libminiupnpc.so +#usr/lib/libminiupnpc.so.18 +#usr/lib/pkgconfig/miniupnpc.pc +#usr/share/man/man3/miniupnpc.3.gz diff --git a/lfs/miniupnpc b/lfs/miniupnpc new file mode 100644 index 000000000..7907bb5b9 --- /dev/null +++ b/lfs/miniupnpc @@ -0,0 +1,77 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2024 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 = 2.2.8 + +THISAPP = miniupnpc-$(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 = eae4d97bdf8c494ea6744edfeb870f9d92df8468d23f974e0e44e735fc7c8925189ea58f60a71c37315aebff1269ae69e9413cdf80dc292c4b90df5f12bf58a4 + +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 axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && make + cd $(DIR_APP) && python3 setup.py build + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 42970b0c1..5199ca7c1 100755 --- a/make.sh +++ b/make.sh @@ -1984,6 +1984,7 @@ build_system() { lfsmake2 aws-cli lfsmake2 oci-python-sdk lfsmake2 oci-cli + lfsmake2 miniupnpc lfsmake2 transmission lfsmake2 mtr lfsmake2 minidlna