commit b5830ac3ffa5c3e6a24a742af817f75b5ec41fc3
Author: Jakub Bogusz <[email protected]>
Date: Sun Apr 28 19:16:06 2019 +0200
- updated to 2.1
- added netfilter patch (fix build with recent netfilter headers, with
NFC_* constants removed)
miniupnpd-netfilter.patch | 54 +++++++++++++++++++++++++++++++++++++++++++++++
miniupnpd.spec | 7 ++++--
2 files changed, 59 insertions(+), 2 deletions(-)
---
diff --git a/miniupnpd.spec b/miniupnpd.spec
index d6cf4ad..bdc3886 100644
--- a/miniupnpd.spec
+++ b/miniupnpd.spec
@@ -2,15 +2,16 @@
Summary: Small UPnP Daemon
Summary(pl.UTF-8): Mały demon UPnP
Name: miniupnpd
-Version: 2.0
+Version: 2.1
Release: 1
License: BSD
Group: Networking/Daemons
Source0: http://miniupnp.tuxfamily.org/files/%{name}-%{version}.tar.gz
-# Source0-md5: 1c07a215dd9b362e75a9efc05e2fb3b4
+# Source0-md5: 91d0524bba6a839c05c22c9484ed9d0f
Source1: %{name}.init
Source2: %{name}.sysconfig
Source3: %{name}.conf
+Patch0: %{name}-netfilter.patch
URL: http://miniupnp.tuxfamily.org/
BuildRequires: iptables-devel >= 1.4.3
BuildRequires: libmnl-devel >= 1.0.3
@@ -34,6 +35,7 @@ Mały demon UPnP.
%prep
%setup -q
+%patch0 -p1
%build
CPPFLAGS="%{rpmcppflags}" \
@@ -94,4 +96,5 @@ fi
%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/%{name}/ip6tables_removeall.sh
%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/%{name}/iptables_init.sh
%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/%{name}/iptables_removeall.sh
+%{_sysconfdir}/%{name}/miniupnpd_functions.sh
%{_mandir}/man8/miniupnpd.8*
diff --git a/miniupnpd-netfilter.patch b/miniupnpd-netfilter.patch
new file mode 100644
index 0000000..71e6057
--- /dev/null
+++ b/miniupnpd-netfilter.patch
@@ -0,0 +1,54 @@
+--- miniupnpd-2.1/netfilter/iptcrdr.c.orig 2016-04-19 23:01:06.000000000
+0200
++++ miniupnpd-2.1/netfilter/iptcrdr.c 2019-04-28 19:05:56.753663560 +0200
+@@ -1116,9 +1116,7 @@
+ } else {
+ match = get_udp_match(eport, 0);
+ }
+- e->nfcache = NFC_IP_DST_PT;
+ target = get_dnat_target(iaddr, iport);
+- e->nfcache |= NFC_UNKNOWN;
+ tmp = realloc(e, sizeof(struct ipt_entry)
+ + match->u.match_size
+ + target->u.target_size);
+@@ -1186,9 +1184,7 @@
+ } else {
+ match = get_udp_match(0, iport);
+ }
+- e->nfcache = NFC_IP_DST_PT;
+ target = get_masquerade_target(eport);
+- e->nfcache |= NFC_UNKNOWN;
+ tmp = realloc(e, sizeof(struct ipt_entry)
+ + match->u.match_size
+ + target->u.target_size);
+@@ -1266,9 +1262,7 @@
+ } else {
+ match = get_udp_match(rport, iport);
+ }
+- e->nfcache = NFC_IP_DST_PT | NFC_IP_SRC_PT;
+ target = get_snat_target(eaddr, eport);
+- e->nfcache |= NFC_UNKNOWN;
+ tmp = realloc(e, sizeof(struct ipt_entry)
+ + match->u.match_size
+ + target->u.target_size);
+@@ -1337,9 +1331,7 @@
+ } else {
+ match = get_udp_match(rport, iport);
+ }
+- e->nfcache = NFC_IP_DST_PT | NFC_IP_SRC_PT;
+ target = get_dscp_target(dscp);
+- e->nfcache |= NFC_UNKNOWN;
+ tmp = realloc(e, sizeof(struct ipt_entry)
+ + match->u.match_size
+ + target->u.target_size);
+@@ -1420,11 +1412,9 @@
+ } else {
+ match = get_udp_match(iport,0);
+ }
+- e->nfcache = NFC_IP_DST_PT;
+ e->ip.dst.s_addr = inet_addr(iaddr);
+ e->ip.dmsk.s_addr = INADDR_NONE;
+ target = get_accept_target();
+- e->nfcache |= NFC_UNKNOWN;
+ tmp = realloc(e, sizeof(struct ipt_entry)
+ + match->u.match_size
+ + target->u.target_size);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/miniupnpd.git/commitdiff/b5830ac3ffa5c3e6a24a742af817f75b5ec41fc3
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
