Attachment #155661 for bug #199490




# $FreeBSD: head/finance/bitcoin-armory/Makefile 374125 2014-12-06 18:26:27Z pawel $

PORTNAME=	BitcoinArmory
PORTVERSION=	0.93.1
CATEGORIES=	finance

MAINTAINER=	yuri@rawbw.com
COMMENT=	Desktop bitcoin management system

LICENSE=	AGPLv3
LICENSE_FILE=	${WRKSRC}/LICENSE

USE_GITHUB=	yes
GH_ACCOUNT=	etotheipi
GH_PROJECT=	BitcoinArmory
GH_COMMIT=	5118bf7
GH_TAGNAME=	v${PORTVERSION}

BUILD_DEPENDS=	${LOCALBASE}/bin/swig3.0:${PORTSDIR}/devel/swig30 \
		${LOCALBASE}/bin/pyrcc4:${PORTSDIR}/textproc/py-qt4-xml \
		${LOCALBASE}/bin/rsync:${PORTSDIR}/net/rsync

		${PYTHON_PKGNAMEPREFIX}twistedCore>=14.0.0:${PORTSDIR}/devel/py-twistedCore \
		${PYTHON_PKGNAMEPREFIX}psutil>1.2.1:${PORTSDIR}/sysutils/py-psutil

USES=		gmake python compiler:c++11-lang
GH_ACCOUNT=	etotheipi
GH_PROJECT=	BitcoinArmory
GH_COMMIT=	2aa5449
GH_TAGNAME=	v${PORTVERSION}

USES=		gmake python
USE_GCC=	yes
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

# 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
.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/${PORTNAME}.png
.endfor

post-install:
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/armory/_CppBlockUtils.so


Lines 1-2 Link Here

(-)finance/bitcoin-armory/distinfo (-2 / +2 lines)
1	SHA256 (BitcoinArmory-0.92.3.tar.gz) = bd42044fe0c68179ab30d7e7c20ad48d6297e7ee31df83eb1eb37cd1bfead604	1	SHA256 (BitcoinArmory-0.93.1.tar.gz) = 20231f4e2f3b2e58601c667f0fa5a630a620a2ef2fa344d13bdf9ecc471c75f0
2	SIZE (BitcoinArmory-0.92.3.tar.gz) = 4700628	2	SIZE (BitcoinArmory-0.93.1.tar.gz) = 4773788




--- 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 -*-
 ################################################################################
 #                                                                              #
@@ -1236,6 +1236,9 @@
@@ -1089,6 +1089,9 @@
          elif OS_LINUX:
             tempDir = '/var/log'
             extraFiles = ['/var/log/Xorg.0.log']

          elif OS_MACOSX:
             tempDir = '/var/log'
             extraFiles = ['/var/log/system.log']
@@ -1516,7 +1519,7 @@
       if USE_TESTNET:
          return
 

          out,err = execAndWait('gconftool-2 --get /desktop/gnome/url-handlers/bitcoin/command')
          out2,err = execAndWait('xdg-mime query default x-scheme-handler/bitcoin')
 
@@ -2104,6 +2107,8 @@
          shortOS = 'windows'
       elif OS_LINUX:
          shortOS = 'ubuntu'

       elif OS_MACOSX:
          shortOS = 'mac'
 
@@ -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_MACOSX:
          pass
+      elif OS_FREEBSD:
+         pass
       elif OS_MACOSX:
          pass
       else:
@@ -4970,8 +4977,7 @@
 
@@ -5101,8 +5108,7 @@
    #############################################################################
    def closeExistingBitcoin(self):
       for proc in psutil.process_iter():
          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




--- armoryengine/ArmoryUtils.py
+++ armoryengine/ArmoryUtils.py
@@ -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()

 OS_MACOSX  = 'darwin' in opsys.lower() or 'osx'     in opsys.lower()
 
 
@@ -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')

 elif OS_MACOSX:
    platform.mac_ver()
    OS_NAME         = 'MacOSX'
@@ -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()

 OS_MACOSX  = 'darwin' in opsys.lower() or 'osx'     in opsys.lower()
 
 BLOCKCHAINS = {}
@@ -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:
@@ -1078,7 +1088,7 @@
    LOGCRIT('   in the current directory (or added to the PATH)')
    LOGCRIT('   Specifically, you need:')
    LOGCRIT('       CppBlockUtils.py     and')

       LOGCRIT('       _CppBlockUtils.so')
    elif OS_WINDOWS:
       LOGCRIT('       _CppBlockUtils.pyd')
@@ -1112,6 +1122,11 @@
             out.CpuStr = line.split(':')[1].strip()
             break
 

 
    elif OS_WINDOWS:
       import ctypes
@@ -1617,7 +1632,7 @@
    LOGCRIT('   in the current directory (or added to the PATH)')
    LOGCRIT('   Specifically, you need:')
    LOGCRIT('       CppBlockUtils.py     and')




--- armoryengine/Transaction.py	2015-04-15 17:44:57.369764000 -0700
+++ armoryengine/Transaction.py	2015-04-15 17:45:36.196942000 -0700
@@ -15,6 +15,7 @@
 
 from armoryengine.AsciiSerialize import AsciiSerializable
 
+from armoryengine.MultiSigUtils import *
 
 UNSIGNED_TX_VERSION = 1
 
@@ -2674,7 +2675,6 @@
 #
 def PyCreateAndSignTx_old(srcTxOuts, dstAddrsVals):
    # This needs to support multisig. Perhaps the funct should just be moved....
-   from armoryengine.MultiSigUtils import *
 
    newTx = PyTx()
    newTx.version    = 1




--- cppForSwig/Makefile
+++ cppForSwig/Makefile
@@ -1,5 +1,5 @@
-CXX = g++
-CC = gcc
+CXX ?= g++
+CC ?= gcc
 
 ifdef DEBUG
 CFLAGS=-g3 -Wall -pipe -fPIC
@@ -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: $(ALL_HEADERS) CppBlockUtils_wrap.cxx
 	$(CXX) $(SWIG_INC) $(CXXFLAGS) $(CXXCPP) -c CppBlockUtils_wrap.cxx





================================================================
BitcoinArmory consumes significant disk space in ~/.armory
and ~/.bitcoin, so you need to provide sufficient available
space there, currently >50 gigabytes.

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




bin/armory
lib/armory/ArmoryDB.py
lib/armory/ArmoryQt.py
lib/armory/BitTornado/BT1/Choker.py
lib/armory/BitTornado/BT1/Connecter.py

lib/armory/BitTornado/zurllib.py
lib/armory/CppBlockUtils.py
lib/armory/LICENSE.py
lib/armory/README.md
lib/armory/SDM.py
lib/armory/_CppBlockUtils.so
lib/armory/announcefetch.py

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

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

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

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

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

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

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

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

share/armory/img/visible2.png
share/armory/img/wallet_16x12.png
share/armory/img/x-office-address-book.png
share/icons/hicolor/24x24/apps/BitcoinArmory.png
share/icons/hicolor/32x32/apps/BitcoinArmory.png
share/icons/hicolor/64x64/apps/BitcoinArmory.png

Return to bug 199490

Lines 2-16 Link Here

(-)finance/bitcoin-armory/Makefile (-12 / +22 lines)
2	# $FreeBSD: head/finance/bitcoin-armory/Makefile 374125 2014-12-06 18:26:27Z pawel $	2	# $FreeBSD: head/finance/bitcoin-armory/Makefile 374125 2014-12-06 18:26:27Z pawel $
3		3
4	PORTNAME= BitcoinArmory	4	PORTNAME= BitcoinArmory
5	PORTVERSION= 0.92.3	5	PORTVERSION= 0.93.1
6	CATEGORIES= finance	6	CATEGORIES= finance
7		7
8	MAINTAINER= yuri@rawbw.com	8	MAINTAINER= yuri@rawbw.com
9	COMMENT= Implementation of desktop bitcoin management system	9	COMMENT= Desktop bitcoin management system
10		10
11	LICENSE= AGPLv3	11	LICENSE= AGPLv3
12	LICENSE_FILE= ${WRKSRC}/LICENSE	12	LICENSE_FILE= ${WRKSRC}/LICENSE
13		13
		14	USE_GITHUB= yes
		15	GH_ACCOUNT= etotheipi
		16	GH_PROJECT= BitcoinArmory
		17	GH_COMMIT= 5118bf7
		18	GH_TAGNAME= v${PORTVERSION}
		19
14	BUILD_DEPENDS= ${LOCALBASE}/bin/swig3.0:${PORTSDIR}/devel/swig30 \	20	BUILD_DEPENDS= ${LOCALBASE}/bin/swig3.0:${PORTSDIR}/devel/swig30 \
15	${LOCALBASE}/bin/pyrcc4:${PORTSDIR}/textproc/py-qt4-xml \	21	${LOCALBASE}/bin/pyrcc4:${PORTSDIR}/textproc/py-qt4-xml \
16	${LOCALBASE}/bin/rsync:${PORTSDIR}/net/rsync	22	${LOCALBASE}/bin/rsync:${PORTSDIR}/net/rsync
Lines 19-44 Link Here
19	${PYTHON_PKGNAMEPREFIX}twistedCore>=14.0.0:${PORTSDIR}/devel/py-twistedCore \	25	${PYTHON_PKGNAMEPREFIX}twistedCore>=14.0.0:${PORTSDIR}/devel/py-twistedCore \
20	${PYTHON_PKGNAMEPREFIX}psutil>1.2.1:${PORTSDIR}/sysutils/py-psutil	26	${PYTHON_PKGNAMEPREFIX}psutil>1.2.1:${PORTSDIR}/sysutils/py-psutil
21		27
22	USE_GITHUB= yes	28	USES= gmake python compiler:c++11-lang
23	GH_ACCOUNT= etotheipi
24	GH_PROJECT= BitcoinArmory
25	GH_COMMIT= 2aa5449
26	GH_TAGNAME= v${PORTVERSION}
27
28	USES= gmake python
29	USE_GCC= yes
30	CPPFLAGS+= -I${LOCALBASE}/include	29	CPPFLAGS+= -I${LOCALBASE}/include
31	LDFLAGS+= -L${LOCALBASE}/lib	30	LDFLAGS+= -L${LOCALBASE}/lib
		31	CXXFLAGS+= -DCRYPTOPP_DISABLE_ASM -fPIC
32	MAKE_ENV+= PYTHON_CONFIG=${PYTHON_CMD}-config	32	MAKE_ENV+= PYTHON_CONFIG=${PYTHON_CMD}-config
		33	MAKE_ARGS+= CXXFLAGS="${CXXFLAGS}"
		34	ICON_SIZES= 24x24 32x32 64x64
33		35
34	ONLY_FOR_ARCHS= i386 amd64	36	# When CRYPTOPP_DISABLE_ASM isn't needed any more, i386 amd64 should
35	ONLY_FOR_ARCHS_REASON= low-level code available only for i386 and amd64	37	# be made work through ASM code, and the other archs will still
		38	# have CRYPTOPP_DISABLE_ASM
36		39
37	post-patch:	40	post-patch:
38	@${REINPLACE_CMD} 's/python-config/$${PYTHON_CONFIG}/' ${WRKSRC}/cppForSwig/Makefile	41	@${REINPLACE_CMD} 's/python-config/$${PYTHON_CONFIG}/' ${WRKSRC}/cppForSwig/Makefile
		42	@${REINPLACE_CMD} 's/O_DSYNC/O_SYNC/' ${WRKSRC}/cppForSwig/mdb/mdb.c
39	post-stage:	43	post-stage:
40	@${SED} -i.bak -e 's\|%%LOCALBASE%%\|${LOCALBASE}\|g' ${STAGEDIR}/${LOCALBASE}/bin/armory && \	44	@${SED} -i.bak -e 's\|%%LOCALBASE%%\|${LOCALBASE}\|g' ${STAGEDIR}/${LOCALBASE}/bin/armory && \
41	${RM} -f ${STAGEDIR}/${LOCALBASE}/bin/armory.bak	45	${RM} -f ${STAGEDIR}/${LOCALBASE}/bin/armory.bak
		46	.for s in ${ICON_SIZES}
		47	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps/
		48	${MV} ${STAGEDIR}/${PREFIX}/share/armory/img/armory_icon_${s}.png \
		49	${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps/${PORTNAME}.png
		50	.endfor
		51
42	post-install:	52	post-install:
43	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/armory/_CppBlockUtils.so	53	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/armory/_CppBlockUtils.so
44		54

Lines 1-12 Link Here

(-)finance/bitcoin-armory/files/patch-ArmoryQt.py (-19 / +19 lines)
1	--- ArmoryQt.py	1	--- ArmoryQt.py 2015-03-29 02:08:37.798513000 -0700
2	+++ ArmoryQt.py	2	+++ ArmoryQt.py 2015-03-29 02:11:34.372533000 -0700
3	@@ -1,4 +1,4 @@	3	@@ -1,4 +1,4 @@
4	-#! /usr/bin/python	4	-#! /usr/bin/python
5	+#!/usr/bin/env python	5	+#!/usr/bin/env python
		6	# -- coding: UTF-8 --
6	################################################################################	7	################################################################################
7	# #	8	# #
8	# Copyright (C) 2011-2014, Armory Technologies, Inc. #	9	@@ -1236,6 +1236,9 @@
9	@@ -1089,6 +1089,9 @@
10	elif OS_LINUX:	10	elif OS_LINUX:
11	tempDir = '/var/log'	11	tempDir = '/var/log'
12	extraFiles = ['/var/log/Xorg.0.log']	12	extraFiles = ['/var/log/Xorg.0.log']
Lines 16-22 Link Here
16	elif OS_MACOSX:	16	elif OS_MACOSX:
17	tempDir = '/var/log'	17	tempDir = '/var/log'
18	extraFiles = ['/var/log/system.log']	18	extraFiles = ['/var/log/system.log']
19	@@ -1369,7 +1372,7 @@	19	@@ -1516,7 +1519,7 @@
20	if USE_TESTNET:	20	if USE_TESTNET:
21	return	21	return
22		22
Lines 25-31 Link Here
25	out,err = execAndWait('gconftool-2 --get /desktop/gnome/url-handlers/bitcoin/command')	25	out,err = execAndWait('gconftool-2 --get /desktop/gnome/url-handlers/bitcoin/command')
26	out2,err = execAndWait('xdg-mime query default x-scheme-handler/bitcoin')	26	out2,err = execAndWait('xdg-mime query default x-scheme-handler/bitcoin')
27		27
28	@@ -1890,6 +1893,8 @@	28	@@ -2104,6 +2107,8 @@
29	shortOS = 'windows'	29	shortOS = 'windows'
30	elif OS_LINUX:	30	elif OS_LINUX:
31	shortOS = 'ubuntu'	31	shortOS = 'ubuntu'
Lines 34-55 Link Here
34	elif OS_MACOSX:	34	elif OS_MACOSX:
35	shortOS = 'mac'	35	shortOS = 'mac'
36		36
37	@@ -4708,6 +4713,8 @@	37	@@ -4570,6 +4575,8 @@
		38	Download and Install Bitcoin Core for Ubuntu/Debian"""))
		39	self.dashBtns[DASHBTNS.Install][TTIP] = self.createToolTipWidget( tr("""
38	'Will download and Bitcoin software and cryptographically verify it"""))	40	'Will download and Bitcoin software and cryptographically verify it"""))
39	elif OS_MACOSX:
40	pass
41	+ elif OS_FREEBSD:	41	+ elif OS_FREEBSD:
42	+ pass	42	+ pass
		43	elif OS_MACOSX:
		44	pass
43	else:	45	else:
44	LOGERROR('Unrecognized OS!')	46	@@ -4970,8 +4977,7 @@
45
46	@@ -5101,8 +5108,7 @@
47	#############################################################################
48	def closeExistingBitcoin(self):	47	def closeExistingBitcoin(self):
49	for proc in psutil.process_iter():	48	for proc in psutil.process_iter():
50	- if proc.name.lower() in ['bitcoind.exe','bitcoin-qt.exe',\	49	try:
51	- 'bitcoind','bitcoin-qt']:	50	- if proc.name().lower() in ['bitcoind.exe','bitcoin-qt.exe',\
52	+ if proc.name() in ['bitcoind','bitcoin-qt']:	51	- 'bitcoind','bitcoin-qt']:
53	killProcess(proc.pid)	52	+ if proc.name() in ['bitcoind','bitcoin-qt']:
54	time.sleep(2)	53	killProcess(proc.pid)
55	return	54	time.sleep(2)
		55	return

Lines 1-6 Link Here

(-)finance/bitcoin-armory/files/patch-ArmoryUtils.py (-10 / +10 lines)
1	--- armoryengine/ArmoryUtils.py	1	--- armoryengine/ArmoryUtils.py
2	+++ armoryengine/ArmoryUtils.py	2	+++ armoryengine/ArmoryUtils.py
3	@@ -208,6 +208,7 @@ class P2SHNotSupportedError(Exception): pass	3	@@ -232,6 +232,7 @@
4	opsys = platform.system()	4	opsys = platform.system()
5	OS_WINDOWS = 'win32' in opsys.lower() or 'windows' in opsys.lower()	5	OS_WINDOWS = 'win32' in opsys.lower() or 'windows' in opsys.lower()
6	OS_LINUX = 'nix' in opsys.lower() or 'nux' in opsys.lower()	6	OS_LINUX = 'nix' in opsys.lower() or 'nux' in opsys.lower()
Lines 8-14 Link Here
8	OS_MACOSX = 'darwin' in opsys.lower() or 'osx' in opsys.lower()	8	OS_MACOSX = 'darwin' in opsys.lower() or 'osx' in opsys.lower()
9		9
10		10
11	@@ -276,6 +277,14 @@ elif OS_LINUX:	11	@@ -305,6 +306,14 @@
12	ARMORY_HOME_DIR = os.path.join(USER_HOME_DIR, '.armory', SUBDIR)	12	ARMORY_HOME_DIR = os.path.join(USER_HOME_DIR, '.armory', SUBDIR)
13	BLKFILE_DIR = os.path.join(BTC_HOME_DIR, 'blocks')	13	BLKFILE_DIR = os.path.join(BTC_HOME_DIR, 'blocks')
14	BLKFILE_1stFILE = os.path.join(BLKFILE_DIR, 'blk00000.dat')	14	BLKFILE_1stFILE = os.path.join(BLKFILE_DIR, 'blk00000.dat')
Lines 23-29 Link Here
23	elif OS_MACOSX:	23	elif OS_MACOSX:
24	platform.mac_ver()	24	platform.mac_ver()
25	OS_NAME = 'MacOSX'	25	OS_NAME = 'MacOSX'
26	@@ -293,6 +302,7 @@ else:	26	@@ -322,6 +331,7 @@
27	opsys = platform.system()	27	opsys = platform.system()
28	OS_WINDOWS = 'win32' in opsys.lower() or 'windows' in opsys.lower()	28	OS_WINDOWS = 'win32' in opsys.lower() or 'windows' in opsys.lower()
29	OS_LINUX = 'nix' in opsys.lower() or 'nux' in opsys.lower()	29	OS_LINUX = 'nix' in opsys.lower() or 'nux' in opsys.lower()
Lines 31-46 Link Here
31	OS_MACOSX = 'darwin' in opsys.lower() or 'osx' in opsys.lower()	31	OS_MACOSX = 'darwin' in opsys.lower() or 'osx' in opsys.lower()
32		32
33	BLOCKCHAINS = {}	33	BLOCKCHAINS = {}
34	@@ -631,7 +641,7 @@ def killProcessTree(pid):	34	@@ -677,7 +687,7 @@
35	# call, because have bundled a recent version of psutil. Linux, however,	35	else:
36	# does not have that function call in earlier versions.	36	from subprocess_win import Popen, PIPE
37	from subprocess import Popen, PIPE	37
38	- if not OS_LINUX:	38	- if not OS_LINUX:
39	+ if not OS_LINUX and not OS_FREEBSD:	39	+ if not OS_LINUX and not OS_FREEBSD:
40	for child in psutil.Process(pid).get_children():	40	for child in psutil.Process(pid).get_children():
41	killProcess(child.pid)	41	killProcess(child.pid)
42	else:	42	else:
43	@@ -1007,7 +1017,7 @@ except:	43	@@ -1078,7 +1088,7 @@
44	LOGCRIT(' in the current directory (or added to the PATH)')	44	LOGCRIT(' in the current directory (or added to the PATH)')
45	LOGCRIT(' Specifically, you need:')	45	LOGCRIT(' Specifically, you need:')
46	LOGCRIT(' CppBlockUtils.py and')	46	LOGCRIT(' CppBlockUtils.py and')
Lines 49-55 Link Here
49	LOGCRIT(' _CppBlockUtils.so')	49	LOGCRIT(' _CppBlockUtils.so')
50	elif OS_WINDOWS:	50	elif OS_WINDOWS:
51	LOGCRIT(' _CppBlockUtils.pyd')	51	LOGCRIT(' _CppBlockUtils.pyd')
52	@@ -1041,6 +1051,11 @@ def GetSystemDetails():	52	@@ -1112,6 +1122,11 @@
53	out.CpuStr = line.split(':')[1].strip()	53	out.CpuStr = line.split(':')[1].strip()
54	break	54	break
55		55
Lines 61-67 Link Here
61		61
62	elif OS_WINDOWS:	62	elif OS_WINDOWS:
63	import ctypes	63	import ctypes
64	@@ -1542,7 +1557,7 @@ except:	64	@@ -1617,7 +1632,7 @@
65	LOGCRIT(' in the current directory (or added to the PATH)')	65	LOGCRIT(' in the current directory (or added to the PATH)')
66	LOGCRIT(' Specifically, you need:')	66	LOGCRIT(' Specifically, you need:')
67	LOGCRIT(' CppBlockUtils.py and')	67	LOGCRIT(' CppBlockUtils.py and')

Line 0 Link Here

(-)finance/bitcoin-armory/files/patch-Transaction.py (+18 lines)
	1	--- armoryengine/Transaction.py 2015-04-15 17:44:57.369764000 -0700
	2	+++ armoryengine/Transaction.py 2015-04-15 17:45:36.196942000 -0700
	3	@@ -15,6 +15,7 @@
	4
	5	from armoryengine.AsciiSerialize import AsciiSerializable
	6
	7	+from armoryengine.MultiSigUtils import *
	8
	9	UNSIGNED_TX_VERSION = 1
	10
	11	@@ -2674,7 +2675,6 @@
	12	#
	13	def PyCreateAndSignTx_old(srcTxOuts, dstAddrsVals):
	14	# This needs to support multisig. Perhaps the funct should just be moved....
	15	- from armoryengine.MultiSigUtils import *
	16
	17	newTx = PyTx()
	18	newTx.version = 1

Lines 1-17 Link Here

(-)finance/bitcoin-armory/files/patch-cppForSwig-Makefile (-6 / +8 lines)
1	--- cppForSwig/Makefile	1	--- cppForSwig/Makefile
2	+++ cppForSwig/Makefile	2	+++ cppForSwig/Makefile
3	@@ -1,4 +1,4 @@	3	@@ -1,5 +1,5 @@
4	-CXX = g++	4	-CXX = g++
		5	-CC = gcc
5	+CXX ?= g++	6	+CXX ?= g++
		7	+CC ?= gcc
6		8
7	ifdef DEBUG	9	ifdef DEBUG
8	CFLAGS=-g3 -Wall -pipe -fPIC	10	CFLAGS=-g3 -Wall -pipe -fPIC
9	@@ -68,7 +68,7 @@	11	@@ -88,7 +88,7 @@
10	BlockUtils.o: log.h BinaryData.h UniversalTimer.h PartialMerkle.h	12
11	EncryptionUtils.o: log.h BtcUtils.h BinaryData.h	13
12	CppBlockUtils_wrap.cxx: log.h BlockUtils.h BinaryData.h BlockObj.h UniversalTimer.h BlockUtils.h BlockUtils.cpp CppBlockUtils.i	14	CppBlockUtils_wrap.cxx: $(ALL_HEADERS) CppBlockUtils.i
13	- swig $(SWIG_OPTS) -outdir ../ -v CppBlockUtils.i	15	- swig $(SWIG_OPTS) -outdir ../ -v CppBlockUtils.i
14	+ swig3.0 $(SWIG_OPTS) -outdir ../ -v CppBlockUtils.i	16	+ swig3.0 $(SWIG_OPTS) -outdir ../ -v CppBlockUtils.i
15		17
16	CppBlockUtils_wrap.o: log.h BlockUtils.h BinaryData.h UniversalTimer.h CppBlockUtils_wrap.cxx	18	CppBlockUtils_wrap.o: $(ALL_HEADERS) CppBlockUtils_wrap.cxx
17	$(CXX) $(SWIG_INC) $(CXXFLAGS) $(CXXCPP) -c CppBlockUtils_wrap.cxx	19	$(CXX) $(SWIG_INC) $(CXXFLAGS) $(CXXCPP) -c CppBlockUtils_wrap.cxx

Lines 1-11 Link Here

(-)finance/bitcoin-armory/pkg-message (-4 / +4 lines)
1
2	================================================================	1	================================================================
3	BitcoinArmory consumes significant disk space in ~/.armory	2	BitcoinArmory consumes significant disk space in ~/.armory
4	and ~/.bitcoin, so you need to provide sufficient available	3	and ~/.bitcoin, so you need to provide sufficient available
5	space there, currently >30 gigabytes.	4	space there, currently >50 gigabytes.
6		5
7	Please note that BitcoinArmory has an embedded bitcoind, and	6	Please note that BitcoinArmory requires bitcoind daemon, so you
8	doesn't require the running bitcoind, but can optionally use it.	7	need to have either net-p2p/bitcoin-daemon or net-p2p/bitcoin
		8	installed.
9		9
10	Please keep your *.wallet files located under the ~/.armory	10	Please keep your *.wallet files located under the ~/.armory
11	directory secure. Loss of these files is equivalent to the loss	11	directory secure. Loss of these files is equivalent to the loss

Lines 1-5 Link Here

(-)finance/bitcoin-armory/pkg-plist (-6 / +12 lines)
1	bin/armory	1	bin/armory
2	lib/armory/ArmoryDB.py
3	lib/armory/ArmoryQt.py	2	lib/armory/ArmoryQt.py
4	lib/armory/BitTornado/BT1/Choker.py	3	lib/armory/BitTornado/BT1/Choker.py
5	lib/armory/BitTornado/BT1/Connecter.py	4	lib/armory/BitTornado/BT1/Connecter.py
Lines 53-59 Link Here
53	lib/armory/BitTornado/zurllib.py	52	lib/armory/BitTornado/zurllib.py
54	lib/armory/CppBlockUtils.py	53	lib/armory/CppBlockUtils.py
55	lib/armory/LICENSE.py	54	lib/armory/LICENSE.py
56	lib/armory/README	55	lib/armory/README.md
57	lib/armory/SDM.py	56	lib/armory/SDM.py
58	lib/armory/_CppBlockUtils.so	57	lib/armory/_CppBlockUtils.so
59	lib/armory/announcefetch.py	58	lib/armory/announcefetch.py
Lines 61-66 Link Here
61	lib/armory/armoryd.py	60	lib/armory/armoryd.py
62	lib/armory/armoryengine/ALL.py	61	lib/armory/armoryengine/ALL.py
63	lib/armory/armoryengine/ArmoryUtils.py	62	lib/armory/armoryengine/ArmoryUtils.py
		63	lib/armory/armoryengine/ArmoryUtils.py.orig
64	lib/armory/armoryengine/AsciiSerialize.py	64	lib/armory/armoryengine/AsciiSerialize.py
65	lib/armory/armoryengine/BDM.py	65	lib/armory/armoryengine/BDM.py
66	lib/armory/armoryengine/BinaryPacker.py	66	lib/armory/armoryengine/BinaryPacker.py
Lines 76-81 Link Here
76	lib/armory/armoryengine/Script.py	76	lib/armory/armoryengine/Script.py
77	lib/armory/armoryengine/Timer.py	77	lib/armory/armoryengine/Timer.py
78	lib/armory/armoryengine/Transaction.py	78	lib/armory/armoryengine/Transaction.py
		79	lib/armory/armoryengine/Transaction.py.orig
79	lib/armory/armoryengine/UserAddressUtils.py	80	lib/armory/armoryengine/UserAddressUtils.py
80	lib/armory/armoryengine/__init__.py	81	lib/armory/armoryengine/__init__.py
81	lib/armory/armoryengine/parseAnnounce.py	82	lib/armory/armoryengine/parseAnnounce.py
Lines 87-92 Link Here
87	lib/armory/bitcoinrpc_jsonrpc/proxy.py	88	lib/armory/bitcoinrpc_jsonrpc/proxy.py
88	lib/armory/default_bootstrap.torrent	89	lib/armory/default_bootstrap.torrent
89	lib/armory/dynamicImport.py	90	lib/armory/dynamicImport.py
		91	lib/armory/extras/BDMbasics_listUTXOs.py
		92	lib/armory/extras/BDMbasics_traceTxHistory.py
		93	lib/armory/extras/BDMbasics_watchBalance.py
90	lib/armory/extras/LastBlockHash.py	94	lib/armory/extras/LastBlockHash.py
91	lib/armory/extras/LatestBlocksFinder.py	95	lib/armory/extras/LatestBlocksFinder.py
92	lib/armory/extras/PromoKit.py	96	lib/armory/extras/PromoKit.py
Lines 122-127 Link Here
122	lib/armory/pytest/testArmoryEngineUtils.py	126	lib/armory/pytest/testArmoryEngineUtils.py
123	lib/armory/pytest/testDecorators.py	127	lib/armory/pytest/testDecorators.py
124	lib/armory/pytest/testFragmentedBackup.py	128	lib/armory/pytest/testFragmentedBackup.py
		129	lib/armory/pytest/testJasvet.py
125	lib/armory/pytest/testMultisig.py	130	lib/armory/pytest/testMultisig.py
126	lib/armory/pytest/testParseAnnounce.py	131	lib/armory/pytest/testParseAnnounce.py
127	lib/armory/pytest/testPyBtcAddress.py	132	lib/armory/pytest/testPyBtcAddress.py
Lines 130-135 Link Here
130	lib/armory/pytest/testPyTX.py	135	lib/armory/pytest/testPyTX.py
131	lib/armory/pytest/testSplitSecret.py	136	lib/armory/pytest/testSplitSecret.py
132	lib/armory/pytest/testUserAddress.py	137	lib/armory/pytest/testUserAddress.py
		138	lib/armory/pytest/testUtility.py
133	lib/armory/qrc_img_resources.py	139	lib/armory/qrc_img_resources.py
134	lib/armory/qrcodenative.py	140	lib/armory/qrcodenative.py
135	lib/armory/qt4reactor.py	141	lib/armory/qt4reactor.py
Lines 146-152 Link Here
146	lib/armory/txjsonrpc/web/jsonrpc.py	152	lib/armory/txjsonrpc/web/jsonrpc.py
147	lib/armory/ui/MultiSigDialogs.py	153	lib/armory/ui/MultiSigDialogs.py
148	lib/armory/ui/MultiSigModels.py	154	lib/armory/ui/MultiSigModels.py
149	lib/armory/ui/TxConstruct.py
150	lib/armory/ui/TxFrames.py	155	lib/armory/ui/TxFrames.py
151	lib/armory/ui/UpgradeDownloader.py	156	lib/armory/ui/UpgradeDownloader.py
152	lib/armory/ui/VerifyOfflinePackage.py	157	lib/armory/ui/VerifyOfflinePackage.py
Lines 154-159 Link Here
154	lib/armory/ui/Wizards.py	159	lib/armory/ui/Wizards.py
155	lib/armory/ui/__init__.py	160	lib/armory/ui/__init__.py
156	lib/armory/ui/toolsDialogs.py	161	lib/armory/ui/toolsDialogs.py
		162	lib/armory/update_version.py
157	lib/armory/urllib3/__init__.py	163	lib/armory/urllib3/__init__.py
158	lib/armory/urllib3/_collections.py	164	lib/armory/urllib3/_collections.py
159	lib/armory/urllib3/connection.py	165	lib/armory/urllib3/connection.py
Lines 194-202 Link Here
194	share/armory/img/armory32x32.ico	200	share/armory/img/armory32x32.ico
195	share/armory/img/armory48x48.ico	201	share/armory/img/armory48x48.ico
196	share/armory/img/armory64x64.ico	202	share/armory/img/armory64x64.ico
197	share/armory/img/armory_icon_24x24.png
198	share/armory/img/armory_icon_32x32.png
199	share/armory/img/armory_icon_64x64.png
200	share/armory/img/armory_icon_fullres.icns	203	share/armory/img/armory_icon_fullres.icns
201	share/armory/img/armory_icon_fullres.png	204	share/armory/img/armory_icon_fullres.png
202	share/armory/img/armory_icon_green_24x24.png	205	share/armory/img/armory_icon_green_24x24.png
Lines 312-314 Link Here
312	share/armory/img/visible2.png	315	share/armory/img/visible2.png
313	share/armory/img/wallet_16x12.png	316	share/armory/img/wallet_16x12.png
314	share/armory/img/x-office-address-book.png	317	share/armory/img/x-office-address-book.png
		318	share/icons/hicolor/24x24/apps/BitcoinArmory.png
		319	share/icons/hicolor/32x32/apps/BitcoinArmory.png
		320	share/icons/hicolor/64x64/apps/BitcoinArmory.png