From: "Peter Müller" <peter.mueller@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH v2 08/11] Drop miniupnpd add-on
Date: Mon, 17 May 2021 23:58:18 +0200 [thread overview]
Message-ID: <a10a4c91-5c12-c4e9-8812-bf491562b388@ipfire.org> (raw)
In-Reply-To: <c5111e76-9d5c-8017-a165-357cc3bc372b@ipfire.org>
[-- Attachment #1: Type: text/plain, Size: 6711 bytes --]
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(a)ipfire.org>
---
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 <info(a)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 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 <michael.tremer(a)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
--
2.26.2
next prev parent reply other threads:[~2021-05-17 21:58 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-17 21:55 [PATCH v2 00/11] Drop unmaintained or orphaned add-ons and packages, first batch Peter Müller
2021-05-17 21:55 ` [PATCH v2 01/11] Drop motion add-on Peter Müller
2021-05-17 21:56 ` [PATCH v2 02/11] Drop orphaned dependency add-on libmicrohttpd Peter Müller
2021-05-17 21:56 ` [PATCH v2 03/11] Drop Asterisk add-on Peter Müller
2021-05-17 21:56 ` [PATCH v2 04/11] Drop orphaned dependency "libsrtp" Peter Müller
2021-05-17 21:57 ` [PATCH v2 05/11] Zut alors, delete motion initiscript as well :-/ Peter Müller
2021-05-17 21:57 ` [PATCH v2 06/11] Drop SANE add-on Peter Müller
2021-05-17 21:57 ` [PATCH v2 07/11] Drop intltool add-on Peter Müller
2021-05-17 21:58 ` Peter Müller [this message]
2021-05-17 21:58 ` [PATCH v2 09/11] Drop fbset Peter Müller
2021-05-17 21:58 ` [PATCH v2 10/11] Drop sendEmail add-on Peter Müller
2021-05-17 21:59 ` [PATCH v2 11/11] make.sh: Do no longer build fbset and sendEmail Peter Müller
2021-05-20 9:36 ` [PATCH v2 07/11] Drop intltool add-on Michael Tremer
2021-05-20 14:13 ` Peter Müller
2021-05-20 14:14 ` Michael Tremer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a10a4c91-5c12-c4e9-8812-bf491562b388@ipfire.org \
--to=peter.mueller@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox