From patchwork Thu Jan 2 16:29:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 8376 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 "R11" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4YPBxc25szz3x5M for ; Thu, 2 Jan 2025 16:29:40 +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 "E5" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4YPBxV17GCz4cF; Thu, 2 Jan 2025 16:29:34 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4YPBxT5Slvz34Ky; Thu, 2 Jan 2025 16:29:33 +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 "R11" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4YPBxR2HsKz30Z4 for ; Thu, 2 Jan 2025 16:29:31 +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 4YPBxQ67RYz14B; Thu, 2 Jan 2025 16:29:30 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1735835370; 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=QgVG1ua56a5Avj6bDMT3GTPAQi/wyhvMr3bPLSATlAE=; b=Vva7f/GZo5QyVtWRtr7HRbVKot9pi4gTDdwoIhGbphJCVUVQKpzKeOOayC2ykc3m8QWF1V FDYKsa7Ked8c8qBw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1735835370; 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=QgVG1ua56a5Avj6bDMT3GTPAQi/wyhvMr3bPLSATlAE=; b=pZvRaX0Zuw3n7vrFYHIsnrPIX83yRlsuB+0Vx8wrsLqKxjXBCYS3Ssnfw5usHlR1dkRcPB ctALqtPghH+oBHD3dP4B8icV9UGL1CPMFOLrqS5RcAVoEppoKEhnNfwqySySH8cIw0tDTu rhFkVi062b078OdSzpUv5uAe0K58Mhr8i6sH7hKA1UwXs0FjEZLELkNY8E/dYPpYaePe/L MVpP3A19fGcuVLe/ivmx5H/CRqdxDCzCcJRc7xEzvP7g2mW85EiTrCyN/qldOFzxkJX3xM cl5LcD1zp6n2D4szQRxotzwYFYZSY8PklQGMmLytHKGuKOMVyAOooLeUAl1LKg== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 2/2] miniupnpc: revert the addition of this package due to transmission reversion Date: Thu, 2 Jan 2025 17:29:26 +0100 Message-ID: <20250102162926.3561377-2-adolf.belka@ipfire.org> In-Reply-To: <20250102162926.3561377-1-adolf.belka@ipfire.org> References: <20250102162926.3561377-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Message-ID-Hash: UA2K64BOAEW56HXQ6ZM2UYA67UZ7RM7R X-Message-ID-Hash: UA2K64BOAEW56HXQ6ZM2UYA67UZ7RM7R 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: - As transmission has been reverted back to version 4.0.5 then miniupnpc is no longer needed for building or runtime. - This removes the minupnpc lfs and rootfile files. It also removes miniupnpc from the make.sh file. Signed-off-by: Adolf Belka --- config/rootfiles/packages/miniupnpc | 19 ------- lfs/miniupnpc | 87 ----------------------------- make.sh | 1 - 3 files changed, 107 deletions(-) delete mode 100644 config/rootfiles/packages/miniupnpc delete mode 100644 lfs/miniupnpc diff --git a/config/rootfiles/packages/miniupnpc b/config/rootfiles/packages/miniupnpc deleted file mode 100644 index deee07ed4..000000000 --- a/config/rootfiles/packages/miniupnpc +++ /dev/null @@ -1,19 +0,0 @@ -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 deleted file mode 100644 index ae6f0947e..000000000 --- a/lfs/miniupnpc +++ /dev/null @@ -1,87 +0,0 @@ -############################################################################### -# # -# 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 - -SUMMARY = mini uPNP client (needed for transmission) - -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) -PROG = miniupnpc -PAK_VER = 1 - -DEPS = - -############################################################################### -# 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)) - -dist: - @$(PAK) - -############################################################################### -# 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 41bb1ea93..904ff2ede 100755 --- a/make.sh +++ b/make.sh @@ -1987,7 +1987,6 @@ build_system() { lfsmake2 aws-cli lfsmake2 oci-python-sdk lfsmake2 oci-cli - lfsmake2 miniupnpc lfsmake2 transmission lfsmake2 mtr lfsmake2 minidlna