From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter =?utf-8?q?M=C3=BCller?= To: development@lists.ipfire.org Subject: [PATCH v2 08/11] Drop miniupnpd add-on Date: Mon, 17 May 2021 23:58:18 +0200 Message-ID: In-Reply-To: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7657923272316423816==" List-Id: --===============7657923272316423816== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=C3=BCller --- 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 =3D 1.9 - -THISAPP =3D miniupnpd-$(VER) -DL_FILE =3D $(THISAPP).tar.gz -DL_FROM =3D $(URL_IPFIRE) -DIR_APP =3D $(DIR_SRC)/$(THISAPP) -TARGET =3D $(DIR_INFO)/$(THISAPP) -PROG =3D miniupnpd -PAK_VER =3D 3 - -############################################################################= ### -# Top-level Rules -############################################################################= ### - -objects =3D $(DL_FILE) - -$(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 =3D 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=3D"$(CFLAGS) -DIPTABLES_143" LIBS=3D"-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/mi= niupnpd 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=3D$(cat /etc/miniupnpd/id) - -EXT_DEV=3D$(cat /var/ipfire/red/iface) -EXT_IP4=3D$(cat /var/ipfire/red/local-ipaddress) - -. /var/ipfire/ethernet/settings - -for i in GREEN_ADDRESS BLUE_ADDRESS; do - [ -n "${!i}" ] && LISTEN_IP=3D"${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 --=20 2.26.2 --===============7657923272316423816==--