summaryrefslogtreecommitdiff
path: root/net/miniupnpd
diff options
context:
space:
mode:
authorIlya Lipnitskiy <ilya.lipnitskiy@gmail.com>2021-02-20 16:02:15 -0800
committerIlya Lipnitskiy <ilya.lipnitskiy@gmail.com>2021-02-20 16:02:15 -0800
commit5d8d4fbbcb5c5de9370711c19bb3510210989a98 (patch)
treed0754921833f413b7eb93fb6bb1b1c8a22fb0498 /net/miniupnpd
parentd651082447b4392399a40ea1ae11d0bce4bfe83a (diff)
treewide: Run refresh on all packages
The crude loop I wrote to come up with this changeset: find -L package/feeds/packages/ -name patches | \ sed 's/patches$/refresh/' | sort | xargs make Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
Diffstat (limited to 'net/miniupnpd')
-rw-r--r--net/miniupnpd/patches/200-remove-default-cflags.patch2
-rw-r--r--net/miniupnpd/patches/300-macos-compat.patch4
-rw-r--r--net/miniupnpd/patches/301-ext_ip_reserved_ignore.patch18
3 files changed, 4 insertions, 20 deletions
diff --git a/net/miniupnpd/patches/200-remove-default-cflags.patch b/net/miniupnpd/patches/200-remove-default-cflags.patch
index 462060450..0a1ba0a23 100644
--- a/net/miniupnpd/patches/200-remove-default-cflags.patch
+++ b/net/miniupnpd/patches/200-remove-default-cflags.patch
@@ -1,6 +1,6 @@
--- a/Makefile.linux
+++ b/Makefile.linux
-@@ -24,16 +24,16 @@
+@@ -25,16 +25,16 @@ CONFIG_OPTIONS ?= $(cat .configure.cache
CONFIG_OPTIONS += --firewall=iptables
#CFLAGS = -O -g -DDEBUG
CFLAGS ?= -Os
diff --git a/net/miniupnpd/patches/300-macos-compat.patch b/net/miniupnpd/patches/300-macos-compat.patch
index ccd5de993..12b5f2488 100644
--- a/net/miniupnpd/patches/300-macos-compat.patch
+++ b/net/miniupnpd/patches/300-macos-compat.patch
@@ -1,6 +1,6 @@
--- a/Makefile.linux
+++ b/Makefile.linux
-@@ -94,13 +94,13 @@ $(info please install uuid-dev package /
+@@ -95,13 +95,13 @@ $(info please install uuid-dev package /
endif # ($(TEST),1)
endif # ($(TARGET_OPENWRT,)
@@ -20,7 +20,7 @@
TESTUPNPDESCGENOBJS = testupnpdescgen.o upnpdescgen.o
-@@ -140,11 +140,11 @@ install: miniupnpd $(SRCDIR)/miniupnpd.8
+@@ -141,11 +141,11 @@ install: miniupnpd $(SRCDIR)/miniupnpd.8
$(INSTALL) $(SRCDIR)/netfilter/ip6tables_init.sh $(DESTDIR)$(ETCINSTALLDIR)
$(INSTALL) $(SRCDIR)/netfilter/ip6tables_removeall.sh $(DESTDIR)$(ETCINSTALLDIR)
$(INSTALL) $(SRCDIR)/netfilter/miniupnpd_functions.sh $(DESTDIR)$(ETCINSTALLDIR)
diff --git a/net/miniupnpd/patches/301-ext_ip_reserved_ignore.patch b/net/miniupnpd/patches/301-ext_ip_reserved_ignore.patch
index 1cd97e336..55551eb30 100644
--- a/net/miniupnpd/patches/301-ext_ip_reserved_ignore.patch
+++ b/net/miniupnpd/patches/301-ext_ip_reserved_ignore.patch
@@ -9,8 +9,6 @@ Date: Sun Jul 5 10:42:52 2020 +0800
Signed-off-by: Chen Minqiang <ptpt52@gmail.com>
-diff --git a/getifaddr.c b/getifaddr.c
-index 7c09064..46cae8c 100644
--- a/getifaddr.c
+++ b/getifaddr.c
@@ -25,6 +25,7 @@
@@ -33,11 +31,9 @@ index 7c09064..46cae8c 100644
for (i = 0; i < sizeof(reserved)/sizeof(reserved[0]); ++i) {
if ((address >> reserved[i].rmask) == (reserved[i].address >> reserved[i].rmask))
return 1;
-diff --git a/miniupnpd.c b/miniupnpd.c
-index e9f9f61..86b4200 100644
--- a/miniupnpd.c
+++ b/miniupnpd.c
-@@ -1225,6 +1225,10 @@ init(int argc, char * * argv, struct runtime_vars * v)
+@@ -1225,6 +1225,10 @@ init(int argc, char * * argv, struct run
case UPNPEXT_IP:
use_ext_ip_addr = ary_options[i].value;
break;
@@ -48,8 +44,6 @@ index e9f9f61..86b4200 100644
case UPNPEXT_PERFORM_STUN:
if(strcmp(ary_options[i].value, "yes") == 0)
SETFLAG(PERFORMSTUNMASK);
-diff --git a/miniupnpd.conf b/miniupnpd.conf
-index 6274f67..c614192 100644
--- a/miniupnpd.conf
+++ b/miniupnpd.conf
@@ -9,6 +9,8 @@
@@ -61,8 +55,6 @@ index 6274f67..c614192 100644
# WAN interface must have public IP address. Otherwise it is behind NAT
# and port forwarding is impossible. In some cases WAN interface can be
# behind unrestricted NAT 1:1 when all incoming traffic is NAT-ed and
-diff --git a/options.c b/options.c
-index 05fa317..3711094 100644
--- a/options.c
+++ b/options.c
@@ -34,6 +34,7 @@ static const struct {
@@ -73,8 +65,6 @@ index 05fa317..3711094 100644
{ UPNPEXT_PERFORM_STUN, "ext_perform_stun" },
{ UPNPEXT_STUN_HOST, "ext_stun_host" },
{ UPNPEXT_STUN_PORT, "ext_stun_port" },
-diff --git a/options.h b/options.h
-index 96cdbbf..34c698f 100644
--- a/options.h
+++ b/options.h
@@ -21,6 +21,7 @@ enum upnpconfigoptions {
@@ -85,8 +75,6 @@ index 96cdbbf..34c698f 100644
UPNPEXT_PERFORM_STUN, /* ext_perform_stun */
UPNPEXT_STUN_HOST, /* ext_stun_host */
UPNPEXT_STUN_PORT, /* ext_stun_port */
-diff --git a/testgetifaddr.c b/testgetifaddr.c
-index 8045b89..b5cdbb4 100644
--- a/testgetifaddr.c
+++ b/testgetifaddr.c
@@ -13,6 +13,8 @@
@@ -98,8 +86,6 @@ index 8045b89..b5cdbb4 100644
#if defined(__sun)
/* solaris 10 does not define LOG_PERROR */
#define LOG_PERROR 0
-diff --git a/testportinuse.c b/testportinuse.c
-index 98574c6..507f830 100644
--- a/testportinuse.c
+++ b/testportinuse.c
@@ -14,6 +14,8 @@
@@ -111,8 +97,6 @@ index 98574c6..507f830 100644
int main(int argc, char * * argv)
{
#ifndef CHECK_PORTINUSE
-diff --git a/upnpglobalvars.h b/upnpglobalvars.h
-index a474353..4f5bbdd 100644
--- a/upnpglobalvars.h
+++ b/upnpglobalvars.h
@@ -84,6 +84,8 @@ extern int runtime_flags;