Attached patch updates miniupnpd to current revision 20140422 and exposes more of its compile-time options in "make config". Fix: Patch attached with submission follows:
State Changed From-To: open->feedback Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Maintainer of net/miniupnpd, Please note that PR ports/189061 has just been submitted. If it contains a patch for an upgrade, an enhancement or a bug fix you agree on, reply to this email stating that you approve the patch and a committer will take care of it. The full text of the PR can be found at: http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/189061 -- Edwin Groothuis via the GNATS Auto Assign Tool edwin@FreeBSD.org
Looks good to me. I approve this commit. -- Tor Halvard Furulund Maintainer of net/miniupnpd
The maintainer has approved the patch; could somebody please commit it?
In the meantime, upstream has been updated to 1.8-20140523. Updated patch attached.
I cant build this in poudriere: =======================<phase: patch >============================ ===> Patching for miniupnpd-1.8.20140523,1 ===> Applying extra patch /usr/ports/net/miniupnpd/files/enable_ipv6.patch =========================================================================== =======================<phase: build-depends >============================ =========================================================================== =======================<phase: lib-depends >============================ =========================================================================== =======================<phase: configure >============================ ===> Configuring for miniupnpd-1.8.20140523,1 =========================================================================== =======================<phase: build >============================ ===> Building for miniupnpd-1.8.20140523,1 make[1]: "/wrkdirs/usr/ports/net/miniupnpd/work/miniupnpd-1.8.20140523/Makefile" line 116: Malformed conditional ($(FWNAME) == "pf") make[1]: Fatal errors encountered -- cannot continue make[1]: stopped in /wrkdirs/usr/ports/net/miniupnpd/work/miniupnpd-1.8.20140523 *** Error code 1 Stop. make: stopped in /usr/ports/net/miniupnpd
This is the upstream Makefile. It's trying to parse /etc/rc.conf to determine what firewall-specific code (pf, ipf, ipfw) to use; it looks like the detection mechanism breaks if either /etc/rc.subr or /etc/rc.conf do not exist -- I'm guessing that's the case in your build environment? Is there a preferred way to determine what firewall to build for? Perhaps it would make sense to just make this a "make config" option?
If this is a compile-time option that probably makes much more sense. Thank you.
I'll look into it. One issue I'm seeing is that there are actually two separate places where firewall detection is performed (independently): Through the FWNAME variable in the Makefile, and also in genconfig.sh. I will talk to the upstream maintainer about getting this cleaned up, but I think for the time being, I will simply fix the Makefile to correctly handle the case where rc.subr and/or rc.conf do not exist.
Created attachment 143983 [details] updated patch Updated the firewall detection logic in the Makefile
A commit references this bug: Author: wg Date: Sat Jun 21 15:52:18 UTC 2014 New revision: 358711 URL: http://svnweb.freebsd.org/changeset/ports/358711 Log: net/miniupnpd: update to 1.8.20140523 - Expose more config options PR: 189061 Submitted by: razzfazz gmail com Approved by: maintainer Changes: head/net/miniupnpd/Makefile head/net/miniupnpd/distinfo head/net/miniupnpd/files/enable_check_portinuse.patch head/net/miniupnpd/files/enable_igdv2.patch head/net/miniupnpd/files/enable_ipv6.patch head/net/miniupnpd/files/enable_leasefile.patch head/net/miniupnpd/files/enable_upnp_strict.patch _U head/net/miniupnpd/files/miniupnpd.in head/net/miniupnpd/files/patch-Makefile