From nobody@FreeBSD.org  Sat Feb  4 16:40:03 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 6D878106564A
	for <freebsd-gnats-submit@FreeBSD.org>; Sat,  4 Feb 2012 16:40:03 +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 5240A8FC12
	for <freebsd-gnats-submit@FreeBSD.org>; Sat,  4 Feb 2012 16:40:03 +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 q14Ge3sp003173
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 4 Feb 2012 16:40:03 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id q14Ge3Gh003172;
	Sat, 4 Feb 2012 16:40:03 GMT
	(envelope-from nobody)
Message-Id: <201202041640.q14Ge3Gh003172@red.freebsd.org>
Date: Sat, 4 Feb 2012 16:40:03 GMT
From: Mark Foster <mark@foster.cc>
To: freebsd-gnats-submit@FreeBSD.org
Subject: patch daap.c for new version of itunes
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         164766
>Category:       ports
>Synopsis:       [MAINTAINER-UPDATE] audio/firefly patch daap.c for new version of itunes
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Feb 04 16:50:16 UTC 2012
>Closed-Date:    Fri Mar 16 20:37:10 UTC 2012
>Last-Modified:  Fri Mar 16 20:37:10 UTC 2012
>Originator:     Mark Foster
>Release:        FreeBSD 8.2-RELEASE-p3 i386
>Organization:
>Environment:
System: FreeBSD dogma.foster.dmz 8.2-RELEASE-p3 FreeBSD 8.2-RELEASE-p3 #0: Tue Sep 27 18:07:27 UTC 2011 root@i386-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC i386


	
>Description:
Patch for out-daap.c to fix compatibility issue with itunes 10.5.2
>How-To-Repeat:
	
>Fix:


Patch attached with submission follows:

Return-Path: <mdf@dogma.foster.dmz>
X-Original-To: mark@foster.cc
Delivered-To: mark@foster.cc
Received: from localhost (localhost [127.0.0.1])
	by mail.foster.cc (Postfix) with ESMTP id D81DF490B2
	for <mark@foster.cc>; Sun, 25 Dec 2011 18:35:40 -0800 (PST)
X-Virus-Scanned: Debian amavisd-new at mail.foster.cc
Received: from mail.foster.cc ([127.0.0.1])
	by localhost (smtp.foster.cc [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id tQqIBJ+2ntKM for <mark@foster.cc>;
	Sun, 25 Dec 2011 18:34:47 -0800 (PST)
Received: from dogma.foster.dmz (c-67-185-137-60.hsd1.wa.comcast.net [67.185.137.60])
	by mail.foster.cc (Postfix) with ESMTPS id 243CC950CE
	for <mark@foster.cc>; Sun, 25 Dec 2011 18:34:46 -0800 (PST)
Received: from dogma.foster.dmz (localhost [127.0.0.1])
	by dogma.foster.dmz (8.14.4/8.14.4) with ESMTP id pBQ2SD3x066285;
	Sun, 25 Dec 2011 18:28:13 -0800 (PST)
	(envelope-from mdf@dogma.foster.dmz)
Received: (from mdf@localhost)
	by dogma.foster.dmz (8.14.4/8.14.4/Submit) id pBQ2SDt6066284;
	Sun, 25 Dec 2011 18:28:13 -0800 (PST)
	(envelope-from mdf)
Date: Sun, 25 Dec 2011 18:28:13 -0800 (PST)
Message-Id: <201112260228.pBQ2SDt6066284@dogma.foster.dmz>
To: FreeBSD-gnats-submit@freebsd.org
Subject: patch daap.c for new version of itunes
From: Mark Foster <mark@foster.cc>
Cc: Mark Foster <mark@foster.cc>
X-send-pr-version: 3.113
X-GNATS-Notify: 


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: scheidell 
State-Changed-When: Sat Feb 4 22:04:38 UTC 2012 
State-Changed-Why:  
Patch got horribly mangled, and the actual port is not identified. is 
this for audio/firefly ? 

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

From: Michael Scheidell <scheidell@FreeBSD.org>
To: <bug-followup@FreeBSD.org>
Cc:  
Subject: Fwd: Re: ports/164766: patch daap.c for new version of itunes
Date: Sat, 4 Feb 2012 18:03:01 -0500

 --------------030800090307080608080104
 Content-Type: text/plain; charset="ISO-8859-1"; format=flowed
 Content-Transfer-Encoding: 7bit
 
 maintainers patch did not make it to GNATS:
 
 -------- Original Message --------
 Subject: 	Re: ports/164766: patch daap.c for new version of itunes
 Date: 	Sat, 4 Feb 2012 14:22:46 -0800
 From: 	Mark Foster <mark@foster.cc>
 To: 	<scheidell@FreeBSD.org>
 CC: 	<freebsd-ports-bugs@FreeBSD.org>
 
 
 
 On 02/04/2012 02:04 PM, scheidell@FreeBSD.org wrote:
 >  Synopsis: patch daap.c for new version of itunes
 >
 >  State-Changed-From-To: open->feedback
 >  State-Changed-By: scheidell
 >  State-Changed-When: Sat Feb 4 22:04:38 UTC 2012
 >  State-Changed-Why:
 >  Patch got horribly mangled, and the actual port is not identified. is
 >  this for audio/firefly ?
 >
 >  http://www.freebsd.org/cgi/query-pr.cgi?pr=164766
 
 New patch attached. Yes for audio/firefly.
 
 -- 
 Mark D. Foster<mark@foster.cc>
 http://mark.foster.cc/
 
 
 
 
 --------------030800090307080608080104
 Content-Type: text/x-patch; name="firefly.patch"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment; filename="firefly.patch"
 
 diff -ruN firefly/Makefile firefly_new/Makefile
 --- firefly/Makefile	2011-09-23 15:20:59.000000000 -0700
 +++ firefly_new/Makefile	2011-12-25 18:19:20.000000000 -0800
 @@ -6,7 +6,7 @@
  
  PORTNAME=	firefly
  PORTVERSION=	1696
 -PORTREVISION=	4
 +PORTREVISION=	5
  CATEGORIES=	audio
  MASTER_SITES=	http://nightlies.fireflymediaserver.org/nightlies/svn-${PORTVERSION}/ \
  		http://www.magnesium.net/~mdf/distfiles/
 diff -ruN firefly/files/patch-out-daap.c firefly_new/files/patch-out-daap.c
 --- firefly/files/patch-out-daap.c	1969-12-31 16:00:00.000000000 -0800
 +++ firefly_new/files/patch-out-daap.c	2011-12-18 20:22:05.000000000 -0800
 @@ -0,0 +1,25 @@
 +@DPATCH@
 +--- src/plugins/out-daap.c   2007-10-13 15:10:06.000000000 -0700
 ++++ src/plugins/out-daap.c.new        2011-10-16 18:08:53.207764000 -0700
 +@@ -1392,11 +1393,9 @@
 +
 +     size = sizeof(servername);
 +     pi_server_name(servername,&size);
 +-    //    supports_update = conf_get_int("daap","supports_update",1);
 ++    supports_update = pi_conf_get_int("daap","supports_update",1);
 +
 +     actual_length=139 + (int) strlen(servername);
 +-    if(!supports_update)
 +-        actual_length -= 9;
 +
 +     if(actual_length > sizeof(server_info)) {
 +         pi_log(E_FATAL,"Server name too long.\n");
 +@@ -1434,6 +1433,8 @@
 +     current += dmap_add_int(current,"msdc",1);          /* 12 */
 +
 +     if(supports_update)
 ++        current += dmap_add_char(current,"msup",1);         /* 9 */
 ++    else
 +         current += dmap_add_char(current,"msup",0);         /* 9 */
 +
 +     out_daap_output_start(pwsc,ppi,actual_length);
 
 
 --------------030800090307080608080104--
Responsible-Changed-From-To: freebsd-ports-bugs->scheidell 
Responsible-Changed-By: scheidell 
Responsible-Changed-When: Sat Feb 4 23:10:09 UTC 2012 
Responsible-Changed-Why:  
New patch received in private email.  I'll take it. 

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

From: Michael Scheidell <scheidell@FreeBSD.org>
To: <bug-followup@FreeBSD.org>, <mark@foster.cc>
Cc:  
Subject: Re: ports/164766: [MAINTAINER-UPDATE] audio/firefly patch daap.c
 for new version of itunes
Date: Sun, 5 Feb 2012 04:58:17 -0500

 --------------020202090705010400090608
 Content-Type: text/plain; charset="ISO-8859-1"; format=flowed
 Content-Transfer-Encoding: 7bit
 
 new patch does not apply cleanly.
 
 ====================<phase 3: make patch>====================
 93     add_pkg
 94     ===> Patching for firefly-1696_7
 95     ===> Applying FreeBSD patches for firefly-1696_7
 96     Ignoring previously applied (or reversed) patch.
 97     2 out of 2 hunks ignored--saving rejects to 
 src/plugins/out-daap.c.rej
 98     => Patch patch-plugins_out-daap.c failed to apply cleanly.
 99     => Patch(es) patch-contrib_Makefile.in patch-mt-daapd.conf.templ 
 patch-out-daap.c applied cleanly.
 100     *** Error code 1
 101
 102     Stop in /a/ports/audio/firefly.
 
 please clean ports, sync from mirror (Makefile you patched against is 
 not the same as in ports)
 do a 'make patch'  and test all patches.
 
 -- 
 Michael Scheidell, CTO
  >*| * SECNAP Network Security Corporation
 d: +1.561.948.2259
 w: http://people.freebsd.org/~scheidell
 
 --------------020202090705010400090608
 Content-Type: text/html; charset="ISO-8859-1"
 Content-Transfer-Encoding: 7bit
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
   <head>
 
     <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
   </head>
   <body bgcolor="#ffffff" text="#000000">
     new patch does not apply cleanly.<br>
     <br>
     ====================&lt;phase 3: make patch&gt;====================<br>
     93 &nbsp;&nbsp;&nbsp; add_pkg<br>
     94 &nbsp;&nbsp;&nbsp; ===&gt; Patching for firefly-1696_7<br>
     95 &nbsp;&nbsp;&nbsp; ===&gt; Applying FreeBSD patches for firefly-1696_7<br>
     96 &nbsp;&nbsp;&nbsp; Ignoring previously applied (or reversed) patch.<br>
     97 &nbsp;&nbsp;&nbsp; 2 out of 2 hunks ignored--saving rejects to
     src/plugins/out-daap.c.rej<br>
     98 &nbsp;&nbsp;&nbsp; =&gt; Patch patch-plugins_out-daap.c failed to apply cleanly.<br>
     99 &nbsp;&nbsp;&nbsp; =&gt; Patch(es) patch-contrib_Makefile.in
     patch-mt-daapd.conf.templ patch-out-daap.c applied cleanly.<br>
     100 &nbsp;&nbsp;&nbsp; *** Error code 1<br>
     101 &nbsp;&nbsp;&nbsp; <br>
     102 &nbsp;&nbsp;&nbsp; Stop in /a/ports/audio/firefly.<br>
     <br>
     please clean ports, sync from mirror (Makefile you patched against
     is not the same as in ports)<br>
     do a 'make patch'&nbsp; and test all patches.<br>
     <br>
     <div class="moz-signature">-- <br>
       Michael Scheidell, CTO<br>
       <font color="#999999">&gt;</font><font color="#cc0000"> <b>| </b></font>
       SECNAP Network Security Corporation<br>
       d: +1.561.948.2259<br>
       w: <a class="moz-txt-link-freetext" href="http://people.freebsd.org/~scheidell">http://people.freebsd.org/~scheidell</a>
     </div>
   </body>
 </html>
 
 --------------020202090705010400090608--
Responsible-Changed-From-To: scheidell->freebsd-ports-bugs 
Responsible-Changed-By: scheidell 
Responsible-Changed-When: Mon Feb 20 11:59:54 UTC 2012 
Responsible-Changed-Why:  
Back to pool 

http://www.freebsd.org/cgi/query-pr.cgi?pr=164766 
State-Changed-From-To: feedback->open 
State-Changed-By: scheidell 
State-Changed-When: Mon Feb 20 12:00:15 UTC 2012 
State-Changed-Why:  
Feedback Timeout 

http://www.freebsd.org/cgi/query-pr.cgi?pr=164766 
State-Changed-From-To: open->closed 
State-Changed-By: scheidell 
State-Changed-When: Fri Mar 16 20:37:09 UTC 2012 
State-Changed-Why:  
Open too long.  Will not compile 

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