From patchwork Mon May 17 21:58:18 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: 4334 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 4FkY0t1bxkz3wbb for ; Mon, 17 May 2021 21:58:22 +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 4FkY0s6Hb8z1h3; Mon, 17 May 2021 21:58:21 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4FkY0s60sKz2yZm; Mon, 17 May 2021 21:58:21 +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 4FkY0r38fZz2xd6 for ; Mon, 17 May 2021 21:58:20 +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 4FkY0q25QNzjb for ; Mon, 17 May 2021 21:58:19 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1621288699; 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=ukh2FnYLBjhM+00JnSxxzZYGGSoSI8ALYGEFXY1siE8=; b=gPwc76qUskh9aBQ+PexQZZWnLAZ1oyrWC1iis8cqceI4xkq4yiy+w7sYtzUWxOdU7+ZDmf jSliwDYq7NULCzCg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1621288699; 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=ukh2FnYLBjhM+00JnSxxzZYGGSoSI8ALYGEFXY1siE8=; b=MUaNlBZQLrUJwqQRmkxNCRmk8ObyuPGcXgCXUS8HbdsymSfAD07/xs2wgTjrlWkvQHkGw+ prAfAcwIRdhlYtf3OPWB4GyIHMnHKr3rX+0opoh9cuh4yGdoVzmBQUq1AvreV6lrtAKy7N yZoGyA6Ns9SNt4l4osroT3FDTPMJ/s/12vGeonG49T+euQLIiebKU8LCgdk2mqcqAv9tsn Gj8qcxdJewd6DOUFnh8QWNNQ/WAfwwoRNMWXwFrsk1w1QU88R8kGCUEz8XpqhuAzBl4AsY 25wmJlNg18kCBSahwE0YVSfnSePlZm0kjQinILOsegqVMS/oGZfm0rq0tHLTXQ== Subject: [PATCH v2 08/11] Drop miniupnpd add-on To: development@lists.ipfire.org References: <52820aff-40b7-1aae-17a8-34c97276fe60@ipfire.org> <44b9848d-7f27-2258-4115-daa395ad9e8c@ipfire.org> <695af3d4-68c4-a1f8-2fd8-4008eb3f9b31@ipfire.org> <35d26ef9-e2d2-95fd-9320-79e056e28202@ipfire.org> <7cf1c835-9ac7-6f5c-5b07-a0ebba6dd93f@ipfire.org> <18f02f8f-10f3-f5fe-87b0-42bcaae6df32@ipfire.org> <5b96e731-5fd7-8b1b-761e-9f33e9531319@ipfire.org> From: =?utf-8?q?Peter_M=C3=BCller?= Message-ID: Date: Mon, 17 May 2021 23:58:18 +0200 MIME-Version: 1.0 In-Reply-To: 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" As discussed in https://wiki.ipfire.org/devel/telco/2021-05-03. Frankly, if you need or use UPnP, you probably do not even need to _think_ about running a firewall... Signed-off-by: Peter Müller --- config/rootfiles/packages/miniupnpd | 6 -- lfs/miniupnpd | 88 ----------------------------- make.sh | 1 - src/initscripts/packages/miniupnpd | 69 ---------------------- 4 files changed, 164 deletions(-) delete mode 100644 config/rootfiles/packages/miniupnpd delete mode 100644 lfs/miniupnpd delete mode 100644 src/initscripts/packages/miniupnpd diff --git a/config/rootfiles/packages/miniupnpd b/config/rootfiles/packages/miniupnpd deleted file mode 100644 index cdad3be61..000000000 --- a/config/rootfiles/packages/miniupnpd +++ /dev/null @@ -1,6 +0,0 @@ -etc/miniupnpd -etc/miniupnpd/miniupnpd.conf -etc/rc.d/init.d/miniupnpd -etc/rc.d/init.d/networking/red.down/10-miniupnpd -etc/rc.d/init.d/networking/red.up/10-miniupnpd -usr/sbin/miniupnpd diff --git a/lfs/miniupnpd b/lfs/miniupnpd deleted file mode 100644 index c09ecab31..000000000 --- a/lfs/miniupnpd +++ /dev/null @@ -1,88 +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.9 - -THISAPP = miniupnpd-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = miniupnpd -PAK_VER = 3 - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 9151502f84f130b0ef1245ac938c33f9 - -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 zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && make -f Makefile.linux \ - CFLAGS="$(CFLAGS) -DIPTABLES_143" LIBS="-lip4tc -lnfnetlink" - cd $(DIR_APP) && install -m 755 miniupnpd /usr/sbin - -mkdir -pv /etc/miniupnpd - cp -vf $(DIR_SRC)/config/miniupnpd/miniupnpd.conf /etc/miniupnpd/miniupnpd.conf - - #install initscripts - $(call INSTALL_INITSCRIPT,miniupnpd) - - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/make.sh b/make.sh index 56c93fb79..09b0d8b6c 100755 --- a/make.sh +++ b/make.sh @@ -1520,7 +1520,6 @@ buildipfire() { lfsmake2 zerofree lfsmake2 minicom lfsmake2 ddrescue - lfsmake2 miniupnpd lfsmake2 client175 lfsmake2 powertop lfsmake2 parted diff --git a/src/initscripts/packages/miniupnpd b/src/initscripts/packages/miniupnpd deleted file mode 100644 index 1fd02a25a..000000000 --- a/src/initscripts/packages/miniupnpd +++ /dev/null @@ -1,69 +0,0 @@ -#!/bin/sh -######################################################################## -# Begin $rc_base/init.d/miniupnpd -# -# Description : Miniupnp daemon -# -# Authors : Michael Tremer -# -######################################################################## - -. /etc/sysconfig/rc -. ${rc_functions} - -if [ ! -e /etc/miniupnpd/id ]; then - uuidgen > /etc/miniupnpd/id -fi - -UUID=$(cat /etc/miniupnpd/id) - -EXT_DEV=$(cat /var/ipfire/red/iface) -EXT_IP4=$(cat /var/ipfire/red/local-ipaddress) - -. /var/ipfire/ethernet/settings - -for i in GREEN_ADDRESS BLUE_ADDRESS; do - [ -n "${!i}" ] && LISTEN_IP="${LISTEN_IP} -a ${!i}" -done - -function flush_iptables() { - # Flush iptables to remove all entries that were left - iptables -F UPNPFW - iptables -t nat -F UPNPFW -} - -case "${1}" in - start) - boot_mesg "Starting miniupnpd..." - - flush_iptables - - loadproc miniupnpd -f /etc/miniupnpd/miniupnpd.conf \ - -i ${EXT_DEV} -o ${EXT_IP4} ${LISTEN_IP} \ - -u ${UUID} - ;; - - stop) - boot_mesg "Stopping miniupnpd..." - killproc miniupnpd - - flush_iptables - ;; - - restart) - ${0} stop - sleep 1 - ${0} start - ;; - - status) - statusproc miniupnpd - ;; - - *) - echo "Usage: ${0} {start|stop|restart|status}" - exit 1 - ;; -esac - -# End $rc_base/init.d/miniupnpd