Drop miniupnpd add-on

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 <peter.mueller@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/packages/miniupnpd b/config/rootfiles/packages/miniupnpd
deleted file mode 100644 (file)
index cdad3be..0000000
--- 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 (file)
index c09ecab..0000000
--- a/lfs/miniupnpd
+++ /dev/null
@@ -1,88 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
-#                                                                             #
-# 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 <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# 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 87e031791aa5eaa38300df531ea6ad19ea965bb4..8b44948d880f6635fd23b53f0e1008c258ef2925 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -1522,7 +1522,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 (file)
index 1fd02a2..0000000
--- 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 <michael.tremer@ipfire.org>
-#
-########################################################################
-
-. /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