From swills@mouf.net  Tue Sep 24 02:03:13 2013
Return-Path: <swills@mouf.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTP id A53EFD94
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 24 Sep 2013 02:03:13 +0000 (UTC)
	(envelope-from swills@mouf.net)
Received: from mouf.net (mouf.net [IPv6:2607:fc50:0:4400:216:3eff:fe69:33b3])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id 50CB3281E
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 24 Sep 2013 02:03:13 +0000 (UTC)
Received: from meatwad.mouf.net (cpe-107-015-170-205.nc.res.rr.com [107.15.170.205])
	by mouf.net (8.14.5/8.14.5) with ESMTP id r8O233R9073786
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT);
	Tue, 24 Sep 2013 02:03:08 GMT
	(envelope-from swills@meatwad.mouf.net)
Received: (from swills@localhost)
	by meatwad.mouf.net (8.14.7/8.14.5/Submit) id r8O22r2T098144;
	Tue, 24 Sep 2013 02:02:53 GMT
	(envelope-from swills)
Message-Id: <201309240202.r8O22r2T098144@meatwad.mouf.net>
Date: Tue, 24 Sep 2013 02:02:53 GMT
From: Steve Wills <swills@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: robbak@robbak.com
Subject: [PATCH] net-p2p/bitcoin: Fix build on 10.0-ALPHA2
X-Send-Pr-Version: 3.113
X-GNATS-Notify: robbak@robbak.com

>Number:         182338
>Category:       ports
>Synopsis:       [PATCH] net-p2p/bitcoin: Fix build on 10.0-ALPHA2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    swills
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Sep 24 02:10:00 UTC 2013
>Closed-Date:    Fri Nov 15 18:50:28 UTC 2013
>Last-Modified:  Fri Nov 15 19:00:00 UTC 2013
>Originator:     Steve Wills
>Release:        FreeBSD 10.0-ALPHA2 amd64
>Organization:
>Environment:
System: FreeBSD meatwad.mouf.net 10.0-ALPHA2 FreeBSD 10.0-ALPHA2 #7 r255703M: Thu Sep 19 21:42:35 UTC
>Description:
- Remove redundant declaration to fix build on 10.0-ALPHA2

Port maintainer (robbak@robbak.com) is cc'd.

Generated with FreeBSD Port Tools 0.99_8 (mode: change, diff: SVN)
>How-To-Repeat:
>Fix:

--- bitcoin-0.8.5.patch begins here ---
Index: files/patch-src__serialize.h
===================================================================
--- files/patch-src__serialize.h	(revision 0)
+++ files/patch-src__serialize.h	(working copy)
@@ -0,0 +1,22 @@
+--- ./src/serialize.h.orig	2013-09-24 01:50:35.661706153 +0000
++++ ./src/serialize.h	2013-09-24 01:50:52.913703572 +0000
+@@ -895,19 +895,6 @@
+     iterator insert(iterator it, const char& x=char()) { return vch.insert(it, x); }
+     void insert(iterator it, size_type n, const char& x) { vch.insert(it, n, x); }
+ 
+-    void insert(iterator it, const_iterator first, const_iterator last)
+-    {
+-        assert(last - first >= 0);
+-        if (it == vch.begin() + nReadPos && (unsigned int)(last - first) <= nReadPos)
+-        {
+-            // special case for inserting at the front when there's room
+-            nReadPos -= (last - first);
+-            memcpy(&vch[nReadPos], &first[0], last - first);
+-        }
+-        else
+-            vch.insert(it, first, last);
+-    }
+-
+     void insert(iterator it, std::vector<char>::const_iterator first, std::vector<char>::const_iterator last)
+     {
+         assert(last - first >= 0);

Property changes on: files/patch-src__serialize.h
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
--- bitcoin-0.8.5.patch ends here ---

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Tue Sep 24 02:10:08 UTC 2013 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

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

From: Edwin Groothuis <edwin@FreeBSD.org>
To: robbak@robbak.com
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/182338: [PATCH] net-p2p/bitcoin: Fix build on 10.0-ALPHA2
Date: Tue, 24 Sep 2013 02:10:07 UT

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

From: Robert Backhaus <robbak@robbak.com>
To: "bug-followup@freebsd.org" <bug-followup@freebsd.org>
Cc:  
Subject: Re: ports/182338: [PATCH] net-p2p/bitcoin: Fix build on 10.0-ALPHA2
Date: Tue, 24 Sep 2013 18:01:28 +1000

 --001a11c3e47c426bb204e71c8be3
 Content-Type: text/plain; charset=ISO-8859-1
 
 Thanks, steve. I had seen messages on that, but without an instance of
 10.0A2 to test it on, and with redports having troubles, I didn't see how I
 could test it all.
 
 I've tested the patch on myself on everything I have available, but
 redports is still not working for 10-CURRENT. I'll defer to your testing
 and approve.
 
 Please commit.
 
 On 24 September 2013 12:10, Edwin Groothuis <edwin@freebsd.org> wrote:
 
 > Maintainer of net-p2p/bitcoin,
 >
 > Please note that PR ports/182338 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/182338
 >
 > --
 > Edwin Groothuis via the GNATS Auto Assign Tool
 > edwin@FreeBSD.org
 >
 
 --001a11c3e47c426bb204e71c8be3
 Content-Type: text/html; charset=ISO-8859-1
 Content-Transfer-Encoding: quoted-printable
 
 <div dir=3D"ltr">Thanks, steve. I had seen messages on that, but without an=
  instance of 10.0A2 to test it on, and with redports having troubles, I did=
 n&#39;t see how I could test it all.<div><br></div><div>I&#39;ve tested the=
  patch on myself on everything I have available, but redports is still not =
 working for 10-CURRENT. I&#39;ll defer to your testing and approve.<br>
 <div class=3D"gmail_extra"><br>Please commit.</div><div class=3D"gmail_extr=
 a"><br>
 <div class=3D"gmail_quote">On 24 September 2013 12:10, Edwin Groothuis <spa=
 n dir=3D"ltr">&lt;<a href=3D"mailto:edwin@freebsd.org" target=3D"_blank">ed=
 win@freebsd.org</a>&gt;</span> wrote:<br><blockquote class=3D"gmail_quote" =
 style=3D"margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
 
 Maintainer of net-p2p/bitcoin,<br>
 <br>
 Please note that PR ports/182338 has just been submitted.<br>
 <br>
 If it contains a patch for an upgrade, an enhancement or a bug fix<br>
 you agree on, reply to this email stating that you approve the patch<br>
 and a committer will take care of it.<br>
 <br>
 The full text of the PR can be found at:<br>
 =A0 =A0 <a href=3D"http://www.freebsd.org/cgi/query-pr.cgi?pr=3Dports/18233=
 8" target=3D"_blank">http://www.freebsd.org/cgi/query-pr.cgi?pr=3Dports/182=
 338</a><br>
 <span><font color=3D"#888888"><br>
 --<br>
 Edwin Groothuis via the GNATS Auto Assign Tool<br>
 edwin@FreeBSD.org<br>
 </font></span></blockquote></div><br></div></div></div>
 
 --001a11c3e47c426bb204e71c8be3--
State-Changed-From-To: feedback->open 
State-Changed-By: linimon 
State-Changed-When: Wed Sep 25 01:32:24 UTC 2013 
State-Changed-Why:  
Maintainer approved. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=182338 
Responsible-Changed-From-To: freebsd-ports-bugs->swills 
Responsible-Changed-By: tijl 
Responsible-Changed-When: Sat Oct 19 23:17:15 CEST 2013 
Responsible-Changed-Why:  
Assign to submitter. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=182338 
State-Changed-From-To: open->closed 
State-Changed-By: swills 
State-Changed-When: Fri Nov 15 18:50:28 UTC 2013 
State-Changed-Why:  
Committed. 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/182338: commit references a PR
Date: Fri, 15 Nov 2013 18:50:24 +0000 (UTC)

 Author: swills
 Date: Fri Nov 15 18:50:18 2013
 New Revision: 333910
 URL: http://svnweb.freebsd.org/changeset/ports/333910
 
 Log:
   - Fix build on 10.0
   
   PR:		ports/182338
   Submitted by:	swills
   Approved by:	Robert Backhaus <robbak@robbak.com> (maintainer)
 
 Added:
   head/net-p2p/bitcoin/files/patch-src__serialize.h   (contents, props changed)
 
 Added: head/net-p2p/bitcoin/files/patch-src__serialize.h
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/net-p2p/bitcoin/files/patch-src__serialize.h	Fri Nov 15 18:50:18 2013	(r333910)
 @@ -0,0 +1,22 @@
 +--- ./src/serialize.h.orig	2013-09-24 01:50:35.661706153 +0000
 ++++ ./src/serialize.h	2013-09-24 01:50:52.913703572 +0000
 +@@ -895,19 +895,6 @@
 +     iterator insert(iterator it, const char& x=char()) { return vch.insert(it, x); }
 +     void insert(iterator it, size_type n, const char& x) { vch.insert(it, n, x); }
 + 
 +-    void insert(iterator it, const_iterator first, const_iterator last)
 +-    {
 +-        assert(last - first >= 0);
 +-        if (it == vch.begin() + nReadPos && (unsigned int)(last - first) <= nReadPos)
 +-        {
 +-            // special case for inserting at the front when there's room
 +-            nReadPos -= (last - first);
 +-            memcpy(&vch[nReadPos], &first[0], last - first);
 +-        }
 +-        else
 +-            vch.insert(it, first, last);
 +-    }
 +-
 +     void insert(iterator it, std::vector<char>::const_iterator first, std::vector<char>::const_iterator last)
 +     {
 +         assert(last - first >= 0);
 _______________________________________________
 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"
 
>Unformatted:
