From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Nov 5 16:10:07 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7616B1065676 for ; Thu, 5 Nov 2009 16:10:07 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 4F8038FC2D for ; Thu, 5 Nov 2009 16:10:07 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id nA5GA6uK047126 for ; Thu, 5 Nov 2009 16:10:06 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id nA5GA6GX047125; Thu, 5 Nov 2009 16:10:06 GMT (envelope-from gnats) Resent-Date: Thu, 5 Nov 2009 16:10:06 GMT Resent-Message-Id: <200911051610.nA5GA6GX047125@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Hung-Yi Chen Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8F51C1065672 for ; Thu, 5 Nov 2009 16:04:40 +0000 (UTC) (envelope-from gaod@cse.tw) Received: from cse.tw (cse.tw [140.138.145.237]) by mx1.freebsd.org (Postfix) with ESMTP id 1043D8FC15 for ; Thu, 5 Nov 2009 16:04:39 +0000 (UTC) Received: by cse.tw (Postfix, from userid 125) id 3B22E1E8C26; Thu, 5 Nov 2009 23:30:44 +0800 (CST) Received: by cse.tw (Postfix, from userid 125) id 5E4BC1E8C38; Thu, 5 Nov 2009 21:09:44 +0800 (CST) Received: by cse.tw (Postfix, from userid 125) id C0E3E1E8C26; Thu, 5 Nov 2009 21:11:15 +0800 (CST) Received: from cse.tw (localhost [127.0.0.1]) by cse.tw (Postfix) with ESMTP id 04D171E8C29 for ; Thu, 5 Nov 2009 20:56:09 +0800 (CST) Received: (from root@localhost) by cse.tw (8.14.3/8.14.3/Submit) id nA5Cu8H7010349; Thu, 5 Nov 2009 20:56:08 +0800 (CST) (envelope-from gaod) Message-Id: <200911051256.nA5Cu8H7010349@cse.tw> Date: Thu, 5 Nov 2009 20:56:08 +0800 (CST) From: Hung-Yi Chen To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/140319: [PATCH] net/miniupnpd: update to 1.4 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Hung-Yi Chen List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Nov 2009 16:10:07 -0000 >Number: 140319 >Category: ports >Synopsis: [PATCH] net/miniupnpd: update to 1.4 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Thu Nov 05 16:10:05 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Hung-Yi Chen >Release: FreeBSD 8.0-RC2 i386 >Organization: >Environment: System: FreeBSD cse.tw 8.0-RC2 FreeBSD 8.0-RC2 #2: Wed Oct 28 04:55:35 CST 2009 gaod@cse.tw:/usr/obj/usr/src/sys/CSETW i386 >Description: Update to 1.4. >How-To-Repeat: >Fix: --- miniupnpd.diff begins here --- ===> Generating patch ===> Viewing diff with more diff -ruN --exclude=CVS /usr/ports/net/miniupnpd.orig/Makefile /usr/ports/net/miniupnpd/Makefile --- /usr/ports/net/miniupnpd.orig/Makefile 2009-04-23 17:09:24.000000000 +0800 +++ /usr/ports/net/miniupnpd/Makefile 2009-11-05 20:44:47.000000000 +0800 @@ -6,8 +6,7 @@ # PORTNAME= miniupnpd -PORTVERSION= 1.3 -PORTEPOCH= 1 +PORTVERSION= 1.4 CATEGORIES= net MASTER_SITES= http://miniupnp.tuxfamily.org/files/ \ http://miniupnp.free.fr/files/ diff -ruN --exclude=CVS /usr/ports/net/miniupnpd.orig/distinfo /usr/ports/net/miniupnpd/distinfo --- /usr/ports/net/miniupnpd.orig/distinfo 2009-04-23 17:09:24.000000000 +0800 +++ /usr/ports/net/miniupnpd/distinfo 2009-11-05 20:46:18.000000000 +0800 @@ -1,3 +1,3 @@ -MD5 (miniupnpd-1.3.tar.gz) = b5e70e80dcf45b424b8fe3c966bdc613 -SHA256 (miniupnpd-1.3.tar.gz) = b4585c77ac5a7fb00a687772db95996dd2e8854db9d628c9bb85e5ecfd67f2ff -SIZE (miniupnpd-1.3.tar.gz) = 83464 +MD5 (miniupnpd-1.4.tar.gz) = ffa33d4ed8732c662bdb7d511e86db76 +SHA256 (miniupnpd-1.4.tar.gz) = 85ba7cd28cb9f5ac2c96484325a30c64e385e011f57ead5997568bfde753051b +SIZE (miniupnpd-1.4.tar.gz) = 90071 diff -ruN --exclude=CVS /usr/ports/net/miniupnpd.orig/files/patch-Makefile /usr/ports/net/miniupnpd/files/patch-Makefile --- /usr/ports/net/miniupnpd.orig/files/patch-Makefile 2009-04-23 17:09:24.000000000 +0800 +++ /usr/ports/net/miniupnpd/files/patch-Makefile 2009-11-05 20:49:12.000000000 +0800 @@ -1,5 +1,5 @@ ---- Makefile.orig 2009-01-29 19:21:05.000000000 +0100 -+++ Makefile 2009-04-19 14:27:04.264746884 +0200 +--- Makefile.orig 2009-11-05 20:48:29.000000000 +0800 ++++ Makefile 2009-11-05 20:48:45.000000000 +0800 @@ -25,10 +25,12 @@ # better way to find if we are using ipf or pf @@ -11,5 +11,5 @@ .endif +.endif - # Solaris specific CFLAGS - .if $(OSNAME) == "SunOS" + .if $(OSNAME) == "NetBSD" + FWNAME != . /etc/rc.subr; . /etc/rc.conf; \ diff -ruN --exclude=CVS /usr/ports/net/miniupnpd.orig/files/patch-genconfig.sh /usr/ports/net/miniupnpd/files/patch-genconfig.sh --- /usr/ports/net/miniupnpd.orig/files/patch-genconfig.sh 2009-04-23 17:09:24.000000000 +0800 +++ /usr/ports/net/miniupnpd/files/patch-genconfig.sh 1970-01-01 08:00:00.000000000 +0800 @@ -1,38 +0,0 @@ ---- genconfig.sh.orig 2008-10-01 14:49:26.000000000 +0200 -+++ genconfig.sh 2009-04-19 14:15:37.574904740 +0200 -@@ -70,17 +70,24 @@ - # new way to see which one to use PF or IPF. - # see http://miniupnp.tuxfamily.org/forum/viewtopic.php?p=957 - # source file with handy subroutines like checkyesno -- . /etc/rc.subr -- # source config file so we can probe vars -- . /etc/rc.conf -- if checkyesno ipfilter_enable; then -- echo "Using ipf" -- FW=ipf -- echo "#define USE_IPF 1" >> ${CONFIGFILE} -- elif checkyesno pf_enable; then -- echo "Using pf" -- FW=pf -- echo "#define USE_PF 1" >> ${CONFIGFILE} -+ if [ -f /etc/rc.subr ] && [ -f /etc/rc.conf ]; then -+ # source file with handy subroutines like checkyesno -+ . /etc/rc.subr -+ # source config file so we can probe vars -+ . /etc/rc.conf -+ if checkyesno ipfilter_enable; then -+ echo "Using ipf" -+ FW=ipf -+ echo "#define USE_IPF 1" >> ${CONFIGFILE} -+ elif checkyesno pf_enable; then -+ echo "Using pf" -+ FW=pf -+ echo "#define USE_PF 1" >> ${CONFIGFILE} -+ else -+ echo "Could not detect usage of ipf or pf. Compiling for pf by default" -+ FW=pf -+ echo "#define USE_PF 1" >> ${CONFIGFILE} -+ fi - else - echo "Could not detect usage of ipf or pf. Compiling for pf by default" - FW=pf ===> Done --- miniupnpd.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: