Bug 184726 - Makefile error in net/miniupnpd port for PF patch
Summary: Makefile error in net/miniupnpd port for PF patch
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: John Marino
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-12-12 16:40 UTC by kraduk
Modified: 2014-01-26 14:00 UTC (History)
0 users

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description kraduk 2013-12-12 16:40:00 UTC
pf filter patch not applying due to an error in the port makefile

Fix: 

apply this patch to the Makefile and the ports pf patch actually gets applied

# diff Makefile Makefile.new 
31c31
< .if ${PORT_OPTIONS:MWITH_PF_ENABLE_FILTER_RULES}
---
> .if ${PORT_OPTIONS:MPF_ENABLE_FILTER_RULES}
How-To-Repeat: build the port see it doesnt insert pf rules at the anchor. rdr rules are ok but the pfctl -sr -a miniupnpd rules dont get added
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-12-15 18:24:56 UTC
Class Changed
From-To: maintainer-update->change-request

Fix category (submitter is not maintainer) (via the GNATS Auto Assign 
Tool)
Comment 2 Edwin Groothuis freebsd_committer freebsd_triage 2013-12-15 18:24:57 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 3 Edwin Groothuis freebsd_committer freebsd_triage 2013-12-15 18:24:57 UTC
Maintainer of net/miniupnpd,

Please note that PR ports/184726 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/184726

-- 
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
Comment 4 diizzyy 2013-12-31 13:39:10 UTC
Despite this fix it doesn't seem to work on -HEAD (CURRENT), can anyone
confirm?

FreeBSD 11.0-CURRENT #0: Fri Dec 20 22:05:21 CET 2013 (AMD64)
r259514
Comment 5 Tor Halvard Furulund 2014-01-02 16:00:30 UTC
Hi,

I, as maintainer of miniupnpd, approve and recommend this patch.
Sorry for the delayed answer.

-- 
Tor Halvard Furulund
Comment 6 kraduk 2014-01-03 14:24:43 UTC
I definitely works on 9-stabe and 10-stable, i will test in the next 24
hours unless someone beats me to it

check the  genconfig.sh if line 302 looks like the below the patch was
applied
and its some other issue
echo "#define PF_ENABLE_FILTER_RULES">> ${CONFIGFILE}

If it didnt apply did you check the pf enable in "make config" dialog box?


On 31 December 2013 13:39, Daniel Engberg <diizzyy@gmail.com> wrote:

> Despite this fix it doesn't seem to work on -HEAD (CURRENT), can anyone
> confirm?
>
> FreeBSD 11.0-CURRENT #0: Fri Dec 20 22:05:21 CET 2013 (AMD64)
> r259514
>
>
>
Comment 7 John Marino freebsd_committer freebsd_triage 2014-01-19 15:24:38 UTC
State Changed
From-To: feedback->open

Maintainer has approved.
Comment 8 John Marino freebsd_committer freebsd_triage 2014-01-26 13:31:40 UTC
Responsible Changed
From-To: freebsd-ports-bugs->marino

I'll take it.
Comment 9 dfilter service freebsd_committer freebsd_triage 2014-01-26 13:56:46 UTC
Author: marino
Date: Sun Jan 26 13:56:39 2014
New Revision: 341174
URL: http://svnweb.freebsd.org/changeset/ports/341174
QAT: https://qat.redports.org/buildarchive/r341174/

Log:
  net/miniupnpd: Fix PF rules issue, support stage
  
  PR:		ports/184726
  Submitted by:	Chris Scott
  Approved by:	maintainer (Tor Halvard Furulund)
  Stage support:	marino@

Modified:
  head/net/miniupnpd/Makefile

Modified: head/net/miniupnpd/Makefile
==============================================================================
--- head/net/miniupnpd/Makefile	Sun Jan 26 13:48:06 2014	(r341173)
+++ head/net/miniupnpd/Makefile	Sun Jan 26 13:56:39 2014	(r341174)
@@ -9,26 +9,24 @@ MASTER_SITES=	http://miniupnp.tuxfamily.
 		http://miniupnp.free.fr/files/
 
 MAINTAINER=	squat@squat.no
-COMMENT=	A UPnP IGD implementation which uses pf/ipf
+COMMENT=	UPnP IGD implementation which uses pf/ipf
 
 SUB_FILES=	miniupnpd.conf.sample
 SUB_LIST=	UUID=${UUID}
 
 UUID!=		uuidgen
 FWNAME?=	pf
-PLIST_FILES=	etc/miniupnpd.conf.sample sbin/miniupnpd
+PLIST_FILES=	etc/miniupnpd.conf.sample sbin/miniupnpd \
+		man/man8/miniupnpd.8.gz
 MAKE_JOBS_UNSAFE=yes
 
-MAN8=		miniupnpd.8
-
 USE_RC_SUBR=	miniupnpd
 
 OPTIONS_DEFINE=	PF_ENABLE_FILTER_RULES
 PF_ENABLE_FILTER_RULES_DESC=	Enable pf generation of filter rules
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
-.if ${PORT_OPTIONS:MWITH_PF_ENABLE_FILTER_RULES}
+.if ${PORT_OPTIONS:MPF_ENABLE_FILTER_RULES}
 EXTRA_PATCHES=	${PATCHDIR}/pf_enable_filter_rules.patch
 .endif
 
@@ -37,9 +35,10 @@ post-patch-script:
 		${WRKSRC}/Makefile
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/miniupnpd ${PREFIX}/sbin
-	@${INSTALL_DATA} ${WRKDIR}/miniupnpd.conf.sample ${PREFIX}/etc/miniupnpd.conf.sample
-	@${INSTALL_MAN} ${WRKSRC}/miniupnpd.8 ${MAN8PREFIX}/man/man8/miniupnpd.8
-	@${CAT} ${PKGMESSAGE}
+	@${INSTALL_PROGRAM} ${WRKSRC}/miniupnpd ${STAGEDIR}${PREFIX}/sbin
+	@${INSTALL_DATA} ${WRKDIR}/miniupnpd.conf.sample \
+		${STAGEDIR}${PREFIX}/etc/miniupnpd.conf.sample
+	@${INSTALL_MAN} ${WRKSRC}/miniupnpd.8 \
+		${STAGEDIR}${MAN8PREFIX}/man/man8/miniupnpd.8
 
 .include <bsd.port.mk>
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 10 John Marino freebsd_committer freebsd_triage 2014-01-26 13:59:27 UTC
State Changed
From-To: open->closed

Committed, with minor changes. Thanks!