miniupnpd: update to 2.2.1

this update is needed for kernel 5.10.x

todo: verify/update firewall scripts in /etc/miniupnpd

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --git a/config/rootfiles/packages/miniupnpd b/config/rootfiles/packages/miniupnpd
index cdad3be614a5802ff0f7ec55b6b3aa4889cba6a7..5c786bed09baca9caeb2eb5b35b85132129d4c91 100644 (file)
--- a/config/rootfiles/packages/miniupnpd
+++ b/config/rootfiles/packages/miniupnpd
@@ -1,6 +1,12 @@
 etc/miniupnpd
+#etc/miniupnpd/ip6tables_init.sh
+#etc/miniupnpd/ip6tables_removeall.sh
+etc/miniupnpd/iptables_init.sh
+etc/miniupnpd/iptables_removeall.sh
 etc/miniupnpd/miniupnpd.conf
+etc/miniupnpd/miniupnpd_functions.sh
 etc/rc.d/init.d/miniupnpd
+usr/sbin/miniupnpd
+#usr/share/man/man8/miniupnpd.8.gz
 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
index c09ecab31c6e1d7468bb8b09abe67b6638a42304..1c5d7c0091b85235bacd1a4292a743005c0d76d0 100644 (file)
--- a/lfs/miniupnpd
+++ b/lfs/miniupnpd
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2021  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        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.9
+VER        = 2.2.1
 
 THISAPP    = miniupnpd-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = miniupnpd
-PAK_VER    = 3
+PAK_VER    = 4
 
 ###############################################################################
 # Top-level Rules
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 9151502f84f130b0ef1245ac938c33f9
+$(DL_FILE)_MD5 = 666f657af94989c94e36125483c70b84
 
 install : $(TARGET)
 
@@ -75,9 +75,9 @@ $(subst %,%_MD5,$(objects)) :
 $(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
+       cd $(DIR_APP) && ./configure
+       cd $(DIR_APP) && make $(MAKETUNING)
+       cd $(DIR_APP) && make install
        -mkdir -pv /etc/miniupnpd
        cp -vf $(DIR_SRC)/config/miniupnpd/miniupnpd.conf /etc/miniupnpd/miniupnpd.conf