Attachment 157472 Details for Bug 193534 – svn diff to 0.3.80,1

[patch] svn diff to 0.3.80,1

namecoin-0.3.80,1.diff (text/plain), 5.42 KB, created by Chad Jacob Milios on 2015-06-06 17:09:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chad Jacob Milios

Created: 2015-06-06 17:09:41 UTC

Size: 5.42 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 388669)
>+++ Makefile	(working copy)
>@@ -2,14 +2,16 @@
> # $FreeBSD$
> 
> PORTNAME=	namecoin
>-PORTVERSION=	Q.3.72
>-DISTVERSIONPREFIX=	v
>-PORTREVISION=	3
>+PORTVERSION=	0.3.80
>+PORTEPOCH=	1
>+DISTVERSIONPREFIX=	nc
> CATEGORIES=	net-p2p dns
> 
> MAINTAINER=	milios@ccsys.com
> COMMENT=	Decentralized, open DNS system and general purpose key/value store
> 
>+LICENSE=	MIT
>+
> LIB_DEPENDS=	libboost_date_time.so:${PORTSDIR}/devel/boost-libs
> 
> OPTIONS_DEFINE=	X11 UPNP QRCODES DBUS
>@@ -19,10 +21,11 @@
> QRCODES_DESC=	Build with QR code display
> 
> USE_GITHUB=	yes
>-GH_ACCOUNT=	namecoinq
>-GH_PROJECT=	namecoinq
>+GH_ACCOUNT=	namecoin
>+GH_PROJECT=	namecoin
> 
> USES=		gmake compiler:c++11-lib
>+MAKE_JOBS_UNSAFE=yes
> USE_OPENSSL=	yes
> USE_BDB=	yes
> WANT_BDB_VER=	48
>@@ -62,6 +65,7 @@
> 
> .if ${PORT_OPTIONS:MUPNP}
> LIB_DEPENDS+=	libminiupnpc.so:${PORTSDIR}/net/miniupnpc
>+CXXFLAGS+=	-I${LOCALBASE}/include/miniupnpc
> QMAKE_USE_UPNP=	1
> .else
> QMAKE_USE_UPNP=	-
>Index: distinfo
>===================================================================
>--- distinfo	(revision 388669)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (namecoinq-namecoinq-vQ.3.72_GH0.tar.gz) = 74d088f96735b3397b9a71bc10bbbe1211cd2594baf593c4b9062457c1d4b869
>-SIZE (namecoinq-namecoinq-vQ.3.72_GH0.tar.gz) = 1453901
>+SHA256 (namecoin-namecoin-nc0.3.80_GH0.tar.gz) = 3f5e5af95cea46111d3cf1663f0e84d5fda653917745e0607a3ca4773baea59c
>+SIZE (namecoin-namecoin-nc0.3.80_GH0.tar.gz) = 1471777
>Index: files/patch-src__main.h
>===================================================================
>--- files/patch-src__main.h	(revision 388669)
>+++ files/patch-src__main.h	(working copy)
>@@ -1,6 +1,6 @@
>---- ./src/main.h.orig	2013-10-29 13:38:10.000000000 +0000
>-+++ ./src/main.h	2014-01-18 23:12:20.871138275 +0000
>-@@ -16,7 +16,6 @@
>+--- src/main.h.orig	2014-12-18 14:47:02 UTC
>++++ src/main.h
>+@@ -17,7 +17,6 @@
>  #ifdef __WXMSW__
>  #include <io.h> /* for _commit */
>  #elif !defined(MAC_OSX)
>Index: files/patch-src__net.cpp
>===================================================================
>--- files/patch-src__net.cpp	(revision 388669)
>+++ files/patch-src__net.cpp	(working copy)
>@@ -1,25 +0,0 @@
>---- ./src/net.cpp.orig	2013-10-29 13:38:10.000000000 +0000
>-+++ ./src/net.cpp	2014-01-18 23:12:20.911138205 +0000
>-@@ -51,7 +51,7 @@
>- CAddress addrLocalHost("0.0.0.0", 0, false, nLocalServices);
>- CNode* pnodeLocalHost = NULL;
>- uint64 nLocalHostNonce = 0;
>--array<int, 10> vnThreadsRunning;
>-+boost::array<int, 10> vnThreadsRunning;
>- SOCKET hListenSocket = INVALID_SOCKET;
>- 
>- vector<CNode*> vNodes;
>-@@ -1094,13 +1094,8 @@
>-         char intClient[16];
>-         char intPort[6];
>- 
>--#if !defined(__WXMSW__) && !defined(MAC_OSX)
>--        r = UPNP_AddPortMapping(urls.controlURL, data.first.servicetype,
>--	                        port, port, lanaddr, 0, "TCP", 0);
>--#else
>-         r = UPNP_AddPortMapping(urls.controlURL, data.first.servicetype,
>- 	                        port, port, lanaddr, 0, "TCP", 0, "0");
>--#endif
>-         if(r!=UPNPCOMMAND_SUCCESS)
>-             printf("AddPortMapping(%s, %s, %s) failed with code %d (%s)\n",
>-                 port, port, lanaddr, r, strupnperror(r));
>Index: files/patch-src__qt__configurenamedialog.h
>===================================================================
>--- files/patch-src__qt__configurenamedialog.h	(revision 388669)
>+++ files/patch-src__qt__configurenamedialog.h	(working copy)
>@@ -1,5 +1,5 @@
>---- ./src/qt/configurenamedialog.h.orig	2013-10-29 13:38:10.000000000 +0000
>-+++ ./src/qt/configurenamedialog.h	2014-01-18 23:12:20.925138619 +0000
>+--- src/qt/configurenamedialog.h.orig	2014-12-18 14:47:02 UTC
>++++ src/qt/configurenamedialog.h
> @@ -1,6 +1,9 @@
>  #ifndef CONFIGURENAMEDIALOG_H
>  #define CONFIGURENAMEDIALOG_H
>Index: files/patch-src__qt__managenamespage.h
>===================================================================
>--- files/patch-src__qt__managenamespage.h	(revision 388669)
>+++ files/patch-src__qt__managenamespage.h	(working copy)
>@@ -1,5 +1,5 @@
>---- ./src/qt/managenamespage.h.orig	2013-10-29 13:38:10.000000000 +0000
>-+++ ./src/qt/managenamespage.h	2014-01-18 23:12:20.965138391 +0000
>+--- src/qt/managenamespage.h.orig	2014-12-18 14:47:02 UTC
>++++ src/qt/managenamespage.h
> @@ -1,6 +1,9 @@
>  #ifndef MANAGENAMESPAGE_H
>  #define MANAGENAMESPAGE_H
>Index: files/patch-src__serialize.h
>===================================================================
>--- files/patch-src__serialize.h	(revision 388669)
>+++ files/patch-src__serialize.h	(working copy)
>@@ -1,21 +0,0 @@
>---- src/serialize.h.orig	2014-01-19 03:49:23.000000000 +0000
>-+++ src/serialize.h	2014-01-19 03:52:10.000000000 +0000
>-@@ -858,18 +858,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)
>--    {
>--        if (it == vch.begin() + nReadPos && 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)
>-     {
>-         if (it == vch.begin() + nReadPos && last - first <= nReadPos)

Flags:

milios: maintainer-approval+

Actions: View | Diff

Attachments on bug 193534: 147182 | 157363 | 157472 | 157473