Attachment 155854 Details for Bug 199490 – Proposed patch

[patch] Proposed patch

diff (text/plain), 12.50 KB, created by Bartek Rutkowski on 2015-04-22 13:38:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bartek Rutkowski

Created: 2015-04-22 13:38:04 UTC

Size: 12.50 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 384417)
>+++ Makefile	(working copy)
>@@ -2,11 +2,12 @@
> # $FreeBSD$
> 
> PORTNAME=	BitcoinArmory
>-PORTVERSION=	0.92.3
>+PORTVERSION=	0.93.1
>+DISTVERSIONPREFIX=	v
> CATEGORIES=	finance
> 
> MAINTAINER=	yuri@rawbw.com
>-COMMENT=	Implementation of desktop bitcoin management system
>+COMMENT=	Desktop bitcoin management system
> 
> LICENSE=	AGPLv3
> LICENSE_FILE=	${WRKSRC}/LICENSE
>@@ -22,23 +23,32 @@
> USE_GITHUB=	yes
> GH_ACCOUNT=	etotheipi
> GH_PROJECT=	BitcoinArmory
>-GH_COMMIT=	2aa5449
>-GH_TAGNAME=	v${PORTVERSION}
> 
>-USES=		gmake python
>-USE_GCC=	yes
>+USES=		gmake python compiler:c++11-lang
> CPPFLAGS+=	-I${LOCALBASE}/include
> LDFLAGS+=	-L${LOCALBASE}/lib
>+CXXFLAGS+=	-DCRYPTOPP_DISABLE_ASM -fPIC
> MAKE_ENV+=	PYTHON_CONFIG=${PYTHON_CMD}-config
>+MAKE_ARGS+=	CXXFLAGS="${CXXFLAGS}"
>+ICON_SIZES=	24x24 32x32 64x64
> 
>-ONLY_FOR_ARCHS=	i386 amd64
>-ONLY_FOR_ARCHS_REASON=	low-level code available only for i386 and amd64
>+# When CRYPTOPP_DISABLE_ASM isn't needed any more, i386 amd64 should
>+# be made work through ASM code, and the other archs will still
>+# have CRYPTOPP_DISABLE_ASM
> 
> post-patch:
> 	@${REINPLACE_CMD} 's/python-config/$${PYTHON_CONFIG}/' ${WRKSRC}/cppForSwig/Makefile
>+	@${REINPLACE_CMD} 's/O_DSYNC/O_SYNC/' ${WRKSRC}/cppForSwig/mdb/mdb.c
> post-stage:
> 	@${SED} -i.bak -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${STAGEDIR}/${LOCALBASE}/bin/armory && \
> 		${RM} -f ${STAGEDIR}/${LOCALBASE}/bin/armory.bak
>+	@${REINPLACE_CMD} 's|Exec=/usr/bin/armory|Exec=${LOCALBASE}/bin/armory|' ${STAGEDIR}/${LOCALBASE}/share/applications/*.desktop
>+.for s in ${ICON_SIZES}
>+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps/
>+	${MV} ${STAGEDIR}/${PREFIX}/share/armory/img/armory_icon_${s}.png \
>+		${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps/armoryicon.png
>+.endfor
>+
> post-install:
> 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/armory/_CppBlockUtils.so
> 
>Index: distinfo
>===================================================================
>--- distinfo	(revision 384417)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (BitcoinArmory-0.92.3.tar.gz) = bd42044fe0c68179ab30d7e7c20ad48d6297e7ee31df83eb1eb37cd1bfead604
>-SIZE (BitcoinArmory-0.92.3.tar.gz) = 4700628
>+SHA256 (BitcoinArmory-v0.93.1_GH0.tar.gz) = 39f07b3a8bddd3ed6259b730b9ca87a7756ef5f52edb14bff868a57c90aaa8d3
>+SIZE (BitcoinArmory-v0.93.1_GH0.tar.gz) = 4774969
>Index: files/patch-ArmoryQt.py
>===================================================================
>--- files/patch-ArmoryQt.py	(revision 384417)
>+++ files/patch-ArmoryQt.py	(working copy)
>@@ -1,12 +1,12 @@
>---- ArmoryQt.py
>-+++ ArmoryQt.py
>+--- ArmoryQt.py	2015-03-29 02:08:37.798513000 -0700
>++++ ArmoryQt.py	2015-03-29 02:11:34.372533000 -0700
> @@ -1,4 +1,4 @@
> -#! /usr/bin/python
> +#!/usr/bin/env python
>+ # -*- coding: UTF-8 -*-
>  ################################################################################
>  #                                                                              #
>- # Copyright (C) 2011-2014, Armory Technologies, Inc.                           #
>-@@ -1089,6 +1089,9 @@
>+@@ -1236,6 +1236,9 @@
>           elif OS_LINUX:
>              tempDir = '/var/log'
>              extraFiles = ['/var/log/Xorg.0.log']
>@@ -16,7 +16,7 @@
>           elif OS_MACOSX:
>              tempDir = '/var/log'
>              extraFiles = ['/var/log/system.log']
>-@@ -1369,7 +1372,7 @@
>+@@ -1516,7 +1519,7 @@
>        if USE_TESTNET:
>           return
>  
>@@ -25,7 +25,7 @@
>           out,err = execAndWait('gconftool-2 --get /desktop/gnome/url-handlers/bitcoin/command')
>           out2,err = execAndWait('xdg-mime query default x-scheme-handler/bitcoin')
>  
>-@@ -1890,6 +1893,8 @@
>+@@ -2104,6 +2107,8 @@
>           shortOS = 'windows'
>        elif OS_LINUX:
>           shortOS = 'ubuntu'
>@@ -34,22 +34,22 @@
>        elif OS_MACOSX:
>           shortOS = 'mac'
>  
>-@@ -4708,6 +4713,8 @@
>+@@ -4570,6 +4575,8 @@
>+                Download and Install Bitcoin Core for Ubuntu/Debian"""))
>+             self.dashBtns[DASHBTNS.Install][TTIP] = self.createToolTipWidget( tr("""
>                 'Will download and Bitcoin software and cryptographically verify it"""))
>++      elif OS_FREEBSD:
>++         pass
>        elif OS_MACOSX:
>           pass
>-+      elif OS_FREEBSD:
>-+         pass
>        else:
>-          LOGERROR('Unrecognized OS!')
>- 
>-@@ -5101,8 +5108,7 @@
>-    #############################################################################
>+@@ -4970,8 +4977,7 @@
>     def closeExistingBitcoin(self):
>        for proc in psutil.process_iter():
>--         if proc.name.lower() in ['bitcoind.exe','bitcoin-qt.exe',\
>--                                     'bitcoind','bitcoin-qt']:
>-+         if proc.name() in ['bitcoind','bitcoin-qt']:
>-             killProcess(proc.pid)
>-             time.sleep(2)
>-             return
>+          try:
>+-            if proc.name().lower() in ['bitcoind.exe','bitcoin-qt.exe',\
>+-                                        'bitcoind','bitcoin-qt']:
>++            if proc.name() in ['bitcoind','bitcoin-qt']:
>+                killProcess(proc.pid)
>+                time.sleep(2)
>+                return
>Index: files/patch-ArmoryUtils.py
>===================================================================
>--- files/patch-ArmoryUtils.py	(revision 384417)
>+++ files/patch-ArmoryUtils.py	(working copy)
>@@ -1,6 +1,6 @@
> --- armoryengine/ArmoryUtils.py
> +++ armoryengine/ArmoryUtils.py
>-@@ -208,6 +208,7 @@ class P2SHNotSupportedError(Exception): pass
>+@@ -232,6 +232,7 @@
>  opsys = platform.system()
>  OS_WINDOWS = 'win32'  in opsys.lower() or 'windows' in opsys.lower()
>  OS_LINUX   = 'nix'    in opsys.lower() or 'nux'     in opsys.lower()
>@@ -8,7 +8,7 @@
>  OS_MACOSX  = 'darwin' in opsys.lower() or 'osx'     in opsys.lower()
>  
>  
>-@@ -276,6 +277,14 @@ elif OS_LINUX:
>+@@ -305,6 +306,14 @@
>     ARMORY_HOME_DIR = os.path.join(USER_HOME_DIR, '.armory', SUBDIR)
>     BLKFILE_DIR     = os.path.join(BTC_HOME_DIR, 'blocks')
>     BLKFILE_1stFILE = os.path.join(BLKFILE_DIR, 'blk00000.dat')
>@@ -23,7 +23,7 @@
>  elif OS_MACOSX:
>     platform.mac_ver()
>     OS_NAME         = 'MacOSX'
>-@@ -293,6 +302,7 @@ else:
>+@@ -322,6 +331,7 @@
>  opsys = platform.system()
>  OS_WINDOWS = 'win32'  in opsys.lower() or 'windows' in opsys.lower()
>  OS_LINUX   = 'nix'    in opsys.lower() or 'nux'     in opsys.lower()
>@@ -31,16 +31,16 @@
>  OS_MACOSX  = 'darwin' in opsys.lower() or 'osx'     in opsys.lower()
>  
>  BLOCKCHAINS = {}
>-@@ -631,7 +641,7 @@ def killProcessTree(pid):
>-    # call, because have bundled a recent version of psutil.  Linux, however,
>-    # does not have that function call in earlier versions.
>-    from subprocess import Popen, PIPE
>+@@ -677,7 +687,7 @@
>+    else:
>+       from subprocess_win import Popen, PIPE
>+       
> -   if not OS_LINUX:
> +   if not OS_LINUX and not OS_FREEBSD:
>        for child in psutil.Process(pid).get_children():
>           killProcess(child.pid)
>     else:
>-@@ -1007,7 +1017,7 @@ except:
>+@@ -1078,7 +1088,7 @@
>     LOGCRIT('   in the current directory (or added to the PATH)')
>     LOGCRIT('   Specifically, you need:')
>     LOGCRIT('       CppBlockUtils.py     and')
>@@ -49,7 +49,7 @@
>        LOGCRIT('       _CppBlockUtils.so')
>     elif OS_WINDOWS:
>        LOGCRIT('       _CppBlockUtils.pyd')
>-@@ -1041,6 +1051,11 @@ def GetSystemDetails():
>+@@ -1112,6 +1122,11 @@
>              out.CpuStr = line.split(':')[1].strip()
>              break
>  
>@@ -61,7 +61,7 @@
>  
>     elif OS_WINDOWS:
>        import ctypes
>-@@ -1542,7 +1557,7 @@ except:
>+@@ -1617,7 +1632,7 @@
>     LOGCRIT('   in the current directory (or added to the PATH)')
>     LOGCRIT('   Specifically, you need:')
>     LOGCRIT('       CppBlockUtils.py     and')
>Index: files/patch-cppForSwig-Makefile
>===================================================================
>--- files/patch-cppForSwig-Makefile	(revision 384417)
>+++ files/patch-cppForSwig-Makefile	(working copy)
>@@ -1,17 +1,19 @@
> --- cppForSwig/Makefile
> +++ cppForSwig/Makefile
>-@@ -1,4 +1,4 @@
>+@@ -1,5 +1,5 @@
> -CXX = g++
>+-CC = gcc
> +CXX ?= g++
>++CC ?= gcc
>  
>  ifdef DEBUG
>  CFLAGS=-g3 -Wall -pipe -fPIC
>-@@ -68,7 +68,7 @@
>- BlockUtils.o: log.h BinaryData.h UniversalTimer.h PartialMerkle.h
>- EncryptionUtils.o: log.h BtcUtils.h BinaryData.h
>- CppBlockUtils_wrap.cxx: log.h BlockUtils.h BinaryData.h BlockObj.h UniversalTimer.h BlockUtils.h BlockUtils.cpp CppBlockUtils.i
>+@@ -88,7 +88,7 @@
>+ 
>+ 
>+ CppBlockUtils_wrap.cxx: $(ALL_HEADERS) CppBlockUtils.i
> -	swig $(SWIG_OPTS) -outdir ../ -v CppBlockUtils.i 
> +	swig3.0 $(SWIG_OPTS) -outdir ../ -v CppBlockUtils.i 
>  
>- CppBlockUtils_wrap.o: log.h BlockUtils.h  BinaryData.h UniversalTimer.h CppBlockUtils_wrap.cxx
>+ CppBlockUtils_wrap.o: $(ALL_HEADERS) CppBlockUtils_wrap.cxx
>  	$(CXX) $(SWIG_INC) $(CXXFLAGS) $(CXXCPP) -c CppBlockUtils_wrap.cxx
>Index: pkg-message
>===================================================================
>--- pkg-message	(revision 384417)
>+++ pkg-message	(working copy)
>@@ -1,11 +1,11 @@
>-
> ================================================================
> BitcoinArmory consumes significant disk space in ~/.armory
> and ~/.bitcoin, so you need to provide sufficient available
>-space there, currently >30 gigabytes.
>+space there, currently >50 gigabytes.
> 
>-Please note that BitcoinArmory has an embedded bitcoind, and
>-doesn't require the running bitcoind, but can optionally use it.
>+Please note that BitcoinArmory requires bitcoind daemon, so you
>+need to have either net-p2p/bitcoin-daemon or net-p2p/bitcoin
>+installed.
> 
> Please keep your *.wallet files located under the ~/.armory
> directory secure. Loss of these files is equivalent to the loss
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 384417)
>+++ pkg-plist	(working copy)
>@@ -1,5 +1,4 @@
> bin/armory
>-lib/armory/ArmoryDB.py
> lib/armory/ArmoryQt.py
> lib/armory/BitTornado/BT1/Choker.py
> lib/armory/BitTornado/BT1/Connecter.py
>@@ -53,7 +52,7 @@
> lib/armory/BitTornado/zurllib.py
> lib/armory/CppBlockUtils.py
> lib/armory/LICENSE.py
>-lib/armory/README
>+lib/armory/README.md
> lib/armory/SDM.py
> lib/armory/_CppBlockUtils.so
> lib/armory/announcefetch.py
>@@ -61,6 +60,7 @@
> lib/armory/armoryd.py
> lib/armory/armoryengine/ALL.py
> lib/armory/armoryengine/ArmoryUtils.py
>+lib/armory/armoryengine/ArmoryUtils.py.orig
> lib/armory/armoryengine/AsciiSerialize.py
> lib/armory/armoryengine/BDM.py
> lib/armory/armoryengine/BinaryPacker.py
>@@ -76,6 +76,7 @@
> lib/armory/armoryengine/Script.py
> lib/armory/armoryengine/Timer.py
> lib/armory/armoryengine/Transaction.py
>+lib/armory/armoryengine/Transaction.py.orig
> lib/armory/armoryengine/UserAddressUtils.py
> lib/armory/armoryengine/__init__.py
> lib/armory/armoryengine/parseAnnounce.py
>@@ -87,6 +88,9 @@
> lib/armory/bitcoinrpc_jsonrpc/proxy.py
> lib/armory/default_bootstrap.torrent
> lib/armory/dynamicImport.py
>+lib/armory/extras/BDMbasics_listUTXOs.py
>+lib/armory/extras/BDMbasics_traceTxHistory.py
>+lib/armory/extras/BDMbasics_watchBalance.py
> lib/armory/extras/LastBlockHash.py
> lib/armory/extras/LatestBlocksFinder.py
> lib/armory/extras/PromoKit.py
>@@ -122,6 +126,7 @@
> lib/armory/pytest/testArmoryEngineUtils.py
> lib/armory/pytest/testDecorators.py
> lib/armory/pytest/testFragmentedBackup.py
>+lib/armory/pytest/testJasvet.py
> lib/armory/pytest/testMultisig.py
> lib/armory/pytest/testParseAnnounce.py
> lib/armory/pytest/testPyBtcAddress.py
>@@ -130,6 +135,7 @@
> lib/armory/pytest/testPyTX.py
> lib/armory/pytest/testSplitSecret.py
> lib/armory/pytest/testUserAddress.py
>+lib/armory/pytest/testUtility.py
> lib/armory/qrc_img_resources.py
> lib/armory/qrcodenative.py
> lib/armory/qt4reactor.py
>@@ -146,7 +152,6 @@
> lib/armory/txjsonrpc/web/jsonrpc.py
> lib/armory/ui/MultiSigDialogs.py
> lib/armory/ui/MultiSigModels.py
>-lib/armory/ui/TxConstruct.py
> lib/armory/ui/TxFrames.py
> lib/armory/ui/UpgradeDownloader.py
> lib/armory/ui/VerifyOfflinePackage.py
>@@ -154,6 +159,7 @@
> lib/armory/ui/Wizards.py
> lib/armory/ui/__init__.py
> lib/armory/ui/toolsDialogs.py
>+lib/armory/update_version.py
> lib/armory/urllib3/__init__.py
> lib/armory/urllib3/_collections.py
> lib/armory/urllib3/connection.py
>@@ -194,9 +200,6 @@
> share/armory/img/armory32x32.ico
> share/armory/img/armory48x48.ico
> share/armory/img/armory64x64.ico
>-share/armory/img/armory_icon_24x24.png
>-share/armory/img/armory_icon_32x32.png
>-share/armory/img/armory_icon_64x64.png
> share/armory/img/armory_icon_fullres.icns
> share/armory/img/armory_icon_fullres.png
> share/armory/img/armory_icon_green_24x24.png
>@@ -312,3 +315,6 @@
> share/armory/img/visible2.png
> share/armory/img/wallet_16x12.png
> share/armory/img/x-office-address-book.png
>+share/icons/hicolor/24x24/apps/armoryicon.png
>+share/icons/hicolor/32x32/apps/armoryicon.png
>+share/icons/hicolor/64x64/apps/armoryicon.png

Actions: View | Diff

Attachments on bug 199490: 155654 | 155655 | 155661 | 155684 | 155854 | 155876 | 155991 | 156026 | 156408 | 156409 | 158832 | 158833 | 158834 | 162339