From patchwork Tue May 18 21:34:14 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: 4342 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 4Fl8Qf6SRQz3wbh for ; Tue, 18 May 2021 21:34:18 +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 4Fl8Qf3Yd1z11s; Tue, 18 May 2021 21:34:18 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Fl8Qf3X0cz2xb4; Tue, 18 May 2021 21:34:18 +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 4Fl8Qc6vtXz2xLr for ; Tue, 18 May 2021 21:34:16 +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 4Fl8Qc0bbVzpq for ; Tue, 18 May 2021 21:34:15 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1621373656; 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=D7q0RGvFpVj7uR0CLLl5hr6LBznSLQpnw2UQFxXuvVs=; b=odaCeNql/po6ch8JxutLF7gSZfx5vn/GaWD8CJZ1aIatw0TTwpoDWCfH7YDdkHIJPopxmR puF4mV8tA+BAI+CA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1621373656; 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=D7q0RGvFpVj7uR0CLLl5hr6LBznSLQpnw2UQFxXuvVs=; b=IqijRxhmBFw3HKtccsm+rf1qTCkQeRDvAQcOAsSDvKbVQfpjZI3iO9b3fLgt8HcSyGL8uZ 65mDgMc9iuN8L8HXKyAYVERZK6/x9/j/mPIrkYMDLhtUwE1jTzNnlCirmn+r4wN3Vu4XXi ps/zJHRO8un3pbckDLs+M19H7x8JgeSEddPG1tKK//Lk2FT+/EJXLAEP4IvfawhBvoAG3s jzk4FuX6MwtrNf4iYEDWs63AQ2o5WbRx2+zd3BSbXERXGsCGVKQppwXPxZiXUndQjUxxkS fzJ82A8TTfO8MvRir0e8S27PTkffaHhy93REQqfQxIZbSci3yhoCvSUWNgFCHQ== Subject: [PATCH 2/4] Delete the remainings of libupnp and upnpd To: development@lists.ipfire.org References: <61ca95a1-1c7f-00b7-6aad-a00a1e6d58ac@ipfire.org> From: =?utf-8?q?Peter_M=C3=BCller?= Message-ID: Date: Tue, 18 May 2021 23:34:14 +0200 MIME-Version: 1.0 In-Reply-To: <61ca95a1-1c7f-00b7-6aad-a00a1e6d58ac@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" These include rootfiles, firewall menue entries that have been unmaintained for a long time, and firewall chains which were never used in recent time. Signed-off-by: Peter Müller --- config/menu/50-firewall.menu | 8 +-- config/rootfiles/common/armv5tel/initscripts | 1 - config/rootfiles/common/configroot | 2 - config/rootfiles/common/i586/initscripts | 1 - config/rootfiles/common/x86_64/initscripts | 1 - src/initscripts/system/firewall | 6 --- src/initscripts/system/upnpd | 55 -------------------- 7 files changed, 1 insertion(+), 73 deletions(-) delete mode 100644 src/initscripts/system/upnpd diff --git a/config/menu/50-firewall.menu b/config/menu/50-firewall.menu index 7f654785b..6ae9687dc 100644 --- a/config/menu/50-firewall.menu +++ b/config/menu/50-firewall.menu @@ -39,13 +39,7 @@ 'title' => "$Lang::tr{'blue access'}", 'enabled' => 1, }; - $subfirewall->{'80.upnp'} = { - 'caption' => 'UPnP', - 'uri' => '/cgi-bin/upnp.cgi', - 'title' => "Universal Plug and Play", - 'enabled' => 0, - }; - $subfirewall->{'90.iptables'} = { + $subfirewall->{'90.iptables'} = { 'caption' => $Lang::tr{'ipts'}, 'uri' => '/cgi-bin/iptables.cgi', 'title' => "$Lang::tr{'ipts'}", diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts index 800005966..ed32c155d 100644 --- a/config/rootfiles/common/armv5tel/initscripts +++ b/config/rootfiles/common/armv5tel/initscripts @@ -93,7 +93,6 @@ etc/rc.d/init.d/template etc/rc.d/init.d/udev etc/rc.d/init.d/udev_retry etc/rc.d/init.d/unbound -etc/rc.d/init.d/upnpd etc/rc.d/init.d/vnstat etc/rc.d/init.d/waitdrives etc/rc.d/init.d/wlanclient diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot index 8c91ca5d5..d496594bc 100644 --- a/config/rootfiles/common/configroot +++ b/config/rootfiles/common/configroot @@ -184,8 +184,6 @@ var/ipfire/time var/ipfire/updatexlrator var/ipfire/updatexlrator/autocheck var/ipfire/updatexlrator/bin -var/ipfire/upnp -#var/ipfire/upnp/settings var/ipfire/urlfilter #var/ipfire/urlfilter/autoupdate #var/ipfire/urlfilter/bin diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts index 18c5a897a..8511ffa0b 100644 --- a/config/rootfiles/common/i586/initscripts +++ b/config/rootfiles/common/i586/initscripts @@ -92,7 +92,6 @@ etc/rc.d/init.d/template etc/rc.d/init.d/udev etc/rc.d/init.d/udev_retry etc/rc.d/init.d/unbound -etc/rc.d/init.d/upnpd etc/rc.d/init.d/vnstat etc/rc.d/init.d/waitdrives etc/rc.d/init.d/wlanclient diff --git a/config/rootfiles/common/x86_64/initscripts b/config/rootfiles/common/x86_64/initscripts index 18c5a897a..8511ffa0b 100644 --- a/config/rootfiles/common/x86_64/initscripts +++ b/config/rootfiles/common/x86_64/initscripts @@ -92,7 +92,6 @@ etc/rc.d/init.d/template etc/rc.d/init.d/udev etc/rc.d/init.d/udev_retry etc/rc.d/init.d/unbound -etc/rc.d/init.d/upnpd etc/rc.d/init.d/vnstat etc/rc.d/init.d/waitdrives etc/rc.d/init.d/wlanclient diff --git a/src/initscripts/system/firewall b/src/initscripts/system/firewall index 65f1c979b..dd9f1a484 100644 --- a/src/initscripts/system/firewall +++ b/src/initscripts/system/firewall @@ -363,12 +363,6 @@ iptables_init() { -m mark --mark 3 -j SNAT --to-source "${ORANGE_ADDRESS}" fi - # upnp chain for our upnp daemon - iptables -t nat -N UPNPFW - iptables -t nat -A PREROUTING -j UPNPFW - iptables -N UPNPFW - iptables -A FORWARD -m conntrack --ctstate NEW -j UPNPFW - # RED chain, used for the red interface iptables -N REDINPUT iptables -A INPUT -j REDINPUT diff --git a/src/initscripts/system/upnpd b/src/initscripts/system/upnpd deleted file mode 100644 index ca05abf75..000000000 --- a/src/initscripts/system/upnpd +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/sh -######################################################################## -# Begin $rc_base/init.d/ -# -# Description : UPnP Starter -# -# Authors : Michael Tremer -# -# Version : 01.00 -# -# Notes : for www.ipfire.org - GPLv2 -# -######################################################################## - -. /etc/sysconfig/rc -. ${rc_functions} - -# defaults -ALLOW_MULTICAST=no - -# configuration -eval $(/usr/local/bin/readhash /var/ipfire/upnp/settings) - -case "$1" in - start) - boot_mesg "Starting Universal Plug'n'Play daemon..." - loadproc /usr/sbin/upnpd $EXTIFACE $INTIFACE - evaluate_retval - [ "$ALLOW_MULTICAST" != "no" ] && route add -net 239.0.0.0 netmask 255.0.0.0 $INTIFACE - ;; - - stop) - boot_mesg "Stopping Universal Plug'n'Play daemon..." - killproc /usr/sbin/upnpd - evaluate_retval - [ "$ALLOW_MULTICAST" != "no" ] && route del -net 239.0.0.0 netmask 255.0.0.0 $INTIFACE - ;; - - restart) - ${0} stop - sleep 1 - ${0} start - - ;; - status) - statusproc - ;; - - *) - echo "Usage: ${0} {start|stop|reload|restart|status}" - exit 1 - ;; -esac - -# End $rc_base/init.d/