Remove package miniupnpd.

It is badly maintained and throws a lot of errors.

diff --git a/lfs/miniupnpd b/lfs/miniupnpd
deleted file mode 100644 (file)
index 1d21c3a..0000000
--- a/lfs/miniupnpd
+++ /dev/null
@@ -1,96 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
-#                                                                             #
-# 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
-
-PKG_NAME   = miniupnpd
-PKG_VER    = 20090904
-PKG_REL    = 0
-
-THISAPP    = $(PKG_NAME)-$(PKG_VER)
-DL_FILE    = $(THISAPP).tar.gz
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-
-OBJECT     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
-
-MAINTAINER =
-GROUP      = Networking/Firewall
-CORE       = yes
-EXTRA      = yes
-DEBUG      = no
-BUILD_DEPS =
-DEPS       =
-
-URL        = http://miniupnp.free.fr/
-LICENSE    = Proprietary
-SHORT_DESC = Miniupnpd is a simple upnp daemon.
-
-define LONG_DESC
-       The MiniUPnP project offers software which supports the UPnP Internet \
-       Gateway Device (IGD) specifications.
-endef
-
-CFLAGS    += -DIPTABLES_143
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-download: $(objects)
-
-info:
-       $(DO_PKG_INFO)
-
-install: $(OBJECT)
-
-packages: $(PACKAGES)
-
-$(PACKAGES): $(OBJECT)
-       @$(DO_PACKAGE)
-
-$(objects):
-       @$(LOAD)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(OBJECT): $(objects)
-       @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE)
-
-       cd $(DIR_APP) && cp -vf $(DIR_CONFIG)/$(PKG_NAME)/config.h config.h
-       cd $(DIR_APP) && sed \
-               -e "s@^CFLAGS = .*@CFLAGS = $(CFLAGS) -I$(DIR_SRC)/linux-$(KVER)/include -D_GNU_SOURCE@g" \
-               -i Makefile.linux
-
-       cd $(DIR_APP) && make -f Makefile.linux $(PARALLELISMFLAGS)
-
-       cd $(DIR_APP) && cp -vf $(PKG_NAME) /usr/sbin/
-       cd $(DIR_APP) && $(INSTALL_CONFIG) \
-               < $(DIR_SOURCE)/$(PKG_NAME)/$(PKG_NAME).conf > /etc/$(PKG_NAME).conf
-       @rm -rf $(DIR_APP)
-       @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index 98cce9be1dc571cd664de49001bdf5ab6c789313..d9f962b1c3204c68b9bc3f6d71c7eb99deadae9d 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -395,8 +395,6 @@ misc_build() {
 
        ipfire_make stage4
 
-       #ipfire_make miniupnpd
-
        ### Console tools
        #
        ipfire_make mc

diff --git a/src/miniupnpd/config.h b/src/miniupnpd/config.h
deleted file mode 100644 (file)
index f3c5bc0..0000000
--- a/src/miniupnpd/config.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* MiniUPnP Project
- * http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
- * (c) 2006-2008 Thomas Bernard
- * generated by ./genconfig.sh on Mon Oct 27 16:46:36 GMT 2008 */
-#ifndef __CONFIG_H__
-#define __CONFIG_H__
-
-#define UPNP_VERSION   "20081027"
-#define USE_NETFILTER 1
-#define OS_NAME                "@NAME@"
-#define OS_VERSION     "@NAME@/@VERSION@"
-#define OS_URL         "@URL@"
-
-/* syslog facility to be used by miniupnpd */
-#define LOG_MINIUPNPD           LOG_DAEMON
-
-/* Uncomment the following line to allow miniupnpd to be
- * controlled by miniupnpdctl */
-/*#define USE_MINIUPNPDCTL*/
-
-/* Comment the following line to disable NAT-PMP operations */
-#define ENABLE_NATPMP
-
-/* Uncomment the following line to enable generation of
- * filter rules with pf */
-/*#define PF_ENABLE_FILTER_RULES*/
-
-/* Uncomment the following line to enable caching of results of
- * the getifstats() function */
-/*#define ENABLE_GETIFSTATS_CACHING*/
-/* The cache duration is indicated in seconds */
-#define GETIFSTATS_CACHING_DURATION 2
-
-/* Uncomment the following line to enable multiple external ip support */
-/* note : Thas is EXPERIMENTAL, do not use that unless you know perfectly what you are doing */
-/*#define MULTIPLE_EXTERNAL_IP*/
-
-/* Comment the following line to use home made daemonize() func instead
- * of BSD daemon() */
-#define USE_DAEMON
-
-/* Uncomment the following line to enable lease file support */
-/*#define ENABLE_LEASEFILE*/
-
-/* Define one or none of the two following macros in order to make some
- * clients happy. It will change the XML Root Description of the IGD.
- * Enabling the Layer3Forwarding Service seems to be the more compatible
- * option. */
-/*#define HAS_DUMMY_SERVICE*/
-#define ENABLE_L3F_SERVICE
-
-/* Experimental UPnP Events support. */
-/*#define ENABLE_EVENTS*/
-
-/* include interface name in pf and ipf rules */
-#define USE_IFNAME_IN_RULES
-
-#endif

diff --git a/src/miniupnpd/miniupnpd.conf b/src/miniupnpd/miniupnpd.conf
deleted file mode 100644 (file)
index 48e83a5..0000000
--- a/src/miniupnpd/miniupnpd.conf
+++ /dev/null
@@ -1,99 +0,0 @@
-# WAN network interface
-#ext_ifname=eth0
-ext_ifname=xl1
-# if the WAN interface has several IP addresses, you
-# can specify the one to use below
-#ext_ip=
-
-# LAN network interfaces IPs / networks
-# there can be multiple listening ips for SSDP traffic.
-# should be under the form nnn.nnn.nnn.nnn/nn
-# HTTP is available on all interfaces
-listening_ip=192.168.0.1/24
-listening_ip=192.168.1.1/24
-#listening_ip=
-# port for HTTP (descriptions and SOAP) traffic. set 0 for autoselect.
-port=0
-
-# path to the unix socket used to communicate with MiniSSDPd
-# If running, MiniSSDPd will manage M-SEARCH answering.
-# default is /var/run/minissdpd.sock
-#minissdpdsocket=/var/run/minissdpd.sock
-
-# enable NAT-PMP support (default is no)
-enable_natpmp=yes
-
-# enable UPNP support (default is yes)
-enable_upnp=yes
-
-# chain names for netfilter (not used for pf or ipf).
-# default is MINIUPNPD for both
-#upnp_forward_chain=forwardUPnP
-#upnp_nat_chain=UPnP
-
-# lease file location
-#lease_file=/var/log/upnp.leases
-
-# bitrates reported by daemon in bits per second
-bitrate_up=1000000
-bitrate_down=10000000
-
-# "secure" mode : when enabled, UPnP client are allowed to add mappings only
-# to their IP.
-#secure_mode=yes
-secure_mode=no
-
-# default presentation url is http address on port 80
-#presentation_url=http://www.mylan/index.php
-
-# report system uptime instead of daemon uptime
-system_uptime=yes
-
-# notify interval in seconds. default is 30 seconds.
-#notify_interval=240
-notify_interval=60
-
-# unused rules cleaning.
-# never remove any rule before this threshold for the number
-# of redirections is exceeded. default to 20
-#clean_ruleset_threshold=10
-# clean process work interval in seconds. default to 0 (disabled).
-# a 600 seconds (10 minutes) interval makes sense
-clean_ruleset_interval=600
-
-# log packets in pf
-#packet_log=no
-
-# ALTQ queue in pf
-# filter rules must be used for this to be used.
-# compile with PF_ENABLE_FILTER_RULES (see config.h file)
-#queue=queue_name1
-
-# tag name in pf
-#tag=tag_name1
-
-# make filter rules in pf quick or not. default is yes
-# active when compiled with PF_ENABLE_FILTER_RULES (see config.h file)
-#quickrules=no
-
-# uuid : generate your own with "make genuuid"
-uuid=
-
-# serial and model number the daemon will report to clients
-# in its XML description
-serial=12345678
-model_number=1
-
-# UPnP permission rules
-# (allow|deny) (external port range) ip/mask (internal port range)
-# A port range is <min port>-<max port> or <port> if there is only
-# one port in the range.
-# ip/mask format must be nn.nn.nn.nn/nn
-# it is advised to only allow redirection of port above 1024
-# and to finish the rule set with "deny 0-65535 0.0.0.0/0 0-65535"
-allow 1024-65535 192.168.0.0/24 1024-65535
-allow 1024-65535 192.168.1.0/24 1024-65535
-allow 1024-65535 192.168.0.0/23 22
-allow 12345 192.168.7.113/32 54321
-deny 0-65535 0.0.0.0/0 0-65535
-

diff --git a/src/rootfiles/extras/miniupnpd b/src/rootfiles/extras/miniupnpd
deleted file mode 100644 (file)
index 235e955..0000000
--- a/src/rootfiles/extras/miniupnpd
+++ /dev/null
@@ -1,2 +0,0 @@
-etc/miniupnpd.conf
-usr/sbin/miniupnpd