[2/4] Delete the remainings of libupnp and upnpd
Commit Message
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 <peter.mueller@ipfire.org>
---
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
@@ -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'}",
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
deleted file mode 100644
@@ -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/