commit f16ff1ceb44387f9f2c79fec513975b9836cfd08
Author: Jakub Bogusz <[email protected]>
Date: Sun Jul 10 14:16:53 2022 +0200
- updated to 2.3.0
- removed obsolete netfilter patch
miniupnpd-netfilter.patch | 54 -----------------------------------------------
miniupnpd.spec | 22 ++++++++++++-------
2 files changed, 14 insertions(+), 62 deletions(-)
---
diff --git a/miniupnpd.spec b/miniupnpd.spec
index d7b2764..408361c 100644
--- a/miniupnpd.spec
+++ b/miniupnpd.spec
@@ -1,23 +1,26 @@
-# TODO: handle ip*tables_{init,removeall} in PLD init script? (see bundled one)
+# TODO:
+# - handle ip*tables_{init,removeall} in PLD init script? (see bundled one)
+# - switch to nft (--firewall=nftables, BR: libnftnl-devel instead of
iptables-devel)?
Summary: Small UPnP Daemon
Summary(pl.UTF-8): Mały demon UPnP
Name: miniupnpd
-Version: 2.1
-Release: 3
+Version: 2.3.0
+Release: 1
License: BSD
Group: Networking/Daemons
Source0: http://miniupnp.tuxfamily.org/files/%{name}-%{version}.tar.gz
-# Source0-md5: 91d0524bba6a839c05c22c9484ed9d0f
+# Source0-md5: 053a196ac7ba59e275e249d4173d6890
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: libcap-ng-devel
BuildRequires: libmnl-devel >= 1.0.3
BuildRequires: libnetfilter_conntrack-devel >= 1.0.2
BuildRequires: libuuid-devel
BuildRequires: openssl-devel
+BuildRequires: pkgconfig
BuildRequires: rpmbuild(macros) >= 1.228
Requires(post): libuuid
Requires(post): sed >= 4.0
@@ -35,19 +38,22 @@ Mały demon UPnP.
%prep
%setup -q
-%patch0 -p1
%build
+./configure \
+ --firewall=iptables \
+ --ipv6
+
CPPFLAGS="%{rpmcppflags}" \
CFLAGS="%{rpmcflags}" \
LDFLAGS="%{rpmldflags}" \
-%{__make} -f Makefile.linux -j1 \
+%{__make} -j1 \
CC="%{__cc}"
%install
rm -rf $RPM_BUILD_ROOT
-%{__make} -f Makefile.linux install \
+%{__make} install \
DESTDIR=$RPM_BUILD_ROOT \
STRIP=:
diff --git a/miniupnpd-netfilter.patch b/miniupnpd-netfilter.patch
deleted file mode 100644
index 71e6057..0000000
--- a/miniupnpd-netfilter.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- 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/f16ff1ceb44387f9f2c79fec513975b9836cfd08
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
