From nobody@FreeBSD.org  Thu Aug 23 13:17:31 2012
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3BCC1106566C
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 23 Aug 2012 13:17:31 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 258E48FC08
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 23 Aug 2012 13:17:31 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id q7NDHTwh049118
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 23 Aug 2012 13:17:29 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id q7NDHTev049117;
	Thu, 23 Aug 2012 13:17:29 GMT
	(envelope-from nobody)
Message-Id: <201208231317.q7NDHTev049117@red.freebsd.org>
Date: Thu, 23 Aug 2012 13:17:29 GMT
From: Denis Zaika <i@doct.org.ua>
To: freebsd-gnats-submit@FreeBSD.org
Subject: udpxy on freebsd 9.0 allow only one client for each multicast stream
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: alex.deiter@gmail.com

>Number:         170917
>Category:       ports
>Synopsis:       net/udpxy on freebsd 9.0 allow only one client for each multicast stream
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    ak
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Aug 23 13:20:01 UTC 2012
>Closed-Date:    Sat Sep 15 10:59:40 UTC 2012
>Last-Modified:  Sat Sep 15 10:59:40 UTC 2012
>Originator:     Denis Zaika
>Release:        9.0
>Organization:
TBC Soniko-svyaz
>Environment:
FreeBSD noc 9.0-RELEASE-p3 FreeBSD 9.0-RELEASE-p3 #0: Tue Jul 17 10:47:35 EEST 2012     zaika@noc:/usr/obj/usr/src/sys/gw  amd64
udpxy-1.0.21-2
>Description:
If someone watches any IPTV channel (UDP multicast) via udpxy proxy next client can't watch it.
Udpxy rise error "setup_mcast_listener: bind: Address already in use". On RELENG8 I've never seen such issue.
>How-To-Repeat:
Start to watch any IPTV channel via udpxy on FreeBSD 9.0 and try to watch the same channel from another IP.
>Fix:
In the file netop.c replace a few strings in setup_mcast_listener

from:

rc = setsockopt( sockfd, SOL_SOCKET, SO_REUSEADDR,
                         &ON, sizeof(ON) );

to:

rc = setsockopt( sockfd, SOL_SOCKET, SO_REUSEPORT,
                         &ON, sizeof(ON) );

Patch attached with submission follows:

--- ./netop.c.orig      2011-12-20 22:05:42.000000000 +0200
+++ ./netop.c   2012-08-23 15:22:19.662474379 +0300
@@ -215,10 +215,10 @@
         }
 
 
-        rc = setsockopt( sockfd, SOL_SOCKET, SO_REUSEADDR,
+        rc = setsockopt( sockfd, SOL_SOCKET, SO_REUSEPORT,
                          &ON, sizeof(ON) );
         if( 0 != rc ) {
-            mperror(g_flog, errno, "%s: setsockopt SO_REUSEADDR",
+            mperror(g_flog, errno, "%s: setsockopt SO_REUSEPORT",
                     __func__);
             break;
         }


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Thu Aug 23 13:59:58 UTC 2012 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=170917 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: alex.deiter@gmail.com
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/170917: net/udpxy on freebsd 9.0 allow only one client for each multicast stream
Date: Thu, 23 Aug 2012 13:59:56 UT

 Maintainer of net/udpxy,
 
 Please note that PR ports/170917 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/170917
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

From: Alex Deiter <alex.deiter@gmail.com>
To: bug-followup@FreeBSD.org, i@doct.org.ua
Cc:  
Subject: Re: ports/170917: net/udpxy on freebsd 9.0 allow only one client for
 each multicast stream
Date: Fri, 24 Aug 2012 02:32:20 +0400

 --047d7b670a9dbc833c04c7f66e56
 Content-Type: multipart/alternative; boundary=047d7b670a9dbc833004c7f66e54
 
 --047d7b670a9dbc833004c7f66e54
 Content-Type: text/plain; charset=UTF-8
 
 Patch approved. patch + update up to version 23 attached.
 
 Thank you!
 
 -- 
 Alex Deiter
 
 --047d7b670a9dbc833004c7f66e54
 Content-Type: text/html; charset=UTF-8
 Content-Transfer-Encoding: quoted-printable
 
 <div>Patch approved.=C2=A0patch + update up to version 23 attached.</div><d=
 iv><br></div>Thank you!<br clear=3D"all"><div><br></div>-- <br>Alex Deiter<=
 br>
 
 --047d7b670a9dbc833004c7f66e54--
 --047d7b670a9dbc833c04c7f66e56
 Content-Type: text/plain; charset=US-ASCII; name="udpxy-23.txt"
 Content-Disposition: attachment; filename="udpxy-23.txt"
 Content-Transfer-Encoding: base64
 X-Attachment-Id: f_h68fdrr90
 
 LS0tIHVkcHh5L01ha2VmaWxlLm9yaWcJMjAxMi0wOC0wNyAxODo0MDoyMi4wOTg2NzQyMjggKzA0
 MDAKKysrIHVkcHh5L01ha2VmaWxlCTIwMTItMDgtMDcgMTg6NDc6MzguMTM1NjkwNTQyICswNDAw
 CkBAIC02LDE2ICs2LDE2IEBACiAjCiAKIFBPUlROQU1FPQl1ZHB4eQotUE9SVFZFUlNJT049CTEu
 MC4yMQorUE9SVFZFUlNJT049CTEuMC4yMwogQ0FURUdPUklFUz0JbmV0CiBNQVNURVJfU0lURVM9
 CVNGLyR7UE9SVE5BTUV9LyR7UE9SVE5BTUV9LyR7UkVMRUFTRV9NQVNDT1R9LSR7UE9SVFZFUlNJ
 T046Un0KLURJU1ROQU1FPQkke1BPUlROQU1FfS4ke1BPUlRWRVJTSU9OfS0yLXByb2QKLUVYVFJB
 Q1RfU1VGWD0JLnRnegorRElTVE5BTUU9CSR7UE9SVE5BTUV9LiR7UE9SVFZFUlNJT059LTAtcHJv
 ZAorIyBFWFRSQUNUX1NVRlg9CS50Z3oKIAogTUFJTlRBSU5FUj0JYWxleC5kZWl0ZXJAZ21haWwu
 Y29tCiBDT01NRU5UPQlVRFAtdG8tSFRUUCBtdWx0aWNhc3QgdHJhZmZpYyByZWxheSBkYWVtb24K
 IAotV1JLU1JDPQkJJHtXUktESVJ9LyR7UE9SVE5BTUV9LSR7UE9SVFZFUlNJT059LTIKK1dSS1NS
 Qz0JCSR7V1JLRElSfS8ke1BPUlROQU1FfS0ke1BPUlRWRVJTSU9OfS0wCiBVU0VfUkNfU1VCUj0J
 dWRweHkKIFVTRV9HTUFLRT0JeWVzCiBNQUtFX0pPQlNfU0FGRT0JeWVzCi0tLSB1ZHB4eS9kaXN0
 aW5mby5vcmlnCTIwMTItMDgtMDcgMTg6NDA6MjcuNzczNjcyMzA3ICswNDAwCisrKyB1ZHB4eS9k
 aXN0aW5mbwkyMDEyLTA4LTA3IDE4OjQ0OjAwLjExNTYzODg3NSArMDQwMApAQCAtMSwyICsxLDIg
 QEAKLVNIQTI1NiAodWRweHkuMS4wLjIxLTItcHJvZC50Z3opID0gNjMwYWI5OGM5ZTFjODI0OGJl
 MWIzYTNiMTZlZmVmNDhlNmRhNDM5OTk1ZGJjNzk1NzAwZGUwMjgxMzhmNzZlYgotU0laRSAodWRw
 eHkuMS4wLjIxLTItcHJvZC50Z3opID0gODI5NDcKK1NIQTI1NiAodWRweHkuMS4wLjIzLTAtcHJv
 ZC50YXIuZ3opID0gYjViMzUyM2YyMGM4MmIwMjQ5YWNjZWQzMTdkYWE2NWVjMTc5MWNlZWQ0ZTVm
 OGY1ODJlY2Y3OTA2N2Y0MWExOAorU0laRSAodWRweHkuMS4wLjIzLTAtcHJvZC50YXIuZ3opID0g
 NzkxMzMKLS0tIHVkcHh5L2ZpbGVzL3BhdGNoLW5ldG9wLmMub3JpZwkyMDEyLTA4LTI0IDAyOjI1
 OjUzLjYxNjU1MDg2OCArMDQwMAorKysgdWRweHkvZmlsZXMvcGF0Y2gtbmV0b3AuYwkyMDEyLTA4
 LTI0IDAyOjIwOjU2LjU5NTU1MDY1NyArMDQwMApAQCAtMCwwICsxLDE1IEBACistLS0gbmV0b3Au
 Yy5vcmlnCTIwMTItMDgtMjQgMDI6MTY6NDMuNTEwNTYxNTYwICswNDAwCisrKysgbmV0b3AuYwky
 MDEyLTA4LTI0IDAyOjE5OjA4LjI0MTU2MDU2MiArMDQwMAorQEAgLTIxNCwxMCArMjE0LDEwIEBA
 CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiZm9yIG1jYXN0
 IHNvY2tldCBbJWRdXG4iLCBzb2NrZmQgKSApOworICAgICAgICAgfQorIAorLSAgICAgICAgcmMg
 PSBzZXRzb2Nrb3B0KCBzb2NrZmQsIFNPTF9TT0NLRVQsIFNPX1JFVVNFQUREUiwKKysgICAgICAg
 IHJjID0gc2V0c29ja29wdCggc29ja2ZkLCBTT0xfU09DS0VULCBTT19SRVVTRVBPUlQsCisgICAg
 ICAgICAgICAgICAgICAgICAgICAgICZPTiwgc2l6ZW9mKE9OKSApOworICAgICAgICAgaWYoIDAg
 IT0gcmMgKSB7CistICAgICAgICAgICAgbXBlcnJvcihnX2Zsb2csIGVycm5vLCAiJXM6IHNldHNv
 Y2tvcHQgU09fUkVVU0VBRERSIiwKKysgICAgICAgICAgICBtcGVycm9yKGdfZmxvZywgZXJybm8s
 ICIlczogc2V0c29ja29wdCBTT19SRVVTRVBPUlQiLAorICAgICAgICAgICAgICAgICAgICAgX19m
 dW5jX18pOworICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgfQotLS0gdWRweHkvZmlsZXMv
 dWRweHkuaW4ub3JpZwkyMDEyLTA4LTA3IDE4OjQ5OjI4LjQ5NTcwMDQ3NSArMDQwMAorKysgdWRw
 eHkvZmlsZXMvdWRweHkuaW4JMjAxMi0wOC0wNyAxODo0OTo0Ni4zNDY2OTQxMjcgKzA0MDAKQEAg
 LTQsNyArNCw3IEBACiAjCiAKICMgUFJPVklERTogdWRweHkKLSMgUkVRVUlSRTogTkVUV09SS0lO
 RworIyBSRVFVSVJFOiBEQUVNT04KIAogIyBEZWZpbmUgdGhlc2UgdWRweHlfKiB2YXJpYWJsZXMg
 aW4gb25lIG9mIHRoZXNlIGZpbGVzOgogIwkvZXRjL3JjLmNvbmYK
 --047d7b670a9dbc833c04c7f66e56--
State-Changed-From-To: feedback->open 
State-Changed-By: linimon 
State-Changed-When: Thu Aug 23 22:57:22 UTC 2012 
State-Changed-Why:  
Maintainer approved. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=170917 
Responsible-Changed-From-To: freebsd-ports-bugs->ak 
Responsible-Changed-By: ak 
Responsible-Changed-When: Fri Aug 24 01:56:58 UTC 2012 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=170917 

From: Denis Zaika <i@doct.org.ua>
To: Alex Deiter <alex.deiter@gmail.com>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/170917: net/udpxy on freebsd 9.0 allow only one client
 for each multicast stream
Date: Mon, 27 Aug 2012 18:19:49 +0300

 On 24.08.2012 01:32, Alex Deiter wrote:
 > Patch approved. patch + update up to version 23 attached.
 > 
 
 Thank you, Alex!
 
 I'm not sure, but I've just read that such issue has been solved in release 1.23.
 Changelog cut:
 
 >Build 23 (3-Jul-2012)
 >    (*) HTTP response lines are now separated by CRLF (not just LF), as per RFC2616;
 >    (*) SO_REUSEPORT used (where available) to allow more that one client
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >        to subscribe to the same channel on BSD-derived systems;
 >    (*) optimization patches by Alexey Suhinin integrated (tcp_nodelay, pause_timeout, mstream_type);
 >    (*) sloop.c uses syscall.h & -DUSE_SELECT to alternate between select(2)- and pselect(2)-based
 implementations of server loop
 >    (*) FIXED: idle timeout displayed incorrectly in select(2)-based version;
 >    (*) HTTP response includes 'Server:' clause;
 
 I've examined sources to make certain of that and found the following piece of code:
 
 >#ifdef SO_REUSEPORT
 >        /*  On some systems (such as FreeBSD) SO_REUSEADDR
 >            just isn't enough to subscribe to N same channels for different clients.
 >        */
 >        rc = setsockopt( sockfd, SOL_SOCKET, SO_REUSEPORT,
 >                         &ON, sizeof(ON) );
 >        if( 0 != rc ) {
 >            mperror(g_flog, errno, "%s: setsockopt SO_REUSEPORT",
 >                    __func__);
 >            break;
 >        }
 >#endif /* SO_REUSEPORT */
 
 I've built 1.23 without patch and it works! I think that patch is unneeded with latest version of udpxy.
 
 -- 
 Cheers, Denis Zaika,				ZDS-RIPE
 "Soniko-svyaz" NOC engineer,			ZDS-UANIC
 Donetsk, Ukraine				ZDS-EUNIC
 +380933407844, +380623323232

From: Alex Deiter <alex.deiter@gmail.com>
To: bug-followup@FreeBSD.org, i@doct.org.ua
Cc:  
Subject: Re: ports/170917: net/udpxy on freebsd 9.0 allow only one client for
 each multicast stream
Date: Mon, 27 Aug 2012 19:57:56 +0400

 --047d7b60525c98156104c84163c3
 Content-Type: multipart/alternative; boundary=047d7b60525c98155d04c84163c1
 
 --047d7b60525c98155d04c84163c1
 Content-Type: text/plain; charset=UTF-8
 
 >>I'm not sure, but I've just read that such issue has been solved in
 release 1.23.
 
 You are absolutely right! Thank you!
 
 New patch is attached. Changelog:
 
 Build 23 (3-Jul-2012)
     (*) HTTP response lines are now separated by CRLF (not just LF), as per
 RFC2616;
     (*) SO_REUSEPORT used (where available) to allow more that one client
         to subscribe to the same channel on BSD-derived systems;
     (*) optimization patches by Alexey Suhinin integrated (tcp_nodelay,
 pause_timeout, mstream_typ
 e);
     (*) sloop.c uses syscall.h & -DUSE_SELECT to alternate between
 select(2)- and pselect(2)-based
  implementations of server loop
     (*) FIXED: idle timeout displayed incorrectly in select(2)-based
 version;
     (*) HTTP response includes 'Server:' clause;
 
 
 -- 
 Alex Deiter
 
 --047d7b60525c98155d04c84163c1
 Content-Type: text/html; charset=UTF-8
 Content-Transfer-Encoding: quoted-printable
 
 &gt;&gt;<span style=3D"color:rgb(34,34,34);font-family:arial,sans-serif;fon=
 t-size:13px;background-color:rgb(255,255,255)">I&#39;m not sure, but I&#39;=
 ve just read that such issue has been solved in release 1.23.</span><div><f=
 ont color=3D"#222222" face=3D"arial, sans-serif"><br>
 </font></div><div><font color=3D"#222222" face=3D"arial, sans-serif"><div>Y=
 ou are absolutely right! Thank you!</div><div><br></div><div>New patch is a=
 ttached. Changelog:</div><div><br></div><div><div>Build 23 (3-Jul-2012)</di=
 v>
 <div>=C2=A0 =C2=A0 (*) HTTP response lines are now separated by CRLF (not j=
 ust LF), as per RFC2616;</div><div>=C2=A0 =C2=A0 (*) SO_REUSEPORT used (whe=
 re available) to allow more that one client</div><div>=C2=A0 =C2=A0 =C2=A0 =
 =C2=A0 to subscribe to the same channel on BSD-derived systems;</div>
 <div>=C2=A0 =C2=A0 (*) optimization patches by Alexey Suhinin integrated (t=
 cp_nodelay, pause_timeout, mstream_typ</div><div>e);</div><div>=C2=A0 =C2=
 =A0 (*) sloop.c uses syscall.h &amp; -DUSE_SELECT to alternate between sele=
 ct(2)- and pselect(2)-based</div>
 <div>=C2=A0implementations of server loop</div><div>=C2=A0 =C2=A0 (*) FIXED=
 : idle timeout displayed incorrectly in select(2)-based version;</div><div>=
 =C2=A0 =C2=A0 (*) HTTP response includes &#39;Server:&#39; clause;</div></d=
 iv><div><br></div></font><div>
 <br></div>-- <br>Alex Deiter<br>
 </div>
 
 --047d7b60525c98155d04c84163c1--
 --047d7b60525c98156104c84163c3
 Content-Type: text/plain; charset=US-ASCII; name="udpxy-23.txt"
 Content-Disposition: attachment; filename="udpxy-23.txt"
 Content-Transfer-Encoding: base64
 X-Attachment-Id: f_h6dr3lrh0
 
 LS0tIHVkcHh5L01ha2VmaWxlLm9yaWcJMjAxMi0wOC0wNyAxODo0MDoyMi4wOTg2NzQyMjggKzA0
 MDAKKysrIHVkcHh5L01ha2VmaWxlCTIwMTItMDgtMDcgMTg6NDc6MzguMTM1NjkwNTQyICswNDAw
 CkBAIC02LDE2ICs2LDE2IEBACiAjCiAKIFBPUlROQU1FPQl1ZHB4eQotUE9SVFZFUlNJT049CTEu
 MC4yMQorUE9SVFZFUlNJT049CTEuMC4yMwogQ0FURUdPUklFUz0JbmV0CiBNQVNURVJfU0lURVM9
 CVNGLyR7UE9SVE5BTUV9LyR7UE9SVE5BTUV9LyR7UkVMRUFTRV9NQVNDT1R9LSR7UE9SVFZFUlNJ
 T046Un0KLURJU1ROQU1FPQkke1BPUlROQU1FfS4ke1BPUlRWRVJTSU9OfS0yLXByb2QKLUVYVFJB
 Q1RfU1VGWD0JLnRnegorRElTVE5BTUU9CSR7UE9SVE5BTUV9LiR7UE9SVFZFUlNJT059LTAtcHJv
 ZAorIyBFWFRSQUNUX1NVRlg9CS50Z3oKIAogTUFJTlRBSU5FUj0JYWxleC5kZWl0ZXJAZ21haWwu
 Y29tCiBDT01NRU5UPQlVRFAtdG8tSFRUUCBtdWx0aWNhc3QgdHJhZmZpYyByZWxheSBkYWVtb24K
 IAotV1JLU1JDPQkJJHtXUktESVJ9LyR7UE9SVE5BTUV9LSR7UE9SVFZFUlNJT059LTIKK1dSS1NS
 Qz0JCSR7V1JLRElSfS8ke1BPUlROQU1FfS0ke1BPUlRWRVJTSU9OfS0wCiBVU0VfUkNfU1VCUj0J
 dWRweHkKIFVTRV9HTUFLRT0JeWVzCiBNQUtFX0pPQlNfU0FGRT0JeWVzCi0tLSB1ZHB4eS9kaXN0
 aW5mby5vcmlnCTIwMTItMDgtMDcgMTg6NDA6MjcuNzczNjcyMzA3ICswNDAwCisrKyB1ZHB4eS9k
 aXN0aW5mbwkyMDEyLTA4LTA3IDE4OjQ0OjAwLjExNTYzODg3NSArMDQwMApAQCAtMSwyICsxLDIg
 QEAKLVNIQTI1NiAodWRweHkuMS4wLjIxLTItcHJvZC50Z3opID0gNjMwYWI5OGM5ZTFjODI0OGJl
 MWIzYTNiMTZlZmVmNDhlNmRhNDM5OTk1ZGJjNzk1NzAwZGUwMjgxMzhmNzZlYgotU0laRSAodWRw
 eHkuMS4wLjIxLTItcHJvZC50Z3opID0gODI5NDcKK1NIQTI1NiAodWRweHkuMS4wLjIzLTAtcHJv
 ZC50YXIuZ3opID0gYjViMzUyM2YyMGM4MmIwMjQ5YWNjZWQzMTdkYWE2NWVjMTc5MWNlZWQ0ZTVm
 OGY1ODJlY2Y3OTA2N2Y0MWExOAorU0laRSAodWRweHkuMS4wLjIzLTAtcHJvZC50YXIuZ3opID0g
 NzkxMzMKLS0tIHVkcHh5L2ZpbGVzL3VkcHh5LmluLm9yaWcJMjAxMi0wOC0wNyAxODo0OToyOC40
 OTU3MDA0NzUgKzA0MDAKKysrIHVkcHh5L2ZpbGVzL3VkcHh5LmluCTIwMTItMDgtMDcgMTg6NDk6
 NDYuMzQ2Njk0MTI3ICswNDAwCkBAIC00LDcgKzQsNyBAQAogIwogCiAjIFBST1ZJREU6IHVkcHh5
 Ci0jIFJFUVVJUkU6IE5FVFdPUktJTkcKKyMgUkVRVUlSRTogREFFTU9OCiAKICMgRGVmaW5lIHRo
 ZXNlIHVkcHh5XyogdmFyaWFibGVzIGluIG9uZSBvZiB0aGVzZSBmaWxlczoKICMJL2V0Yy9yYy5j
 b25mCg==
 --047d7b60525c98156104c84163c3--

From: Alex Kozlov <spam@rm-rf.kiev.ua>
To: bug-followup@FreeBSD.org, Alex Deiter <alex.deiter@gmail.com>
Cc:  
Subject: Re: ports/170917: net/udpxy on freebsd 9.0 allow only one client for
 each multicast stream
Date: Wed, 29 Aug 2012 04:59:17 +0300

 --qMm9M+Fa2AknHoGS
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 Hi, Alex
 
 While I'm here, I also want to convert port to new options framework.
 What do you think about next patch?
 
 
 -- 
 Alex
 
 --qMm9M+Fa2AknHoGS
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename="patch.txt"
 
 Index: net/udpxy/distinfo
 @@ -1,2 +1,2 @@
 -SHA256 (udpxy.1.0.21-2-prod.tgz) = 630ab98c9e1c8248be1b3a3b16efef48e6da439995dbc795700de028138f76eb
 -SIZE (udpxy.1.0.21-2-prod.tgz) = 82947
 +SHA256 (udpxy.1.0.23-0-prod.tar.gz) = b5b3523f20c82b0249acced317daa65ec1791ceed4e5f8f582ecf79067f41a18
 +SIZE (udpxy.1.0.23-0-prod.tar.gz) = 79133
 Index: net/udpxy/files/udpxy.in
 @@ -4,7 +4,7 @@
  #
  
  # PROVIDE: udpxy
 -# REQUIRE: NETWORKING
 +# REQUIRE: DAEMON
  
  # Define these udpxy_* variables in one of these files:
  #	/etc/rc.conf
 Index: net/udpxy/Makefile
 @@ -6,24 +6,27 @@
  #
  
  PORTNAME=	udpxy
 -PORTVERSION=	1.0.21
 +PORTVERSION=	1.0.23
  CATEGORIES=	net
  MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${RELEASE_MASCOT}-${PORTVERSION:R}
 -DISTNAME=	${PORTNAME}.${PORTVERSION}-2-prod
 -EXTRACT_SUFX=	.tgz
 +DISTNAME=	${PORTNAME}.${PORTVERSION}-0-prod
  
  MAINTAINER=	alex.deiter@gmail.com
  COMMENT=	UDP-to-HTTP multicast traffic relay daemon
  
 -WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-2
 +WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-0
  USE_RC_SUBR=	udpxy
  USE_GMAKE=	yes
  MAKE_JOBS_SAFE=	yes
  RELEASE_MASCOT=	Chipmunk
 -OPTIONS=	RELEASE "No asserts, no debug symbols, verbose mode on"	on \
 -		LEAN "No asserts, no debug symbols, verbose mode off" off \
 -		DEBUG "Asserts, debug symbols, verbose mode on" off
  
 +OPTIONS_SINGLE=	CONF
 +OPTIONS_SINGLE_CONF=	RELEASE LEAN DEBUG
 +RELEASE_DESC=	No asserts, no debug symbols, verbose on
 +LEAN_DESC=	No asserts, no debug symbols, verbose off
 +DEBUG_DESC=	Asserts, debug symbols, verbose on
 +OPTIONS_DEFAULT=	RELEASE
 +
  PLIST_FILES=	sbin/udpxy \
  		sbin/udpxrec
  
 @@ -31,17 +34,15 @@
  	@${INSTALL_PROGRAM} ${WRKSRC}/udpxy ${PREFIX}/sbin/
  	@${LN} -s udpxy ${PREFIX}/sbin/udpxrec
  
 -.include <bsd.port.pre.mk>
 +.include <bsd.port.options.mk>
  
 -.if defined(WITH_RELEASE) && defined(WITHOUT_LEAN) && defined(WITHOUT_DEBUG)
 +.if ${PORT_OPTIONS:MRELEASE}
  ALL_TARGET=release
 -.elif defined(WITH_LEAN) && defined(WITHOUT_RELEASE) && defined(WITHOUT_DEBUG)
 +.elif ${PORT_OPTIONS:MLEAN}
  ALL_TARGET=lean
 -.elif defined(WITH_DEBUG) && defined(WITHOUT_RELEASE) && defined(WITHOUT_LEAN)
 +.elif ${PORT_OPTIONS:MDEBUG}
  ALL_TARGET=debug
  WITH_DEBUG=yes
 -.else
 -IGNORE=please run 'make config' again and select one build option
  .endif
  
 -.include <bsd.port.post.mk>
 +.include <bsd.port.mk>
 
 --qMm9M+Fa2AknHoGS--

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/170917: commit references a PR
Date: Sat, 15 Sep 2012 09:38:41 +0000 (UTC)

 Author: ak
 Date: Sat Sep 15 09:38:26 2012
 New Revision: 304312
 URL: http://svn.freebsd.org/changeset/ports/304312
 
 Log:
   - Update to 1.0.23 [1]
   - Convert to new options framework
   
   PR:	ports/170917 [1]
   Submitted by:	Denis Zaika <i@doct.org.ua> [1]
 
 Modified:
   head/net/udpxy/Makefile   (contents, props changed)
   head/net/udpxy/distinfo   (contents, props changed)
   head/net/udpxy/files/udpxy.in   (contents, props changed)
 
 Modified: head/net/udpxy/Makefile
 ==============================================================================
 --- head/net/udpxy/Makefile	Sat Sep 15 09:19:35 2012	(r304311)
 +++ head/net/udpxy/Makefile	Sat Sep 15 09:38:26 2012	(r304312)
 @@ -6,23 +6,26 @@
  #
  
  PORTNAME=	udpxy
 -PORTVERSION=	1.0.21
 +PORTVERSION=	1.0.23
  CATEGORIES=	net
  MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${RELEASE_MASCOT}-${PORTVERSION:R}
 -DISTNAME=	${PORTNAME}.${PORTVERSION}-2-prod
 -EXTRACT_SUFX=	.tgz
 +DISTNAME=	${PORTNAME}.${PORTVERSION}-0-prod
  
  MAINTAINER=	alex.deiter@gmail.com
  COMMENT=	UDP-to-HTTP multicast traffic relay daemon
  
 -WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-2
 +WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-0
  USE_RC_SUBR=	udpxy
  USE_GMAKE=	yes
  MAKE_JOBS_SAFE=	yes
  RELEASE_MASCOT=	Chipmunk
 -OPTIONS=	RELEASE "No asserts, no debug symbols, verbose mode on"	on \
 -		LEAN "No asserts, no debug symbols, verbose mode off" off \
 -		DEBUG "Asserts, debug symbols, verbose mode on" off
 +
 +OPTIONS_SINGLE=	CONF
 +OPTIONS_SINGLE_CONF=	RELEASE LEAN DEBUG
 +RELEASE_DESC=	No asserts, no debug symbols, verbose on
 +LEAN_DESC=	No asserts, no debug symbols, verbose off
 +DEBUG_DESC=	Asserts, debug symbols, verbose on
 +OPTIONS_DEFAULT=	RELEASE
  
  PLIST_FILES=	sbin/udpxy \
  		sbin/udpxrec
 @@ -31,17 +34,15 @@ do-install:
  	@${INSTALL_PROGRAM} ${WRKSRC}/udpxy ${PREFIX}/sbin/
  	@${LN} -s udpxy ${PREFIX}/sbin/udpxrec
  
 -.include <bsd.port.pre.mk>
 +.include <bsd.port.options.mk>
  
 -.if defined(WITH_RELEASE) && defined(WITHOUT_LEAN) && defined(WITHOUT_DEBUG)
 +.if ${PORT_OPTIONS:MRELEASE}
  ALL_TARGET=release
 -.elif defined(WITH_LEAN) && defined(WITHOUT_RELEASE) && defined(WITHOUT_DEBUG)
 +.elif ${PORT_OPTIONS:MLEAN}
  ALL_TARGET=lean
 -.elif defined(WITH_DEBUG) && defined(WITHOUT_RELEASE) && defined(WITHOUT_LEAN)
 +.elif ${PORT_OPTIONS:MDEBUG}
  ALL_TARGET=debug
  WITH_DEBUG=yes
 -.else
 -IGNORE=please run 'make config' again and select one build option
  .endif
  
 -.include <bsd.port.post.mk>
 +.include <bsd.port.mk>
 
 Modified: head/net/udpxy/distinfo
 ==============================================================================
 --- head/net/udpxy/distinfo	Sat Sep 15 09:19:35 2012	(r304311)
 +++ head/net/udpxy/distinfo	Sat Sep 15 09:38:26 2012	(r304312)
 @@ -1,2 +1,2 @@
 -SHA256 (udpxy.1.0.21-2-prod.tgz) = 630ab98c9e1c8248be1b3a3b16efef48e6da439995dbc795700de028138f76eb
 -SIZE (udpxy.1.0.21-2-prod.tgz) = 82947
 +SHA256 (udpxy.1.0.23-0-prod.tar.gz) = b5b3523f20c82b0249acced317daa65ec1791ceed4e5f8f582ecf79067f41a18
 +SIZE (udpxy.1.0.23-0-prod.tar.gz) = 79133
 
 Modified: head/net/udpxy/files/udpxy.in
 ==============================================================================
 --- head/net/udpxy/files/udpxy.in	Sat Sep 15 09:19:35 2012	(r304311)
 +++ head/net/udpxy/files/udpxy.in	Sat Sep 15 09:38:26 2012	(r304312)
 @@ -4,7 +4,7 @@
  #
  
  # PROVIDE: udpxy
 -# REQUIRE: NETWORKING
 +# REQUIRE: DAEMON
  
  # Define these udpxy_* variables in one of these files:
  #	/etc/rc.conf
 _______________________________________________
 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"
 
State-Changed-From-To: open->closed 
State-Changed-By: ak 
State-Changed-When: Sat Sep 15 10:59:37 UTC 2012 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=170917 
>Unformatted:
